diff --git a/cmake/modules/DuneUtils.cmake b/cmake/modules/DuneUtils.cmake
index 321d47c89f1f70ba4226653a067e7644213af9bd..af681398316cc0741b85ee4b09d0b91212e2044a 100644
--- a/cmake/modules/DuneUtils.cmake
+++ b/cmake/modules/DuneUtils.cmake
@@ -109,7 +109,7 @@ macro(END_TESTCASES)
                    ${CMAKE_CURRENT_BINARY_DIR}/dxt_all_sorted_testnames.cmake)
     configure_file(${dune-xt-common-module-path}/dxt_headercheck_targets.cmake.in
                    ${CMAKE_CURRENT_BINARY_DIR}/dxt_headercheck_targets.cmake)
-    add_custom_target(rerun_test_distribution ${CMAKE_BINARY_DIR}/dune-env-3 distribute_testing.py
+    add_custom_target(rerun_test_distribution ${CMAKE_BINARY_DIR}/dune-env distribute_testing.py
                         "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
                         "${CMAKE_CURRENT_BINARY_DIR}/dxt_test_binaries.cmake"
                         "${CMAKE_CURRENT_BINARY_DIR}/dxt_all_sorted_testnames.cmake"
diff --git a/python/scripts/distribute_testing.py b/python/scripts/distribute_testing.py
index a33ab91da47e54b66551246f426da4a92ece5d5d..d6ca1edf3c0e7268e79bc3d1e13693b31f19e89f 100644
--- a/python/scripts/distribute_testing.py
+++ b/python/scripts/distribute_testing.py
@@ -149,10 +149,7 @@ norm = 100/MAXTIME
 print('Generated {} bins.\nRelative volumes:\n\t\tMin {:.2f}%\n\t\tMax {:.2f}%\n\t\tAvg {:.2f}%\n'.format(
     len(bins), min(vols)*norm, max(vols)*norm, mean(vols)*norm, stdev(vols)))
 
-set_tpl = '''if(TEST {testname})\n
-    set_tests_properties({testname} PROPERTIES LABELS "builder_{idx}")\n
-endif(TEST {testname})
-'''
+set_tpl = '''set_tests_properties({testname} PROPERTIES LABELS "builder_{idx}")\n'''
 with open(cmake_outfile, 'wt') as out:
     out.write('set(DXT_BIN_COUNT "{}" CACHE STRING "number of bins for test targets" )\n'.format(len(bins)))
     for idx, bin in enumerate(bins):