diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index e7510f0bee3..940365e14b2 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -120,7 +120,6 @@ VARS=(
     VIRGL_RENDER_SERVER
     WAFFLE_PLATFORM
     VK_DRIVER
-    VKD3D_TEST_EXCLUDE
     ZINK_DESCRIPTORS
     ZINK_DEBUG
     LVP_POISON_MEMORY
diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh
index 8f5516c1694..3f2bfae2a46 100755
--- a/.gitlab-ci/vkd3d-runner.sh
+++ b/.gitlab-ci/vkd3d-runner.sh
@@ -2,6 +2,11 @@
 
 set -ex
 
+comma_separated() {
+  local IFS=,
+  echo "$*"
+}
+
 if [[ -z "$VK_DRIVER" ]]; then
     exit 1
 fi
@@ -29,6 +34,12 @@ export WINEDEBUG="-all"
 export WINEPREFIX="/vkd3d-proton-wine64"
 export WINEESYNC=1
 
+if [ -f "$INSTALL/$GPU_VERSION-vkd3d-skips.txt" ]; then
+  mapfile -t skips < <(grep -vE '^#|^$' "$INSTALL/$GPU_VERSION-vkd3d-skips.txt")
+  VKD3D_TEST_EXCLUDE=$(comma_separated "${skips[@]}")
+  export VKD3D_TEST_EXCLUDE
+fi
+
 # Sanity check to ensure that our environment is sufficient to make our tests
 # run against the Mesa built by CI, rather than any installed distro version.
 MESA_VERSION=$(cat "$INSTALL/VERSION")
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 641f0709c5d..2f3c98c54aa 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -15,6 +15,7 @@
         - src/amd/ci/$GPU_VERSION-skips.txt
         - src/amd/ci/$PIGLIT_TRACES_FILE
         - src/amd/ci/$GPU_VERSION-vkd3d-fails.txt
+        - src/amd/ci/$GPU_VERSION-vkd3d-skips.txt
         - src/amd/common/**/*
         - src/amd/llvm/**/*
         - src/amd/registers/**/*
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 1db28b6b82f..2cccb2e972f 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -322,8 +322,6 @@ vkd3d-tahiti-valve:
     - .radv-valve-manual-rules
   variables:
     GPU_VERSION: radv-tahiti
-    # These vkd3d-proton tests are skipped because they trigger GPU hangs.
-    VKD3D_TEST_EXCLUDE: test_execute_indirect_state,test_execute_indirect_state_predication,test_undefined_descriptor_heap_mismatch_types
 
 vkd3d-polaris10-valve:
   extends:
diff --git a/src/amd/ci/radv-tahiti-vkd3d-skips.txt b/src/amd/ci/radv-tahiti-vkd3d-skips.txt
new file mode 100644
index 00000000000..ff9a9229313
--- /dev/null
+++ b/src/amd/ci/radv-tahiti-vkd3d-skips.txt
@@ -0,0 +1,4 @@
+# These vkd3d-proton tests are skipped because they trigger GPU hangs.
+test_execute_indirect_state
+test_execute_indirect_state_predication
+test_undefined_descriptor_heap_mismatch_types