diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fc65160a0d265a4f81b6438354af5b9bb1be898..a516241adbc288e2af0760e6f139b2eb86c13096 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
-  - build
   - models
+  - build
   - test
   - benchmark
 
@@ -13,27 +13,26 @@ cache:
     - .gradle/caches
     - ttc2018liveContest
 
-build:
-  image: openjdk:11
-  stage: build
-  script:
-    - ./gradlew --console=plain assemble
-
 prepareTTCrepo:
   # use same image as other jobs, and it has git already available
   image: openjdk:11
   stage: models
   script:
     - "[ -d /ttc2018liveContest ] || git clone --depth=1 https://github.com/TransformationToolContest/ttc2018liveContest.git ttc2018liveContest"
-    - cd solve/src/test/resources
-    - ln -s ../../../../ttc2018liveContest/models .
-  artifacts:
-    paths:
-      - "ttc2018liveContest/models"
-      - "solve/src/test/resources/models"
-      - "solve/src/test/resources/models/1"
-      - "solve/src/test/resources/models/2"
-      - "solve/src/test/resources/models/32"
+    - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
+#  artifacts:
+#    paths:
+#      - "ttc2018liveContest/models"
+#      - "solve/src/test/resources/models"
+#      - "solve/src/test/resources/models/1"
+#      - "solve/src/test/resources/models/2"
+#      - "solve/src/test/resources/models/32"
+
+build:
+  image: openjdk:11
+  stage: build
+  script:
+    - ./gradlew --console=plain assemble
 
 test:
   image: openjdk:11
@@ -42,7 +41,8 @@ test:
     - build
     - prepareTTCrepo
   script:
-    - ./gradlew --console=plain --info test
+    - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
+    - ./gradlew --console=plain test
   artifacts:
     when: always
     reports:
@@ -55,6 +55,7 @@ timing:
     - build
     - prepareTTCrepo
   script:
+    - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
     - ./all-timed-benchmark.sh
   artifacts:
     paths: