diff --git a/build/BUILD.gn b/build/BUILD.gn
index 624a9fe..7c00617 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -68,6 +68,7 @@
     "//garnet/bin/appmgr/integration_tests/components:components_binary_tests",
     "//garnet/bin/appmgr/integration_tests/inspect:inspect_integration_tests",
     "//garnet/bin/appmgr/integration_tests/inspect:inspect_vmo_integration_tests",
+    "//garnet/bin/archivist:archivist",
     "//garnet/bin/chrealm/integration_tests:chrealm_integrationtests",
     "//garnet/bin/cpuperf_provider:cpuperf_provider_tests",
     "//garnet/bin/glob:glob",
@@ -83,15 +84,19 @@
     "//garnet/go/src/amber:amber",
     "//garnet/go/src/amber/system_updater:system_updater_tests",
     "//garnet/public/lib/inspect/integration:libinspect_integration_tests",
+    "//garnet/tests/benchmarks/input_latency:garnet_input_latency_benchmarks",
     "//garnet/tests/zircon/libdriver-integration-test:libdriver-integration-test",
     "//peridot/bin/module_resolver/module_package_indexer:module_package_indexer",
     "//peridot/bin/sessionctl:sessionctl",
+    "//peridot/public/lib/modular_test_harness/cpp:test_harness_fixture_test",
     "//peridot/tests/sessionctl:sessionctl_integration_tests",
     "//src/connectivity/network/netstack:netstack_gotests",
+    "//src/connectivity/network/testing/netemul/runner:netemul_devmgr",
     "//src/developer/debug/debug_agent:debug_agent",
     "//src/developer/debug/debug_agent:debug_agent_tests",
     "//src/developer/feedback_agent:feedback_agent",
     "//src/developer/feedback_agent/tests:feedback_agent_tests",
+    "//src/lib/isolated_devmgr:isolated_devmgr_tests",
     "//src/recovery/factory_reset:factory_reset_tests",
   ]
 }
diff --git a/garnet/bin/archivist/BUILD.gn b/garnet/bin/archivist/BUILD.gn
index 0bd39f2..c8814cf 100644
--- a/garnet/bin/archivist/BUILD.gn
+++ b/garnet/bin/archivist/BUILD.gn
@@ -38,6 +38,8 @@
 }
 
 package("archivist") {
+  deprecated_shell = "//build"
+
   deps = [
     ":bin",
   ]
diff --git a/garnet/bin/archivist/meta/archivist.cmx b/garnet/bin/archivist/meta/archivist.cmx
index ac1f37b..b0d8859a 100644
--- a/garnet/bin/archivist/meta/archivist.cmx
+++ b/garnet/bin/archivist/meta/archivist.cmx
@@ -5,7 +5,7 @@
     "sandbox": {
         "features": [
             "isolated-persistent-storage",
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.logger.LogSink"
diff --git a/garnet/bin/trace/tests/meta/ktrace_integration_tests.cmx b/garnet/bin/trace/tests/meta/ktrace_integration_tests.cmx
index dee0f98..9250cda 100644
--- a/garnet/bin/trace/tests/meta/ktrace_integration_tests.cmx
+++ b/garnet/bin/trace/tests/meta/ktrace_integration_tests.cmx
@@ -18,7 +18,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.sys.Launcher",
diff --git a/garnet/tests/benchmarks/input_latency/BUILD.gn b/garnet/tests/benchmarks/input_latency/BUILD.gn
index a5bddc6..34935b4 100644
--- a/garnet/tests/benchmarks/input_latency/BUILD.gn
+++ b/garnet/tests/benchmarks/input_latency/BUILD.gn
@@ -25,6 +25,8 @@
 }
 
 package("garnet_input_latency_benchmarks") {
+  deprecated_shell = "//build"
+
   testonly = true
 
   deps = [
diff --git a/garnet/tests/benchmarks/input_latency/run_simplest_app_benchmark.cmx b/garnet/tests/benchmarks/input_latency/run_simplest_app_benchmark.cmx
index f6a9923..4a02a74 100644
--- a/garnet/tests/benchmarks/input_latency/run_simplest_app_benchmark.cmx
+++ b/garnet/tests/benchmarks/input_latency/run_simplest_app_benchmark.cmx
@@ -4,7 +4,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.process.Launcher",
diff --git a/garnet/tests/benchmarks/input_latency/run_yuv_to_image_pipe_benchmark.cmx b/garnet/tests/benchmarks/input_latency/run_yuv_to_image_pipe_benchmark.cmx
index 8d7910b..c475200 100644
--- a/garnet/tests/benchmarks/input_latency/run_yuv_to_image_pipe_benchmark.cmx
+++ b/garnet/tests/benchmarks/input_latency/run_yuv_to_image_pipe_benchmark.cmx
@@ -4,7 +4,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.process.Launcher",
diff --git a/peridot/public/lib/modular_test_harness/cpp/BUILD.gn b/peridot/public/lib/modular_test_harness/cpp/BUILD.gn
index b1b150a..99f07099 100644
--- a/peridot/public/lib/modular_test_harness/cpp/BUILD.gn
+++ b/peridot/public/lib/modular_test_harness/cpp/BUILD.gn
@@ -77,6 +77,8 @@
 }
 
 test_package("test_harness_fixture_test") {
+  deprecated_shell = "//build"
+
   tests = [
     {
       name = "test_harness_fixture_test_bin"
diff --git a/peridot/public/lib/modular_test_harness/cpp/meta/test_harness_fixture_test_bin.cmx b/peridot/public/lib/modular_test_harness/cpp/meta/test_harness_fixture_test_bin.cmx
index 4b194f4..ee7296d0 100644
--- a/peridot/public/lib/modular_test_harness/cpp/meta/test_harness_fixture_test_bin.cmx
+++ b/peridot/public/lib/modular_test_harness/cpp/meta/test_harness_fixture_test_bin.cmx
@@ -4,7 +4,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.sys.Environment",
diff --git a/src/connectivity/network/testing/netemul/runner/BUILD.gn b/src/connectivity/network/testing/netemul/runner/BUILD.gn
index 3c80866..855fd10 100644
--- a/src/connectivity/network/testing/netemul/runner/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/BUILD.gn
@@ -179,6 +179,8 @@
 }
 
 package("netemul_devmgr") {
+  deprecated_shell = "//build"
+
   testonly = true
 
   deps = [
diff --git a/src/connectivity/network/testing/netemul/runner/meta/netemul_devmgr.cmx b/src/connectivity/network/testing/netemul/runner/meta/netemul_devmgr.cmx
index 72852fc..1428be13 100644
--- a/src/connectivity/network/testing/netemul/runner/meta/netemul_devmgr.cmx
+++ b/src/connectivity/network/testing/netemul/runner/meta/netemul_devmgr.cmx
@@ -10,7 +10,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.process.Launcher",
diff --git a/src/lib/isolated_devmgr/BUILD.gn b/src/lib/isolated_devmgr/BUILD.gn
index badbd1c..74cf77d 100644
--- a/src/lib/isolated_devmgr/BUILD.gn
+++ b/src/lib/isolated_devmgr/BUILD.gn
@@ -79,6 +79,8 @@
 }
 
 package("isolated_devmgr_tests") {
+  deprecated_shell = "//build"
+
   testonly = true
   deps = [
     ":devmgr-manifest",
diff --git a/src/lib/isolated_devmgr/isolated_devmgr.cmx b/src/lib/isolated_devmgr/isolated_devmgr.cmx
index dd6222a..33993d2 100644
--- a/src/lib/isolated_devmgr/isolated_devmgr.cmx
+++ b/src/lib/isolated_devmgr/isolated_devmgr.cmx
@@ -10,7 +10,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.process.Launcher",
diff --git a/src/lib/isolated_devmgr/isolated_devmgr_tests.cmx b/src/lib/isolated_devmgr/isolated_devmgr_tests.cmx
index 2d2dad9..b1e9e96 100644
--- a/src/lib/isolated_devmgr/isolated_devmgr_tests.cmx
+++ b/src/lib/isolated_devmgr/isolated_devmgr_tests.cmx
@@ -4,7 +4,7 @@
     },
     "sandbox": {
         "features": [
-            "shell"
+            "deprecated-shell"
         ],
         "services": [
             "fuchsia.process.Launcher",