diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 0cd1e8c4603..449e03a9ab2 100644
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
   timeout: 1h
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
+    HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
     FDO_CI_CONCURRENT: 6 # should be replaced by per-machine definitions
     # the dispatchers use this to cache data locally
     LAVA_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="
@@ -64,6 +65,101 @@ variables:
     - job: python-artifacts
       artifacts: false
 
+.lava-x86_64-test:
+  variables:
+    ARCH: x86_64
+    DEBIAN_ARCH: amd64
+    KERNEL_IMAGE_NAME: bzImage
+    KERNEL_IMAGE_TYPE: "zimage"
+    BOOT_METHOD: u-boot
+  extends:
+    - .use-debian/x86_64_pyutils
+    - .lava-test
+  needs:
+    - !reference [.lava-test, needs]
+    - job: debian-testing
+      artifacts: false
+
+.lava-x86_64-test-gl:
+  variables:
+    LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-gl, variables, LAVA_DISTRIBUTION_TAG]
+  extends:
+    - .lava-x86_64-test
+  needs:
+    - !reference [.lava-x86_64-test, needs]
+    - job: debian/x86_64_test-gl
+      artifacts: false
+
+.lava-x86_64-test-vk:
+  variables:
+    LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-vk, variables, LAVA_DISTRIBUTION_TAG]
+  extends:
+    - .lava-x86_64-test
+  needs:
+    - !reference [.lava-x86_64-test, needs]
+    - job: debian/x86_64_test-vk
+      artifacts: false
+
+.lava-arm32-test:
+  variables:
+    ARCH: arm32
+    DEBIAN_ARCH: armhf
+    KERNEL_IMAGE_NAME: zImage
+    KERNEL_IMAGE_TYPE: "zimage"
+    BOOT_METHOD: u-boot
+  extends:
+    - .use-debian/x86_64_pyutils
+    - .lava-test
+  needs:
+    - !reference [.lava-test, needs]
+    - job: debian-arm32
+      artifacts: false
+
+.lava-arm32-test-gl:
+  variables:
+    LAVA_DISTRIBUTION_TAG: !reference [debian/arm32_test-gl, variables, LAVA_DISTRIBUTION_TAG]
+  extends:
+    - .lava-arm32-test
+  needs:
+    - !reference [.lava-arm32-test, needs]
+    - job: debian/arm32_test-gl
+      artifacts: false
+
+.lava-arm64-test:
+  variables:
+    ARCH: arm64
+    DEBIAN_ARCH: arm64
+    KERNEL_IMAGE_NAME: Image
+    KERNEL_IMAGE_TYPE: "image"
+    BOOT_METHOD: u-boot
+  extends:
+    - .use-debian/x86_64_pyutils
+    - .lava-test
+  needs:
+    - !reference [.lava-test, needs]
+    - job: debian-arm64
+      artifacts: false
+
+.lava-arm64-test-gl:
+  variables:
+    LAVA_DISTRIBUTION_TAG: !reference [debian/arm64_test-gl, variables, LAVA_DISTRIBUTION_TAG]
+  extends:
+    - .lava-arm64-test
+  needs:
+    - !reference [.lava-arm64-test, needs]
+    - job: debian/arm64_test-gl
+      artifacts: false
+
+.lava-arm64-test-vk:
+  variables:
+    LAVA_DISTRIBUTION_TAG: !reference [debian/arm64_test-vk, variables, LAVA_DISTRIBUTION_TAG]
+  extends:
+    - .lava-arm64-test
+  needs:
+    - !reference [.lava-arm64-test, needs]
+    - job: debian/arm64_test-vk
+      artifacts: false
+
 .lava-test:arm32:
   variables:
     ARCH: arm32