diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 251303443b3c8abaaa018bf1242a9553e32641c6..036d085fecad26afcd21a2528c96693399214b51 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -148,5 +148,7 @@ function (AddTest)
 			-P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestTester.cmake
 		)
 	endif()
+	set_tests_properties(${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER}-${AddTest_TESTER}
+		PROPERTIES DEPENDS ${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER})
 
 endfunction()
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 29532ce0b82c539654fb08adfd280d80dc97cc11..d68cdc6c62f12824ebdf0a32da1aa70c62e6b3d1 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -1,6 +1,7 @@
 # Find tools and data
 FIND_PROGRAM(DIFF_TOOL_PATH diff)
-FIND_PROGRAM(TIME_TOOL_PATH time)
+# FIND_PROGRAM(TIME_TOOL_PATH time) # TODO: does not work Travis
+SET(TIME_TOOL_PATH time)
 FIND_PROGRAM(GREP_TOOL_PATH grep)
 FIND_PROGRAM(BASH_TOOL_PATH bash)
 FIND_PROGRAM(VALGRIND_TOOL_PATH valgrind)