diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 726057e3c..4c9530804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,11 @@ stages:
   - test
   - package
 
+run-code-quality-tests:
+  stage: test
+  script:
+    - python3 -m flake8 --exclude actions/domainname-change,actions/dynamicdns,actions/hostname-change,actions/networks plinth actions/*
+
 run-unit-tests:
   stage: test
   script:
@@ -18,16 +23,18 @@ run-unit-tests:
     - echo "tester:password" | chpasswd
     - cp -r . /home/tester/plinth
     - chown -R tester:tester /home/tester/plinth
-    - su -c "cd ~/plinth; python3 -m flake8 --exclude actions/domainname-change,actions/dynamicdns,actions/hostname-change,actions/networks plinth actions/*" tester
     - su -c "cd ~/plinth;PYTHONPATH='.' py.test-3 --cov=plinth --cov-report=html:/home/tester/plinth/htmlcov --cov-report=term" tester
     - cp -r /home/tester/plinth/htmlcov test-coverage-report
-    - su -c "doc/scripts/wikiparser.py" tester
-
   coverage: '/^TOTAL\s+.*\s+(\d+\.\d+%)$/'
   artifacts:
     paths:
       - test-coverage-report/*
 
+run-doc-tests:
+  stage: test
+  script:
+    - doc/scripts/wikiparser.py
+
 build-debian-package:
   stage: package
   script: