diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6287f2377973f410e8b9d7b27a8783b62c08e42..cccda7c93e7b7071b9f84be507186807a6c03444 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -276,20 +276,9 @@ typecheck:
 
 # -------------------- Unit Tests ---------------------------------------------------------------------
 
-# Normal test - runs on every commit all but "long run" tests
-tests-and-coverage:
+.testsuite-base:
   stage: "Unit Tests"
   needs: []
-  image: i10git.cs.fau.de:5005/pycodegen/pycodegen/nox:ubuntu24.04-cuda12.6
-  script:
-    - mkdir -p ~/.config/matplotlib
-    - echo "backend:template" > ~/.config/matplotlib/matplotlibrc
-    - mkdir public
-    - nox --session "testsuite(cupy12)"
-  tags:
-    - docker
-    - cuda11
-    - AVX
   coverage: /Total coverage:\s\d+.\d+\%/
   artifacts:
     when: always
@@ -302,6 +291,28 @@ tests-and-coverage:
         path: coverage.xml
       junit: report.xml
 
+testsuite-gpu-py3.10:
+  extends: .testsuite-base
+  image: i10git.cs.fau.de:5005/pycodegen/pycodegen/nox:ubuntu24.04-cuda12.6
+  script:
+    - mkdir -p ~/.config/matplotlib
+    - echo "backend:template" > ~/.config/matplotlib/matplotlibrc
+    - mkdir public
+    - nox --session "testsuite-3.10(cupy12)"
+  tags:
+    - docker
+    - cuda11
+    - AVX
+
+testsuite-cpu-py3.13:
+  extends: .testsuite-base
+  image: i10git.cs.fau.de:5005/pycodegen/pycodegen/nox:alpine
+  script:
+    - nox --session "testsuite-3.13(cupy12)"
+  tags:
+    - docker
+    - AVX
+
 # -------------------- Documentation ---------------------------------------------------------------------