diff --git a/build/dart/rules.gni b/build/dart/rules.gni
index 7e9376e52ad31..a9810b944c385 100644
--- a/build/dart/rules.gni
+++ b/build/dart/rules.gni
@@ -9,6 +9,22 @@ import("//build/module_args/dart.gni")
 import("//flutter/common/config.gni")
 import("//third_party/dart/build/dart/dart_action.gni")
 
+frontend_server_files =
+    exec_script("//third_party/dart/tools/list_dart_files.py",
+                [
+                  "absolute",
+                  rebase_path("."),
+                ],
+                "list lines")
+
+frontend_server_files +=
+    exec_script("//third_party/dart/tools/list_dart_files.py",
+                [
+                  "absolute",
+                  rebase_path("../../third_party/dart/pkg"),
+                ],
+                "list lines")
+
 # Creates a dart kernel (dill) file suitable for use with gen_snapshot, as well
 # as the app-jit, aot-elf, or aot-assembly snapshot for targeting Flutter on
 # Android or iOS.
@@ -38,22 +54,18 @@ template("flutter_snapshot") {
     deps = [ "//flutter/lib/snapshot:strong_platform" ]
 
     inputs = [
-      main_dart,
-      package_config,
-    ]
+               main_dart,
+               package_config,
+             ] + frontend_server_files
 
     outputs = [ kernel_output ]
 
     depfile = "$kernel_output.d"
     abs_depfile = rebase_path(depfile)
-    rebased_output = rebase_path(kernel_output, root_build_dir)
-    vm_args = [
-      "--depfile=$abs_depfile",
-      "--depfile_output_filename=$rebased_output",
-      "--disable-dart-dev",
-    ]
+    vm_args = [ "--disable-dart-dev" ]
 
     args = [
+      "--depfile=$abs_depfile",
       "--packages=" + rebase_path(package_config),
       "--target=flutter",
       "--sdk-root=" + flutter_patched_sdk,
diff --git a/flutter_frontend_server/BUILD.gn b/flutter_frontend_server/BUILD.gn
index 4faa6eab68b79..9e986066595ab 100644
--- a/flutter_frontend_server/BUILD.gn
+++ b/flutter_frontend_server/BUILD.gn
@@ -4,22 +4,6 @@
 
 import("//flutter/build/dart/rules.gni")
 
-frontend_server_files =
-    exec_script("//third_party/dart/tools/list_dart_files.py",
-                [
-                  "absolute",
-                  rebase_path("."),
-                ],
-                "list lines")
-
-frontend_server_files +=
-    exec_script("//third_party/dart/tools/list_dart_files.py",
-                [
-                  "absolute",
-                  rebase_path("../../third_party/dart/pkg"),
-                ],
-                "list lines")
-
 application_snapshot("frontend_server") {
   main_dart = "bin/starter.dart"
   deps = [ "//flutter/lib/snapshot:kernel_platform_files" ]
diff --git a/testing/scenario_app/README.md b/testing/scenario_app/README.md
index 31ed22528876c..fd68009ec768d 100644
--- a/testing/scenario_app/README.md
+++ b/testing/scenario_app/README.md
@@ -21,10 +21,17 @@ platform channel.
 
 ## Running for iOS
 
+Build the `ios_debug_sim_unopt` engine variant, and run
+
 ```sh
-./build_and_run_ios_tests.sh
+./run_ios_tests.sh
 ```
 
+in your shell.
+
+To run or debug in Xcode, open the xcodeproj file located in
+`<engine_out_dir>/scenario_app/Scenarios/Scenaios.xoceproj`.
+
 ### iOS Platform View Tests
 
 For PlatformView tests on iOS, you'll also have to edit the dictionaries in
@@ -49,40 +56,13 @@ compared against golden reside.
 
 ## Running for Android
 
-The test is run on a x86 emulator. To run the test locally, you must create an emulator running API level 28, using an x86_64 ABI, and set the following screen settings in the avd's `config.ini` file:
-
-```
-hw.lcd.density = 480
-hw.lcd.height = 1680
-hw.lcd.width = 1080
-lcd.depth = 16
-```
-
-This file is typically located in your `$HOME/.android/avd/<avd>` folder.
-
-Once the emulator is up, you can run the test by running:
-
-```bash
-./build_and_run_android_tests.sh
-```
-
-### Generating Golden Images on Android
+The only test that is currently run is the Firebase TestLab test, which is a
+smoke test to make sure an application can be built and run on a real Android
+device.
 
-In the `android` directory, run:
-
-```bash
-../../../../gradle/bin/gradle app:recordDebugAndroidTestScreenshotTest
-```
-
-The screenshots are recorded into `android/reports/screenshots`.
-
-### Verifying Golden Images on Android
-
-In the `android` directory, run:
-
-```bash
-../../../../gradle/bin/gradle app:verifyDebugAndroidTestScreenshotTest
-```
+To run it, build the `android_profile_arm64` variant of the engine, and run
+`./flutter/ci/firebase_testlab.py`. If you wish to test a different variant, e.g.
+debug arm64, pass `--variant android_debug_arm64`.
 
 ### Updating Gradle dependencies
 
@@ -94,8 +74,3 @@ To generate new lockfiles, run:
 cd android
 ../../../../gradle/bin/gradle generateLockfiles
 ```
-
-## Changing dart:ui code
-
-If you change the dart:ui interface, remember to point the sky_engine
-clauses to your local engine's output path before compiling.
\ No newline at end of file