diff --git a/.github/workflows/tests_fyi.yml b/.github/workflows/tests_android.yml
similarity index 55%
rename from .github/workflows/tests_fyi.yml
rename to .github/workflows/tests_android.yml
index f32978486c..ab100231a5 100644
--- a/.github/workflows/tests_fyi.yml
+++ b/.github/workflows/tests_android.yml
@@ -1,10 +1,18 @@
-name: "tests 3"
+name: "tests Android"
 
 on:
   push:
     branches:
       - main
       - release-*
+  pull_request:
+    branches:
+      - main
+      - release-*
+    paths:
+      - "**android**"
+      - "utils/avd_*.js"
+      - ".github/workflows/tests_android.yml"
 
 env:
   # Force terminal colors. @see https://www.npmjs.com/package/colors
@@ -12,36 +20,6 @@ env:
   FLAKINESS_CONNECTION_STRING: ${{ secrets.FLAKINESS_CONNECTION_STRING }}
 
 jobs:
-  video_linux:
-    name: "Video Linux"
-    strategy:
-      fail-fast: false
-      matrix:
-        browser: [chromium, firefox, webkit]
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 12
-    - run: npm i -g npm@8.3
-    - run: npm ci
-      env:
-        DEBUG: pw:install
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    - run: npm run build
-    - run: npx playwright install --with-deps ${{ matrix.browser }} chromium
-    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=${{ matrix.browser }}
-      env:
-        PWTEST_VIDEO: 1
-    - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
-      if: always()
-    - uses: actions/upload-artifact@v1
-      if: ${{ always() }}
-      with:
-        name: video-${{ matrix.browser }}-linux-test-results
-        path: test-results
-
   test_android:
     name: Android Emulator (shard ${{ matrix.shard }})
     strategy:
diff --git a/.github/workflows/tests_video.yml b/.github/workflows/tests_video.yml
new file mode 100644
index 0000000000..7642c50998
--- /dev/null
+++ b/.github/workflows/tests_video.yml
@@ -0,0 +1,43 @@
+name: "tests Video"
+
+on:
+  push:
+    branches:
+      - main
+      - release-*
+
+env:
+  # Force terminal colors. @see https://www.npmjs.com/package/colors
+  FORCE_COLOR: 1
+  FLAKINESS_CONNECTION_STRING: ${{ secrets.FLAKINESS_CONNECTION_STRING }}
+
+jobs:
+  video_linux:
+    name: "Video Linux"
+    strategy:
+      fail-fast: false
+      matrix:
+        browser: [chromium, firefox, webkit]
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 12
+    - run: npm i -g npm@8.3
+    - run: npm ci
+      env:
+        DEBUG: pw:install
+        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+    - run: npm run build
+    - run: npx playwright install --with-deps ${{ matrix.browser }} chromium
+    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=${{ matrix.browser }}
+      env:
+        PWTEST_VIDEO: 1
+    - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
+      if: always()
+    - uses: actions/upload-artifact@v1
+      if: ${{ always() }}
+      with:
+        name: video-${{ matrix.browser }}-linux-test-results
+        path: test-results