diff --git a/.gitlab-ci/affectedtestsonly.yml b/.gitlab-ci/affectedtestsonly.yml
index c3bb83411d231c58541f817f0d10da62b3a99589..7387f722f4c223ff448769b8416c28b2f92e51d2 100644
--- a/.gitlab-ci/affectedtestsonly.yml
+++ b/.gitlab-ci/affectedtestsonly.yml
@@ -16,20 +16,19 @@ select tests:
     - dunecontrol --opts=$DUNE_OPTS_FILE --current all
     - |
       pushd build-cmake
-        python3 ../bin/testing/findtests.py -f ../affectedtests.json -t origin/master
+        python3 ../bin/testing/findtests.py -f affectedtests.json -t origin/master
       popd
   artifacts:
     paths:
-      - affectedtests.json
+      - build-cmake
     expire_in: 3 hours
 
 build dumux:
   stage: build
   script:
-    - dunecontrol --opts=$DUNE_OPTS_FILE --current all
-    - cp affectedtests.json build-cmake
     - |
       pushd build-cmake
+        make clean
         python3 ../bin/testing/runselectedtests.py -c affectedtests.json -b
       popd
   artifacts:
@@ -43,7 +42,6 @@ build dumux:
 test dumux:
   stage: test
   script:
-    - dunecontrol --opts=$DUNE_OPTS_FILE --current all
     - |
       pushd build-cmake
         python3 ../bin/testing/runselectedtests.py -c affectedtests.json -t