diff --git a/dwds/test/frontend_server_evaluate_sound_test.dart b/dwds/test/frontend_server_evaluate_sound_test.dart
new file mode 100644
index 000000000..a9c987b7a
--- /dev/null
+++ b/dwds/test/frontend_server_evaluate_sound_test.dart
@@ -0,0 +1,39 @@
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@TestOn('vm')
+@Timeout(Duration(minutes: 5))
+
+import 'dart:io';
+
+import 'package:test/test.dart';
+
+import 'fixtures/context.dart';
+import 'evaluate_common.dart';
+
+void main() async {
+  // Enable verbose logging for debugging.
+  final debug = false;
+
+  for (var useDebuggerModuleNames in [false, true]) {
+    group('Debugger module names: $useDebuggerModuleNames |', () {
+      final nullSafety = NullSafety.sound;
+      group('${nullSafety.name} null safety |', () {
+        for (var indexBaseMode in IndexBaseMode.values) {
+          group('with ${indexBaseMode.name} |', () {
+            testAll(
+              compilationMode: CompilationMode.frontendServer,
+              indexBaseMode: indexBaseMode,
+              nullSafety: nullSafety,
+              useDebuggerModuleNames: useDebuggerModuleNames,
+              debug: debug,
+            );
+          },
+              // https://github.com/dart-lang/sdk/issues/49277
+              skip: indexBaseMode == IndexBaseMode.base && Platform.isWindows);
+        }
+      });
+    });
+  }
+}
diff --git a/dwds/test/frontend_server_evaluate_test.dart b/dwds/test/frontend_server_evaluate_test.dart
deleted file mode 100644
index 61d7d525f..000000000
--- a/dwds/test/frontend_server_evaluate_test.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-@TestOn('vm')
-@Timeout(Duration(minutes: 5))
-
-import 'dart:io';
-
-import 'package:pub_semver/pub_semver.dart';
-import 'package:test/test.dart';
-
-import 'fixtures/context.dart';
-import 'evaluate_common.dart';
-
-void main() async {
-  // Enable verbose logging for debugging.
-  final debug = false;
-
-  // TODO(annagrin): Remove when 2.19.0-150.0.dev is in stable.
-  final debuggerModuleNamesSupported =
-      Version.parse(Platform.version.split(' ').first) >=
-          Version.parse('2.19.0-150.0.dev');
-
-  for (var useDebuggerModuleNames in [false, true]) {
-    group('Debugger module names: $useDebuggerModuleNames |', () {
-      for (var nullSafety in NullSafety.values) {
-        group('${nullSafety.name} null safety |', () {
-          for (var indexBaseMode in IndexBaseMode.values) {
-            group('with ${indexBaseMode.name} |', () {
-              testAll(
-                compilationMode: CompilationMode.frontendServer,
-                indexBaseMode: indexBaseMode,
-                nullSafety: nullSafety,
-                useDebuggerModuleNames: useDebuggerModuleNames,
-                debug: debug,
-              );
-            },
-                skip:
-                    // https://github.com/dart-lang/sdk/issues/49277
-                    (indexBaseMode == IndexBaseMode.base &&
-                            Platform.isWindows) ||
-                        // Needs debugger module names feature in SDK.
-                        (useDebuggerModuleNames &&
-                            !debuggerModuleNamesSupported));
-          }
-        });
-      }
-    });
-  }
-}
diff --git a/dwds/test/frontend_server_evaluate_weak_test.dart b/dwds/test/frontend_server_evaluate_weak_test.dart
new file mode 100644
index 000000000..b26000e01
--- /dev/null
+++ b/dwds/test/frontend_server_evaluate_weak_test.dart
@@ -0,0 +1,39 @@
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@TestOn('vm')
+@Timeout(Duration(minutes: 5))
+
+import 'dart:io';
+
+import 'package:test/test.dart';
+
+import 'fixtures/context.dart';
+import 'evaluate_common.dart';
+
+void main() async {
+  // Enable verbose logging for debugging.
+  final debug = false;
+
+  for (var useDebuggerModuleNames in [false, true]) {
+    group('Debugger module names: $useDebuggerModuleNames |', () {
+      final nullSafety = NullSafety.weak;
+      group('${nullSafety.name} null safety |', () {
+        for (var indexBaseMode in IndexBaseMode.values) {
+          group('with ${indexBaseMode.name} |', () {
+            testAll(
+              compilationMode: CompilationMode.frontendServer,
+              indexBaseMode: indexBaseMode,
+              nullSafety: nullSafety,
+              useDebuggerModuleNames: useDebuggerModuleNames,
+              debug: debug,
+            );
+          },
+              // https://github.com/dart-lang/sdk/issues/49277
+              skip: indexBaseMode == IndexBaseMode.base && Platform.isWindows);
+        }
+      });
+    });
+  }
+}