diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8f2d5f..7ea1cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.9.7+10
+
+* Set max SDK version to `<3.0.0`, and adjust other dependencies.
+
 # 0.9.7+9
 
 * Internal changes only.
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 2f449ff..73ce19b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,16 +1,20 @@
 name: watcher
-version: 0.9.7+9
-author: Dart Team <misc@dartlang.org>
-homepage: https://github.com/dart-lang/watcher
+version: 0.9.7+10
+
 description: >
   A file system watcher. It monitors changes to contents of directories and
   sends notifications when files have been added, removed, or modified.
+author: Dart Team <misc@dartlang.org>
+homepage: https://github.com/dart-lang/watcher
+
 environment:
-  sdk: '>=2.0.0-dev.61.0 <2.0.0'
+  sdk: '>=2.0.0-dev.61.0 <3.0.0'
+
 dependencies:
   async: '>=1.10.0 <3.0.0'
   path: '>=0.9.0 <2.0.0'
+
 dev_dependencies:
-  benchmark_harness: '^1.0.4'
-  test: '^0.12.29'
-  test_descriptor: '^1.0.0'
+  benchmark_harness: ^1.0.4
+  test: '>=0.12.42 <2.0.0'
+  test_descriptor: ^1.0.0
diff --git a/test/directory_watcher/linux_test.dart b/test/directory_watcher/linux_test.dart
index 25c5504..744045f 100644
--- a/test/directory_watcher/linux_test.dart
+++ b/test/directory_watcher/linux_test.dart
@@ -17,8 +17,7 @@
   sharedTests();
 
   test('DirectoryWatcher creates a LinuxDirectoryWatcher on Linux', () {
-    expect(
-        new DirectoryWatcher('.'), new isInstanceOf<LinuxDirectoryWatcher>());
+    expect(new DirectoryWatcher('.'), new TypeMatcher<LinuxDirectoryWatcher>());
   });
 
   test('emits events for many nested files moved out then immediately back in',
diff --git a/test/directory_watcher/mac_os_test.dart b/test/directory_watcher/mac_os_test.dart
index 8fa76fd..689d353 100644
--- a/test/directory_watcher/mac_os_test.dart
+++ b/test/directory_watcher/mac_os_test.dart
@@ -17,8 +17,7 @@
   sharedTests();
 
   test('DirectoryWatcher creates a MacOSDirectoryWatcher on Mac OS', () {
-    expect(
-        new DirectoryWatcher('.'), new isInstanceOf<MacOSDirectoryWatcher>());
+    expect(new DirectoryWatcher('.'), new TypeMatcher<MacOSDirectoryWatcher>());
   });
 
   test(
diff --git a/test/directory_watcher/windows_test.dart b/test/directory_watcher/windows_test.dart
index 3696f9c..875f4ee 100644
--- a/test/directory_watcher/windows_test.dart
+++ b/test/directory_watcher/windows_test.dart
@@ -22,6 +22,6 @@
 
   test('DirectoryWatcher creates a WindowsDirectoryWatcher on Windows', () {
     expect(
-        new DirectoryWatcher('.'), new isInstanceOf<WindowsDirectoryWatcher>());
+        new DirectoryWatcher('.'), new TypeMatcher<WindowsDirectoryWatcher>());
   });
 }
diff --git a/test/no_subscription/shared.dart b/test/no_subscription/shared.dart
index c7e0501..ba84684 100644
--- a/test/no_subscription/shared.dart
+++ b/test/no_subscription/shared.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
-
 import 'package:async/async.dart';
 import 'package:test/test.dart';
 import 'package:watcher/watcher.dart';