diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf92f7a4..a7d0d2e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -690,6 +690,8 @@ if (TESTS)
         )
     endif()
 
+    add_custom_target(util_test)
+
     foreach(t ${TEST_BIN})
         string(REPLACE "/" "_" name "test/${t}")
         add_executable(util_${name} test/${t}.cpp)
@@ -697,12 +699,14 @@ if (TESTS)
         target_include_directories(util_${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
         add_test(NAME util_${name} COMMAND util_${name})
         set_tests_properties(util_${name} PROPERTIES FAIL_REGULAR_EXPRESSION "not ok -")
+        add_dependencies(util_test util_${name})
     endforeach(t)
 
     configure_file (test/cpp.py.in util_test_cpp.py @ONLY)
     add_test (NAME util_test_cpp COMMAND ${PYTHON_EXECUTABLE} util_test_cpp.py)
     set_property (TEST util_test_cpp APPEND PROPERTY DEPENDS util_macro)
     set_tests_properties(util_test_cpp PROPERTIES FAIL_REGULAR_EXPRESSION "not ok -")
+
 endif ()