diff --git a/.travis.yml b/.travis.yml
index dc8b4f9..37497c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,11 @@
 dart:
   - dev
 dart_task:
+  # TODO: Only run dartfmt and dartanalyzer over dev release once Dart 2 stable is out
+  - dartfmt
+  - dartanalyzer
   - test
 
-matrix:
-  include:
-    # Only validate formatting using the dev release
-    - dart: dev
-      dart_task: dartfmt
-    - dart: dev
-      dart_task: analyzer
-
 # Only building master means that we don't run two builds for each pull request.
 branches:
   only: [master]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 057b673..f6ef050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,14 @@
+## 0.2.2+3
+
+* Set max SDK version to `<3.0.0`, and adjust other dependencies.
+
 ## 0.2.2+2
 
 * Stopped using deprected `HTML_ESCAPE` constant name.
 
 ## 0.2.2+1
 
-* Updated SDK version to 2.0.0-dev.17.0
+* Update SDK version to 2.0.0-dev.17.0.
 
 ## 0.2.2
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
deleted file mode 100644
index 350c2d4..0000000
--- a/analysis_options.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/pubspec.yaml b/pubspec.yaml
index c187250..3d93f9b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,15 +1,18 @@
 name: shelf_web_socket
-version: 0.2.2+2
-author: "Dart Team <misc@dartlang.org>"
+version: 0.2.2+3
+
+description: A WebSocket handler for Shelf.
+author: Dart Team <misc@dartlang.org>
 homepage: http://github.com/dart-lang/shelf_web_socket
-description: >
-  A WebSocket handler for Shelf.
-dependencies:
-  shelf: ">=0.7.0 <0.8.0"
-  stream_channel: "^1.4.0"
-  web_socket_channel: "^1.0.0"
-dev_dependencies:
-  http: ">=0.10.0 <0.12.0"
-  test: "^0.12.0"
+
 environment:
-  sdk: ">=2.0.0-dev.17.0 <2.0.0"
+  sdk: '>=2.0.0-dev.17.0 <3.0.0'
+
+dependencies:
+  shelf: '>=0.7.0 <0.8.0'
+  stream_channel: ^1.4.0
+  web_socket_channel: ^1.0.0
+
+dev_dependencies:
+  http: '>=0.10.0 <0.12.0'
+  test: '>=0.12.42 <2.0.0'
diff --git a/test/web_socket_test.dart b/test/web_socket_test.dart
index 6b83d94..43abce1 100644
--- a/test/web_socket_test.dart
+++ b/test/web_socket_test.dart
@@ -178,7 +178,7 @@
 }
 
 Matcher hasStatus(int status) => completion(predicate((response) {
-      expect(response, new isInstanceOf<http.Response>());
+      expect(response, new TypeMatcher<http.Response>());
       expect(response.statusCode, equals(status));
       return true;
     }));