diff --git a/.travis.yml b/.travis.yml
index 2ed895fc64c5997fb01d9f01780684af1a62e9e7..7aae45cf470b3da56cc79a2bdde72a649bbc7439 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: dart
 sudo: required
 
 dart:
- - 2.0.0-dev.60.0
+ - dev
 
 env: FORCE_TEST_EXIT=true
 
diff --git a/lib/src/runner/engine.dart b/lib/src/runner/engine.dart
index 08f4d66f7526dad78440365ff8e9407de8586074..65965d91853228155e1a53cffb9fec7c747045fc 100644
--- a/lib/src/runner/engine.dart
+++ b/lib/src/runner/engine.dart
@@ -527,6 +527,8 @@ class Engine {
   /// Closing [suiteSink] indicates that no more input will be provided, closing
   /// the engine indicates that no more output should be emitted.
   Future close() async {
+    // TODO(grouma) - Remove this unecessary await.
+    await new Future(() {});
     _closed = true;
     if (_closedBeforeDone != null) _closedBeforeDone = true;
     _onSuiteAddedController.close();
diff --git a/test/runner/compact_reporter_test.dart b/test/runner/compact_reporter_test.dart
index 39a92f7a5ff72400e86335af6fe16c6e1ef8dc98..9e3969b38ef88e1c5240b19609f941526ef6d15a 100644
--- a/test/runner/compact_reporter_test.dart
+++ b/test/runner/compact_reporter_test.dart
@@ -76,7 +76,7 @@ void main() {
 
     var test =
         await runTest(["--verbose-trace", "test.dart"], reporter: "compact");
-    expect(test.stdout, emitsThrough(contains("dart:isolate-patch")));
+    expect(test.stdout, emitsThrough(contains("dart:async")));
     await test.shouldExit(1);
   });
 
diff --git a/test/runner/configuration/top_level_test.dart b/test/runner/configuration/top_level_test.dart
index bcfd811fab37b53b48d363a52384baf821c05e2f..383f679e75c615266d4658ebb3036f37d029d09b 100644
--- a/test/runner/configuration/top_level_test.dart
+++ b/test/runner/configuration/top_level_test.dart
@@ -129,7 +129,7 @@ void main() {
     """).create();
 
     var test = await runTest(["test.dart"]);
-    expect(test.stdout, emitsThrough(contains("dart:isolate-patch")));
+    expect(test.stdout, emitsThrough(contains("dart:async")));
     await test.shouldExit(1);
   });
 
diff --git a/test/runner/expanded_reporter_test.dart b/test/runner/expanded_reporter_test.dart
index ab18880e89177de1d992b380c23188cc5b5a16f3..ae7f200a05ee2531d410aeb26d9aae931b3e7880 100644
--- a/test/runner/expanded_reporter_test.dart
+++ b/test/runner/expanded_reporter_test.dart
@@ -67,7 +67,7 @@ void main() {
 """).create();
 
     var test = await runTest(["--verbose-trace", "test.dart"]);
-    expect(test.stdout, emitsThrough(contains("dart:isolate-patch")));
+    expect(test.stdout, emitsThrough(contains("dart:async")));
     await test.shouldExit(1);
   });