diff --git a/CHANGELOG.md b/CHANGELOG.md
index e63511b..549c758 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 2.5.0-nullsafety.3-dev
+
 ## 2.5.0-nullsafety.2
 
 * Remove the unusable setter `CancelableOperation.operation=`. This was
diff --git a/pubspec.yaml b/pubspec.yaml
index ce72156..5f87f9b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: async
-version: 2.5.0-nullsafety.2
+version: 2.5.0-nullsafety.3-dev
 
 description: Utility functions and classes related to the 'dart:async' library.
 homepage: https://www.github.com/dart-lang/async
diff --git a/test/utils.dart b/test/utils.dart
index 2ddecc4..b7e64e2 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -19,13 +19,13 @@
 OptionalArgAction unreachable(String name) =>
     ([a, b]) => fail('Unreachable: $name');
 
-// TODO(nweiz): Use the version of this in test when test#418 is fixed.
 /// A matcher that runs a callback in its own zone and asserts that that zone
 /// emits an error that matches [matcher].
 Matcher throwsZoned(matcher) => predicate((void Function() callback) {
       var firstError = true;
-      runZoned(callback,
-          onError: expectAsync2((Object error, StackTrace stackTrace) {
+      runZonedGuarded(
+          callback,
+          expectAsync2((error, stackTrace) {
             if (firstError) {
               expect(error, matcher);
               firstError = false;