diff --git a/.buildkite/tests.sh b/.buildkite/tests.sh
index b0078319..7d4a7489 100755
--- a/.buildkite/tests.sh
+++ b/.buildkite/tests.sh
@@ -136,6 +136,8 @@ for target in \
         +test-no-qemu-group6 \
         +test-no-qemu-group7 \
         +test-no-qemu-group8 \
+        +test-no-qemu-group9 \
+        +test-no-qemu-group10 \
         +test-no-qemu-slow \
         +test-qemu \
         ; do
diff --git a/.github/workflows/ci-docker-ubuntu.yml b/.github/workflows/ci-docker-ubuntu.yml
index a4fd9f5c..8e064281 100644
--- a/.github/workflows/ci-docker-ubuntu.yml
+++ b/.github/workflows/ci-docker-ubuntu.yml
@@ -291,6 +291,34 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
+  docker-tests-no-qemu-group9:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-group9"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "docker"
+      SUDO: ""
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+      EXTRA_ARGS: "--auto-skip"
+    secrets: inherit
+
+  docker-tests-no-qemu-group10:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-group10"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "docker"
+      SUDO: ""
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+      EXTRA_ARGS: "--auto-skip"
+    secrets: inherit
+
   docker-tests-no-qemu-slow:
     needs: build-earthly
     if: ${{ !failure() }}
diff --git a/.github/workflows/ci-podman-ubuntu.yml b/.github/workflows/ci-podman-ubuntu.yml
index e8e55fd1..3e9ca537 100644
--- a/.github/workflows/ci-podman-ubuntu.yml
+++ b/.github/workflows/ci-podman-ubuntu.yml
@@ -170,6 +170,32 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
+  podman-tests-no-qemu-group9:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-group9"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "podman"
+      SUDO: "sudo -E"
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+    secrets: inherit
+
+  podman-tests-no-qemu-group10:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-group10"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "podman"
+      SUDO: "sudo -E"
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+    secrets: inherit
+
   podman-tests-no-qemu-slow:
     needs: build-earthly
     if: ${{ !failure() }}
diff --git a/tests/Earthfile b/tests/Earthfile
index 0976a1a9..8f76b4f9 100644
--- a/tests/Earthfile
+++ b/tests/Earthfile
@@ -180,7 +180,6 @@ ga-no-qemu-group7:
     BUILD +cache-mount-arg
     BUILD +infinite-recursion
     BUILD +save-artifact-selective
-    BUILD --pass-args ./autoskip+test-all
     BUILD +if-exists
     BUILD +let-set
     BUILD +let-scope
@@ -203,6 +202,13 @@ ga-no-qemu-group8:
     BUILD --pass-args ./pass-args-global-via-function+test
     BUILD --pass-args ./pass-args-via-function-with-override+test
 
+ga-no-qemu-group9:
+    BUILD --pass-args ./autoskip+test-group1
+
+ga-no-qemu-group10:
+    BUILD --pass-args ./autoskip+test-group2
+
+
 ga-no-qemu-slow:
     BUILD +server
     BUILD --pass-args ./with-docker+all
diff --git a/tests/autoskip/Earthfile b/tests/autoskip/Earthfile
index 9eb200b6..d2a066ae 100644
--- a/tests/autoskip/Earthfile
+++ b/tests/autoskip/Earthfile
@@ -9,6 +9,10 @@ PROJECT earthly-technologies/core
 WORKDIR /test
 
 test-all:
+    BUILD +test-group1
+    BUILD +test-group2
+
+test-group1:
     BUILD +test-files
     BUILD +test-with-subdir
     BUILD +test-requires-project
@@ -23,6 +27,8 @@ test-all:
     BUILD +test-arg-matrix
     BUILD +test-try-catch
     BUILD +test-push
+
+test-group2:
     BUILD +test-no-cache
     BUILD +test-shell-out
     BUILD +test-copy-if-exists