diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index 33b1d458af..1920835314 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -1,3 +1,15 @@
+unittests:
+  extends: .recompile-branch
+  stage: build
+  variables:
+    GIT_DEPTH: 9999999999999
+  script:
+    - ln -s /dockercache/cache-all target
+    - cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
+    - cargo test
+  retry:
+    max: 2
+
 benchmarks:
   extends: .recompile-branch
   stage: build
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index 990b15176a..0459d2ecc3 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -1,14 +1,11 @@
-check:
+# cargo clippy is a superset of cargo check, so we don't check manually
+code-quality:
   extends: .recompile-branch
   stage: check
   script:
     - ln -s /dockercache/cache-all target
+    - cargo clippy --all-targets --locked -- -D warnings
     - cargo fmt --all -- --check
-    # TODO: currently there are some examples that fail clippy
-    # - cargo clippy --all-targets --locked -- -D warnings
-    - cargo clippy --bins --tests --locked -- -D warnings
-    - cargo test
-    - cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
 
 security:
   extends: .recompile-branch