diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1224312a5b823986789b4fc125f52636e261b300..a3308a33c7a5091687fda61e1fbe2a127cc613aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,16 @@ include:
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/general.yml
     - project: "AlekSIS/official/AlekSIS"
-      file: /ci/test.yml
+      file: /ci/test/lint.yml
     - project: "AlekSIS/official/AlekSIS"
-      file: /ci/build_dist.yml
+      file: /ci/test/security.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/build/dist.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: "/ci/deploy/trigger_dist.yml"
+    - project: "AlekSIS/official/AlekSIS"
+      file: "/ci/docker/image.yml"
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/publish/pypi.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/deploy/review.yml
diff --git a/tox.ini b/tox.ini
index 98fce3af53aa48d1eac2e28454c26e7b74c23f72..f09d243fd2ddcd42c0eae1a6c298c08eb9557a13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,9 +9,11 @@ whitelist_externals = poetry
 skip_install = true
 envdir = {toxworkdir}/globalenv
 commands_pre =
-     - poetry install
+     poetry install
+     poetry run aleksis-admin yarn install
+     poetry run aleksis-admin collectstatic --no-input
 commands =
-    - poetry run pytest --cov=. {posargs} aleksis/
+    poetry run pytest --cov=. {posargs} aleksis/
 
 [testenv:selenium]
 setenv =
@@ -33,6 +35,7 @@ commands =
 
 [testenv:build]
 commands_pre =
+    poetry run sh -c "cd aleksis; aleksis-admin compilemessages"
 commands = poetry build
 
 [testenv:docs]