diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 0cdf43b13b0..002314b53f4 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -115,6 +115,7 @@ def _CheckNewTests(input_api, output_api):
       ("tests/corelib/",        "tests/corelib_2/"),
       ("tests/lib/",            "tests/lib_2/"),
       ("tests/html/",           "tests/lib_2/html/"),
+      ("tests/isolate/",        "tests/lib_2/isolate/")
   ]
 
   result = []
diff --git a/tests/isolate/isolate.status b/tests/isolate/isolate.status
index d8f69ff3657..c97a6b078fd 100644
--- a/tests/isolate/isolate.status
+++ b/tests/isolate/isolate.status
@@ -17,7 +17,6 @@ issue_21398_parent_isolate2_test: SkipByDesign # Test uses a ".dart" URI.
 issue_21398_parent_isolate_test: SkipByDesign # Test uses a ".dart" URI.
 issue_24243_parent_isolate_test: SkipByDesign # Test uses a ".dart" URI.
 kill_self_synchronously_test: SkipByDesign #  Unsupported operation: Platform._resolvedExecutable
-large_byte_data_leak_test: RuntimeError
 message3_test/constInstance: RuntimeError # Issue 21817
 message3_test/constList: RuntimeError # Issue 21817
 message3_test/constList_identical: RuntimeError # Issue 21817
diff --git a/tests/isolate/large_byte_data_leak_test.dart b/tests/lib_2/isolate/large_byte_data_leak_test.dart
similarity index 75%
rename from tests/isolate/large_byte_data_leak_test.dart
rename to tests/lib_2/isolate/large_byte_data_leak_test.dart
index 89b07f41863..b55172e2eac 100644
--- a/tests/isolate/large_byte_data_leak_test.dart
+++ b/tests/lib_2/isolate/large_byte_data_leak_test.dart
@@ -3,10 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "dart:async";
-import "dart:developer";
-import "dart:isolate";
-import "dart:typed_data";
-import "dart:developer";
+import "dart:developer" show UserTag;
+import "dart:isolate" show Isolate, ReceivePort;
+import "dart:typed_data" show ByteData;
 import "package:expect/expect.dart";
 
 const large = 2 * 1024 * 1024;
@@ -35,12 +34,8 @@ Future<void> main(List<String> args) async {
 
   ReceivePort port = new ReceivePort();
   Isolate.spawn(child, port.sendPort);
-  StreamIterator<dynamic> incoming = new StreamIterator<dynamic>(port);
 
-  Expect.isTrue(await incoming.moveNext());
-  dynamic x = incoming.current;
-  Expect.equals("Done", x);
+  Expect.equals("Done", await port.first);
 
-  port.close();
   print("Parent done");
 }
diff --git a/tests/isolate/large_byte_data_test.dart b/tests/lib_2/isolate/large_byte_data_test.dart
similarity index 100%
rename from tests/isolate/large_byte_data_test.dart
rename to tests/lib_2/isolate/large_byte_data_test.dart
diff --git a/tests/lib_2/lib_2_dart2js.status b/tests/lib_2/lib_2_dart2js.status
index 8e0728a07fe..2d31eaaa8b3 100644
--- a/tests/lib_2/lib_2_dart2js.status
+++ b/tests/lib_2/lib_2_dart2js.status
@@ -763,6 +763,7 @@ isolate/kill_self_synchronously_test: RuntimeError
 
 [ $compiler == dart2js && ($runtime == d8 || $runtime == jsshell) ]
 isolate/browser/issue_12474_test: RuntimeError # packageRoot not implemented.
+isolate/large_byte_data_leak_test: RuntimeError
 
 [ $compiler == dart2js && ($runtime == ff || $runtime == safari || $ie) ]
 html/custom/attribute_changed_callback_test/unsupported_on_polyfill: Fail # Polyfill does not support