diff --git a/cmake/modules/CopyOfDuneSymlinkOrCopy.cmake b/cmake/modules/CopyOfDuneSymlinkOrCopy.cmake
index 007ece3f7a1a15d8d60b3568e57288055d1f3edd..a81339af412d644dc09a6e91c1a538bd4fdf5760 100644
--- a/cmake/modules/CopyOfDuneSymlinkOrCopy.cmake
+++ b/cmake/modules/CopyOfDuneSymlinkOrCopy.cmake
@@ -88,7 +88,7 @@ function(dune_symlink_to_source_tree)
       get_filename_component(dir ${f} DIRECTORY)
       if(NOT "${CMAKE_SOURCE_DIR}/${dir}" MATCHES "${CMAKE_BINARY_DIR}/*")
         execute_process(COMMAND ${CMAKE_COMMAND} "-E" "create_symlink" "${CMAKE_SOURCE_DIR}/${dir}" "${CMAKE_BINARY_DIR}/${dir}/${ARG_NAME}")
-      endif(NOT "${CMAKE_SOURCE_DIR}/${dir}" MATCHES "${CMAKE_BINARY_DIR}/*")
+      endif()
     endforeach()
   endif()
 endfunction(dune_symlink_to_source_tree)
diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake
index f80a47cb82df393d5477888521610ca826d755ec..03f64c19dcfc5183738a6d3b984399691ba82945 100644
--- a/cmake/modules/DumuxTestMacros.cmake
+++ b/cmake/modules/DumuxTestMacros.cmake
@@ -33,7 +33,7 @@ macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_sour
   # check whether executable already exists
   if(NOT TARGET ${dumux_test_executable})
     add_executable(${dumux_test_executable} ${dumux_test_executable_source})
-  endif(NOT TARGET ${dumux_test_executable})
+  endif()
 
   # link all libraries to executable, add all flags
   add_dumux_all_flags(${dumux_test_executable})
diff --git a/test/decoupled/2p/CMakeLists.txt b/test/decoupled/2p/CMakeLists.txt
index f15ac96e41411ca8a36008b850ae6bc789da6be6..da571faf3862872297e5cb53791c66385253ecf4 100644
--- a/test/decoupled/2p/CMakeLists.txt
+++ b/test/decoupled/2p/CMakeLists.txt
@@ -28,7 +28,7 @@ else()
                    --files ${CMAKE_SOURCE_DIR}/test/references/test_impes-reference.vtu
                            ${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg-00009.vtu
                    --command "${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg")
-endif(MPI_FOUND)
+endif()
 
 add_dumux_test(test_transport test_transport test_transport.cc
                python ${CMAKE_SOURCE_DIR}/bin/runtest.py
diff --git a/test/geomechanics/el2p/CMakeLists.txt b/test/geomechanics/el2p/CMakeLists.txt
index b09216c558dc7f41493b495c0edc9b7a6d80c6c2..c5be776cba118c43ea0d7640a059d8b19034d449 100644
--- a/test/geomechanics/el2p/CMakeLists.txt
+++ b/test/geomechanics/el2p/CMakeLists.txt
@@ -14,4 +14,4 @@ if(MPI_FOUND)
                    --files ${CMAKE_SOURCE_DIR}/test/references/el2p-parallel-reference.vtu
                            ${CMAKE_CURRENT_BINARY_DIR}/s0004-p0001-el2p-00003.vtu
                    --command "${MPIEXEC} -np 4 ${CMAKE_CURRENT_BINARY_DIR}/test_el2p_parallel ${CMAKE_CURRENT_SOURCE_DIR}/grids/test_el2p.dgf 100 200 100")
-endif(MPI_FOUND)
+endif()
diff --git a/test/implicit/2p/CMakeLists.txt b/test/implicit/2p/CMakeLists.txt
index 43bf37384d54944f838fd2ea065258077511c8db..ce7653a79e4887f9cbd305ac43b33497cd28b789 100644
--- a/test/implicit/2p/CMakeLists.txt
+++ b/test/implicit/2p/CMakeLists.txt
@@ -60,7 +60,7 @@ add_dumux_test(test_box2pni test_box2pni test_box2pni.cc
                  --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
                          ${CMAKE_CURRENT_BINARY_DIR}/injection2pnibox-00008.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pni")
-endif(HAVE_UG)
+endif()
 
 if(HAVE_UG)
 add_dumux_test(test_cc2pni test_cc2pni test_cc2pni.cc
@@ -76,4 +76,4 @@ add_dumux_test(test_cc2pni test_cc2pni test_cc2pni.cc
                  --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
                          ${CMAKE_CURRENT_BINARY_DIR}/injection2pnicc-00009.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pni")
-endif(HAVE_UG)
+endif()
diff --git a/test/implicit/richards/CMakeLists.txt b/test/implicit/richards/CMakeLists.txt
index a8de301c5e441c0799c6b4a9f3f06f322c923709..0d4bbe12a5a3a025a32c77cd049a7e775664c691 100644
--- a/test/implicit/richards/CMakeLists.txt
+++ b/test/implicit/richards/CMakeLists.txt
@@ -15,7 +15,7 @@ else()
                    --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu
                            ${CMAKE_CURRENT_BINARY_DIR}/richardslensbox-00008.vtu
                    --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxrichards")
-endif(MPI_CXX_FOUND)
+endif()
 
 add_dumux_test(test_ccrichards test_ccrichards test_ccrichards.cc
                python ${CMAKE_SOURCE_DIR}/bin/runtest.py