diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05a89fac6cf51727657710146e3a6625e3750a7e..0fc0983bcbd900d232cbd576206302565cebc6f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ build:
   tags:
     - general
 
-test:
+test-nvidia-gpu:
   stage: test
   script:
     - clinfo
@@ -41,6 +41,23 @@ test:
   tags:
     - opencl
 
+test-nvidia-cpu:
+  stage: test
+  script:
+    - clinfo
+    - mvn $MAVEN_CLI_OPTS test
+  tags:
+    - compute
+
+test-amdgpu-cpu:
+  image: aparapi/aparapi-amdgpu:git
+  stage: test
+  script:
+    - clinfo
+    - mvn $MAVEN_CLI_OPTS test
+  tags:
+    - compute
+
 deploy:
   stage: deploy
   script: