diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dec40bd511..f7efd2661cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1362,3 +1362,8 @@ debian-mingw32-x86_64:
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     FDO_CI_CONCURRENT: 0 # Default to number of CPUs
+
+.baremetal-skqp-test:
+  variables:
+    HWCI_START_XORG: 1
+    HWCI_TEST_SCRIPT: "/install/skqp-runner.sh"
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index c0242adfc28..3684c67ab10 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -205,6 +205,15 @@ a630_gles_asan:
     DEQP_EXPECTED_RENDERER: FD630
     GPU_VERSION: freedreno-a630-asan
 
+a630_skqp:
+  extends:
+    - .baremetal-skqp-test
+    - .a630-test
+  variables:
+    # Possible skqp backends: gl, gles, unitTest and vk
+    # Note: vk backend is not working yet.
+    SKQP_BACKENDS: gl gles unitTest  # space separated values
+
 a630_vk:
   extends:
     - .a630-test