diff --git a/.travis.yml b/.travis.yml
index ab911a8..01a7020 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,9 @@ dart:
   - dev
 
 dart_task:
-  - test: -p vm,firefox
+  - test: -p vm
+  # TODO: reinstate once https://github.com/dart-lang/typed_data/issues/16 is fixed
+  # - test: -p firefox
   - dartfmt
   - dartanalyzer
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1855d95..3259e41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.7
+
+* Set max SDK version to `<3.0.0`, and adjust other dependencies.
+
 ## 1.1.6
 
 * Update tests to work with Dart 2.0 64 bit ints.
diff --git a/README.md b/README.md
index c7a4772..9ec19ba 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,14 @@ The `typed_data` package contains utility functions and classes that makes worki
 
 The `typed_data` package can be imported as
 
-    import 'package:typed_data/typed_data.dart';
+```dart
+import 'package:typed_data/typed_data.dart';
+```
 
 ## Typed buffers: Growable typed data lists
 
 Typed buffers are contains growable lists backed by typed arrays.
-These are similar to the growable lists returned by `new List()`, 
+These are similar to the growable lists returned by `List()`, 
 but stores typed data like a typed data list.
 
 ## Features and bugs
diff --git a/analysis_options.yaml b/analysis_options.yaml
deleted file mode 100644
index a10d4c5..0000000
--- a/analysis_options.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/pubspec.yaml b/pubspec.yaml
index 98579db..41f826b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,9 +1,12 @@
 name: typed_data
-version: 1.1.6
-author: Dart Team <misc@dartlang.org>
+version: 1.1.7
+
 description: Utility functions and classes related to the 'dart:typed_data' library.
+author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/typed_data
-dev_dependencies:
-  test: "^0.12.0"
+
 environment:
-  sdk: ">=2.0.0-dev.16.0 <2.0.0"
+  sdk: '>=2.0.0-dev.16.0 <3.0.0'
+
+dev_dependencies:
+  test: '>=0.12.42 <2.0.0'
diff --git a/test/typed_buffers_test.dart b/test/typed_buffers_test.dart
index 53aa666..90270fe 100644
--- a/test/typed_buffers_test.dart
+++ b/test/typed_buffers_test.dart
@@ -265,7 +265,7 @@ testFloat32x4Buffer(List floatSamples) {
 
   test("Float32x4Buffer", () {
     var buffer = new Float32x4Buffer(5);
-    expect(buffer, new isInstanceOf<List<Float32x4>>());
+    expect(buffer, new TypeMatcher<List<Float32x4>>());
 
     expect(buffer.length, equals(5));
     expect(buffer.elementSizeInBytes, equals(128 ~/ 8));
@@ -312,7 +312,7 @@ void testFloatBuffer(
     int bitSize, List<double> samples, create(), double round(double v)) {
   test("Float${bitSize}Buffer", () {
     var buffer = create();
-    expect(buffer, new isInstanceOf<List<double>>());
+    expect(buffer, new TypeMatcher<List<double>>());
     int byteSize = bitSize ~/ 8;
 
     expect(buffer.length, equals(0));
@@ -380,7 +380,7 @@ void testInt32x4Buffer(List<int> intSamples) {
     Matcher equals32x4(Int32x4 expected) => new MatchesInt32x4(expected);
 
     var buffer = new Int32x4Buffer(0);
-    expect(buffer, new isInstanceOf<List<Int32x4>>());
+    expect(buffer, new TypeMatcher<List<Int32x4>>());
     expect(buffer.length, equals(0));
 
     expect(buffer.elementSizeInBytes, equals(bytes));
@@ -439,7 +439,7 @@ void testIntBuffer(
   assert(round(max) == max);
   // All int buffers default to the value 0.
   var buffer = create(0);
-  expect(buffer, new isInstanceOf<List<int>>());
+  expect(buffer, new TypeMatcher<List<int>>());
   expect(buffer.length, equals(0));
   var bytes = bits ~/ 8;