diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9a2689567..c88816b09 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -79,7 +79,7 @@ jobs:
 
   zircon-core-test:
     name: Zircon Core Test Baremetal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -154,7 +154,7 @@ jobs:
 
   linux-libc-test-baremetal:
     name: Linux Libc Test Baremetal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -203,15 +203,15 @@ jobs:
 
       - name: Run fast tests
         if: github.event_name != 'schedule'
-        run: cd tests && python3 linux_libc_test.py --arch ${{ matrix.arch }} --fast
+        run: cd tests && python3 linux_libc_test-qemu.py --arch ${{ matrix.arch }} --fast
 
       - name: Run full tests
         if: github.event_name == 'schedule'
-        run: cd tests && python3 linux_libc_test.py --arch ${{ matrix.arch }}
+        run: cd tests && python3 linux_libc_test-qemu.py --arch ${{ matrix.arch }}
 
   linux-other-test-baremetal:
     name: Linux Other Test Baremetal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/tests b/tests
index c7816b088..85e5a7c23 160000
--- a/tests
+++ b/tests
@@ -1 +1 @@
-Subproject commit c7816b088ae74b909c5ed0aad5e30f40fed68bfe
+Subproject commit 85e5a7c237ac8deea594536abd6eb12c582f0dcc