diff --git a/.test_config b/.test_config
new file mode 100644
index 0000000..531426a
--- /dev/null
+++ b/.test_config
@@ -0,0 +1,5 @@
+{
+  "test_package": {
+    "platforms": ["vm"]
+  }
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 44202b6..977f73d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: shelf_proxy
-version: 0.1.0+3
+version: 0.1.0+4
 author: Dart Team <misc@dartlang.org>
 description: A shelf handler for proxying requests to another server.
 homepage: https://github.com/dart-lang/shelf_proxy
@@ -9,4 +9,5 @@
   shelf: '>=0.5.2 <0.8.0'
 dev_dependencies:
   browser: '>=0.10.0 <0.11.0'
-  scheduled_test: '>=0.11.0 <0.12.0'
+  scheduled_test: '>=0.12.0 <0.13.0'
+  test: '>=0.12.0 <0.13.0'
diff --git a/test/shelf_proxy_test.dart b/test/shelf_proxy_test.dart
index cf70cb6..b88f059 100644
--- a/test/shelf_proxy_test.dart
+++ b/test/shelf_proxy_test.dart
@@ -215,13 +215,13 @@
 /// [targetPath] is the root-relative path on the target server to proxy to. It
 /// defaults to `/`.
 void createProxy(shelf.Handler handler, {String targetPath}) {
-  handler = wrapAsync(handler, 'target server handler');
+  handler = expectAsync(handler, reason: 'target server handler');
   schedule(() {
     return shelf_io.serve(handler, 'localhost', 0).then((targetServer) {
       targetUri = Uri.parse('http://localhost:${targetServer.port}');
       if (targetPath != null) targetUri = targetUri.resolve(targetPath);
-      var proxyServerHandler = wrapAsync(
-          proxyHandler(targetUri), 'proxy server handler');
+      var proxyServerHandler = expectAsync(
+          proxyHandler(targetUri), reason: 'proxy server handler');
 
       return shelf_io.serve(proxyServerHandler, 'localhost', 0)
           .then((proxyServer) {