diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b15e8043a5d78bcf5639b9f25029006ba1cad6d..0235325231ac759e56b20fd10c0687c89400316e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,17 @@
-before_script:
-  tags: linux
-  - apt-get update -qq && apt-get install -y wget bzip2 make gcc gcc-multilib time bc git
-  - wget -nv https://common-lisp.net/project/cmucl/downloads/snapshots/2017/10/cmucl-2017-10-x86-linux.tar.bz2
-  - wget -nv https://common-lisp.net/project/cmucl/downloads/snapshots/2017/10/cmucl-2017-10-x86-linux.extra.tar.bz2
-  - mkdir snapshot
-  - (cd snapshot; tar xjf ../cmucl-2017-10-x86-linux.tar.bz2; tar xjf ../cmucl-2017-10-x86-linux.extra.tar.bz2)
+linux-setup:
+  tags: 
+   - linux
+  script:
+    - apt-get update -qq && apt-get install -y wget bzip2 make gcc gcc-multilib time bc git
+    - wget -nv https://common-lisp.net/project/cmucl/downloads/snapshots/2017/10/cmucl-2017-10-x86-linux.tar.bz2
+    - wget -nv https://common-lisp.net/project/cmucl/downloads/snapshots/2017/10/cmucl-2017-10-x86-linux.extra.tar.bz2
+    - mkdir snapshot
+    - (cd snapshot; tar xjf ../cmucl-2017-10-x86-linux.tar.bz2; tar xjf ../cmucl-2017-10-x86-linux.extra.tar.bz2)
 
 test:
-  tags: linux
+  tags: 
+    - linux
   script:
     - bin/build.sh -B boot-21c -C "" -o ./snapshot/bin/lisp
     - bin/make-dist.sh -I dist-linux linux-4
-    - bin/run-tests.sh -l dist-linux/bin/lisp 2>&1 | tee test.log
+    - bin/run-tests.sh -l dist-linux/bin/lisp 2>&1 | tee test.log
\ No newline at end of file