diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0f638a73..2c2b2c16 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,12 +1,14 @@
 find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
 
 if(NOT Qt5Test_FOUND)
     message(STATUS "Qt5Test not found, tests will not be built.")
     return()
 endif()
 
+add_custom_target(buildtests)
+
 add_subdirectory(auto)
 add_subdirectory(manual)
 
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
 add_dependencies(check buildtests)
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 7b35d340..1f2fe1e2 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,50 +1,51 @@
 include(ECMAddTests)
 
 macro(gv_add_unit_test _test)
     set(_src ${_test}.cpp ${ARGN})
     add_executable(${_test} ${_src})
+    add_dependencies(buildtests ${_test})
     add_test( ${_test} ${_test} )
     ecm_mark_as_test(${_test})
     target_link_libraries(${_test}
         KF5::KDELibs4Support
         Qt5::Test
         gwenviewlib)
 endmacro(gv_add_unit_test)
 
 include_directories(
     ${gwenview_SOURCE_DIR}
     ${importer_SOURCE_DIR}
     ${EXIV2_INCLUDE_DIR}
     )
 
 # For config-gwenview.h
 include_directories(
     ${gwenview_BINARY_DIR}
     )
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
 gv_add_unit_test(imagescalertest testutils.cpp)
 gv_add_unit_test(paintutilstest)
 # gv_add_unit_test(documenttest testutils.cpp)
 gv_add_unit_test(transformimageoperationtest)
 gv_add_unit_test(jpegcontenttest)
 # gv_add_unit_test(thumbnailprovidertest testutils.cpp)
 if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
     gv_add_unit_test(semanticinfobackendtest)
 endif()
 gv_add_unit_test(timeutilstest)
 gv_add_unit_test(placetreemodeltest testutils.cpp)
 gv_add_unit_test(urlutilstest)
 gv_add_unit_test(historymodeltest)
 # gv_add_unit_test(importertest
 #     ${importer_SOURCE_DIR}/importer.cpp
 #     ${importer_SOURCE_DIR}/fileutils.cpp
 #     ${importer_SOURCE_DIR}/filenameformater.cpp
 #     )
 gv_add_unit_test(sorteddirmodeltest testutils.cpp)
 gv_add_unit_test(slidecontainerautotest slidecontainerautotest.cpp)
 gv_add_unit_test(imagemetainfomodeltest testutils.cpp)
 gv_add_unit_test(cmsprofiletest testutils.cpp)
 gv_add_unit_test(recursivedirmodeltest testutils.cpp)
 gv_add_unit_test(contextmanagertest testutils.cpp)
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 1fb491e4..3d36854e 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,43 +1,46 @@
 include_directories(
     ${gwenview_SOURCE_DIR}
     )
 
 # SlideContainer
 set(slidecontainertest_SRCS
     slidecontainertest.cpp
     )
 
 add_executable(slidecontainertest ${slidecontainertest_SRCS})
+add_dependencies(buildtests slidecontainertest)
 ecm_mark_as_test(slidecontainertest)
 
 target_link_libraries(slidecontainertest
     Qt5::Test
     KF5::KDELibs4Support
     gwenviewlib)
 
 # imageloadbench
 set(imageloadbench_SRCS
     imageloadbench.cpp
     )
 
 add_executable(imageloadbench ${imageloadbench_SRCS})
+add_dependencies(buildtests imageloadbench)
 ecm_mark_as_test(imageloadbench)
 
 target_link_libraries(imageloadbench
     Qt5::Test
     KF5::KDELibs4Support
     gwenviewlib)
 
 # thumbnailgen
 set(thumbnailgen_SRCS
     thumbnailgen.cpp
     ../auto/testutils.cpp # FIXME: Move testutils.cpp to test/
     )
 
 add_executable(thumbnailgen ${thumbnailgen_SRCS})
+add_dependencies(buildtests thumbnailgen)
 ecm_mark_as_test(thumbnailgen)
 
 target_link_libraries(thumbnailgen
     Qt5::Test
     KF5::KDELibs4Support
     gwenviewlib)