diff --git a/packages/flutter_migrate/lib/src/base/common.dart b/packages/flutter_migrate/lib/src/base/common.dart
index a848843fc2..6612e3a30e 100644
--- a/packages/flutter_migrate/lib/src/base/common.dart
+++ b/packages/flutter_migrate/lib/src/base/common.dart
@@ -138,7 +138,7 @@ Future<T> asyncGuard<T>(
     }
   }
 
-  runZoned<void>(() async {
+  runZonedGuarded<void>(() async {
     try {
       final T result = await fn();
       if (!completer.isCompleted) {
@@ -150,7 +150,7 @@ Future<T> asyncGuard<T>(
       // ignore: avoid_catches_without_on_clauses, forwards to Future
       handleError(e, s);
     }
-  }, onError: (Object e, StackTrace s) {
+  }, (Object e, StackTrace s) {
     handleError(e, s);
   });
 
diff --git a/packages/flutter_migrate/pubspec.yaml b/packages/flutter_migrate/pubspec.yaml
index e46995af27..222b6bdd86 100644
--- a/packages/flutter_migrate/pubspec.yaml
+++ b/packages/flutter_migrate/pubspec.yaml
@@ -24,4 +24,3 @@ dev_dependencies:
   file_testing: 3.0.0
   lints: ^2.0.0
   test: ^1.16.0
-  test_api: ^0.4.13
diff --git a/packages/flutter_migrate/test/src/common.dart b/packages/flutter_migrate/test/src/common.dart
index 6115d5ea65..a354020d47 100644
--- a/packages/flutter_migrate/test/src/common.dart
+++ b/packages/flutter_migrate/test/src/common.dart
@@ -10,12 +10,12 @@ import 'package:flutter_migrate/src/base/file_system.dart';
 import 'package:flutter_migrate/src/base/io.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path; // flutter_ignore: package_path_import
-import 'package:test_api/test_api.dart' as test_package show test;
-import 'package:test_api/test_api.dart' hide test;
+import 'package:test/test.dart' as test_package show test;
+import 'package:test/test.dart' hide test;
 
 import 'test_utils.dart';
 
-export 'package:test_api/test_api.dart' hide isInstanceOf, test;
+export 'package:test/test.dart' hide isInstanceOf, test;
 
 bool tryToDelete(FileSystemEntity fileEntity) {
   // This should not be necessary, but it turns out that
diff --git a/packages/flutter_migrate/test/src/test_flutter_command_runner.dart b/packages/flutter_migrate/test/src/test_flutter_command_runner.dart
index 7a1a2bd817..9f4731dada 100644
--- a/packages/flutter_migrate/test/src/test_flutter_command_runner.dart
+++ b/packages/flutter_migrate/test/src/test_flutter_command_runner.dart
@@ -5,7 +5,7 @@
 import 'package:args/command_runner.dart';
 import 'package:flutter_migrate/src/base/command.dart';
 
-export 'package:test_api/test_api.dart' hide isInstanceOf, test;
+export 'package:test/test.dart' hide isInstanceOf, test;
 
 CommandRunner<void> createTestCommandRunner([MigrateCommand? command]) {
   final CommandRunner<void> runner = TestCommandRunner();