diff --git a/products/terminal.gni b/products/terminal.gni
index 66c7464..d42ae00 100644
--- a/products/terminal.gni
+++ b/products/terminal.gni
@@ -19,13 +19,8 @@
 
 # TODO(IN-1097): Support a package server rather than building these
 #                into the image via preinstall+monolith.
-cache_package_labels += [
-  "//garnet/packages/tools:sl4f",
-]
+cache_package_labels += [ "//garnet/packages/tools:sl4f" ]
 
 # E2E Product Tests. They don't produce fuchsia packages, but host executables,
 # and must just be included somewhere in the build configuration of the product.
-universe_package_labels += [
-  "//src/end_to_end_tests/screen_is_not_black:test",
-]
-
+universe_package_labels += [ "//src/tests/screen_is_not_black:test" ]
diff --git a/src/end_to_end_tests/screen_is_not_black/BUILD.gn b/src/tests/screen_is_not_black/BUILD.gn
similarity index 85%
rename from src/end_to_end_tests/screen_is_not_black/BUILD.gn
rename to src/tests/screen_is_not_black/BUILD.gn
index 4a3ee57..d0a11e9 100644
--- a/src/end_to_end_tests/screen_is_not_black/BUILD.gn
+++ b/src/tests/screen_is_not_black/BUILD.gn
@@ -17,14 +17,17 @@
     "//third_party/dart-pkg/pub/test",
   ]
 
-  _untagged_envs = [nuc_env, astro_env]
+  _untagged_envs = [
+    nuc_env,
+    astro_env,
+  ]
   environments = []
   foreach(env, _untagged_envs) {
     if (!defined(env.tags)) {
       env.tags = []
     }
-    env.tags += ["e2e-terminal"]
-    environments += [env]
+    env.tags += [ "e2e-terminal" ]
+    environments += [ env ]
   }
 }
 
diff --git a/src/end_to_end_tests/screen_is_not_black/analysis_options.yaml b/src/tests/screen_is_not_black/analysis_options.yaml
similarity index 100%
rename from src/end_to_end_tests/screen_is_not_black/analysis_options.yaml
rename to src/tests/screen_is_not_black/analysis_options.yaml
diff --git a/src/end_to_end_tests/screen_is_not_black/pubspec.yaml b/src/tests/screen_is_not_black/pubspec.yaml
similarity index 100%
rename from src/end_to_end_tests/screen_is_not_black/pubspec.yaml
rename to src/tests/screen_is_not_black/pubspec.yaml
diff --git a/src/end_to_end_tests/screen_is_not_black/test/screen_is_not_black_test.dart b/src/tests/screen_is_not_black/test/screen_is_not_black_test.dart
similarity index 100%
rename from src/end_to_end_tests/screen_is_not_black/test/screen_is_not_black_test.dart
rename to src/tests/screen_is_not_black/test/screen_is_not_black_test.dart