diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 590c1f6b4b5..36cb4a6f5f9 100644
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -195,13 +195,3 @@ variables:
   extends:
     - .lava-arm64-test-gl
     - .lava-piglit-traces
-
-.lava-fluster:
-  variables:
-    FLUSTER_RESULTS: "${GPU_VERSION}-${FLUSTER_CODEC}"
-    HWCI_TEST_SCRIPT: "/install/fluster/fluster-runner.sh"
-
-.lava-fluster:x86_64:
-  extends:
-    - .lava-fluster
-
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 08a390952b4..6aff6542bc4 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -183,6 +183,11 @@ yaml-toml-shell-py-test:
   variables:
     ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG}
 
+.test-fluster:
+  variables:
+    FLUSTER_RESULTS: "${GPU_VERSION}-${FLUSTER_CODEC}"
+    HWCI_TEST_SCRIPT: "/install/fluster/fluster-runner.sh"
+
 .test-piglit:
   variables:
     PIGLIT_TAG: ${CONDITIONAL_BUILD_PIGLIT_TAG}
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index fef66719454..ea4ee74f750 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -466,7 +466,7 @@
 ############### Fluster tests ###############
 .radeonsi-raven-vaapi-fluster:
   extends:
-    - .lava-fluster:x86_64
+    - .test-fluster
   rules:
     - !reference [.radeonsi-vaapi-rules, rules]
     - changes: