diff --git a/.gitlab-ci/default.yml b/.gitlab-ci/default.yml
index 06a1a2262a770c62fcf94f8a88dc124b95f1a475..96cd49f03e43eced8ac1233aed6cf59ecdfbd5a5 100644
--- a/.gitlab-ci/default.yml
+++ b/.gitlab-ci/default.yml
@@ -19,6 +19,7 @@ select tests:
   script:
     - |
       if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
+          rm -rf build-cmake/
           dunecontrol --opts=$DUNE_OPTS_FILE --current all
           pushd build-cmake
             python3 ../bin/testing/findtests.py -f ../affectedtests.json -t origin/master
diff --git a/bin/testing/findtests.py b/bin/testing/findtests.py
index f92322c665944fe3240f016e8e870f22f948852a..365d1f73e1fe7c59fc1d48e6514e28ea672a2101 100755
--- a/bin/testing/findtests.py
+++ b/bin/testing/findtests.py
@@ -72,6 +72,7 @@ def isAffectedTest(testConfigFile, changed_files):
     test_files = set(test_files)
 
     if hasCommonMember(changed_files, test_files):
+        print("Main-File of test {}: {}".format(testConfigFile, mainFile))
         return True, testConfig["name"], testConfig["target"]
 
     return False, testConfig["name"], testConfig["target"]
diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake
index 5268191a609f304cd7c55db34fad75a756c3eb08..50b930610313a47068014bedddad5b79c670936e 100644
--- a/cmake/modules/DumuxTestMacros.cmake
+++ b/cmake/modules/DumuxTestMacros.cmake
@@ -249,10 +249,11 @@ function(dumux_add_test)
     set(dummymain ${CMAKE_CURRENT_BINARY_DIR}/main77_${ADDTEST_NAME}.cc)
     configure_file(${scriptdir}/main77.cc.in ${dummymain})
     set(ADDTEST_SOURCES ${dummymain})
-  endif()
 
-  # Add the executable if it is not already present
-  if(ADDTEST_SOURCES)
+    # Tests to be skipped get a dummy target based on the name
+    set(ADDTEST_TARGET ${ADDTEST_NAME})
+  elseif(ADDTEST_SOURCES)
+    # Add the executable if it is not already present
     set(ADDTEST_TARGET ${ADDTEST_NAME})
   endif()
 
diff --git a/test/porousmediumflow/1p/convergence/discretesolution/problem.hh b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
index e7aeda7baa1ff2a5db9836a2c13a435c4855666a..6ad6f7dc07726ba826826899dc242aed128a0e70 100644
--- a/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
+++ b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
@@ -25,7 +25,6 @@
 #define DUMUX_INCOMPRESSIBLE_ONEP_CONVERGENCETEST_PROBLEM_HH
 
 #include <cmath>
-
 #include <dune/geometry/quadraturerules.hh>
 
 #include <dumux/common/properties.hh>