diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab0c69e44..28ae14323 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,21 +230,47 @@ uniworx:exe:uniworxload:
   retry: 2
   interruptible: true
 
-check:
+
+# check:
+#   stage: test
+#   script:
+#     - xzcat frontend.nar.xz | nix-store --import
+#     - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import
+#     - nix -L flake check .
+#   before_script: *nix-before
+#   needs:
+#     - job: node modules # transitive
+#       artifacts: false
+#     - job: frontend build
+#       artifacts: true
+#   retry: 2
+#   interruptible: true
+
+frontend test:
   stage: test
   script:
-    - xzcat frontend.nar.xz | nix-store --import
-    - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import
-    - nix -L flake check .
+    - "nix shell .#gnumake .#nodejs-14_x --command make frontend-test"
   before_script: *nix-before
+  cache: *frontend-cache
   needs:
-    - job: node modules # transitive
-      artifacts: false
-    - job: frontend build
+    - job: node modules
       artifacts: true
   retry: 2
   interruptible: true
 
+backend test:
+  stage: test
+  script:
+    - "nix shell .#gnumake .#stack --command make backend-test"
+  before_script: *nix-before
+  cache: *stack-cache
+  needs:
+    - job: backend dependencies
+      artifacts: true
+  retry: 2
+  interruptible: true
+
+
 container:
   stage: container
   script: