diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 0728d55b35f..aceb4fc510b 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -182,6 +182,12 @@ yaml-toml-shell-py-test:
   variables:
     ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG}
 
+.test-angle:
+  extends:
+    - .tag-check-angle
+  variables:
+    USE_ANGLE: 1
+
 .b2c-vkd3d-proton-test:
   variables:
     HWCI_TEST_SCRIPT: install/vkd3d-runner.sh
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index ffb208c1d41..e1ff4bf6ffa 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -84,6 +84,7 @@ a618-angle:
     - .lava-test-deqp:arm64
     - .lava-sc7180-trogdor-kingoftown:arm64
     - .collabora-turnip-manual-rules
+    - .test-angle
   variables:
     DEQP_SUITE: tu-angle
     USE_ANGLE: 1
@@ -232,6 +233,7 @@ a660-angle:
     - .lava-test-deqp:arm64
     - .lava-sm8350-hdk:arm64
     - .collabora-turnip-manual-rules
+    - .test-angle
   variables:
     DEQP_SUITE: tu-angle
     USE_ANGLE: 1
@@ -420,6 +422,7 @@ a750-angle:
     - .b2c-arm64-test-gl
     - .a750-mupuf
     - .valve-turnip-manual-rules
+    - .test-angle
   timeout: 25m  # base runtime 10min total, 7min of testing
   variables:
     USE_ANGLE: 1
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index 325531c97f0..ff65ff0293a 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -59,7 +59,6 @@ lavapipe-vkd3d:
 
 android-angle-lavapipe:
   variables:
-    USE_ANGLE: 1
     ANDROID_GPU_MODE: mesa_swrast_guest_angle
     DEQP_SUITE: android-angle-lavapipe
     GPU_VERSION: lvp-android-angle
@@ -68,3 +67,4 @@ android-angle-lavapipe:
   extends:
     - .test-android
     - .lavapipe-rules
+    - .test-angle
diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml
index 0d76163bdbd..41dd598f7b9 100644
--- a/src/virtio/ci/gitlab-ci.yml
+++ b/src/virtio/ci/gitlab-ci.yml
@@ -41,8 +41,8 @@ venus-lavapipe-full:
   extends:
     - .test-android
     - .venus-manual-rules
+    - .test-angle
   variables:
-    USE_ANGLE: 1
     ANDROID_GPU_MODE: venus_guest_angle
     GPU_VERSION: venus
     DEQP_SUITE: android-venus-angle