diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index fb18a77ae8509550c72c054ca1c1b7f43ef0d9e5..e44273373efe8ce411416ea4e44db150377d8864 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -280,7 +280,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
         LABELS "${DIR_LABELS}"
     )
 
-    if(TARGET ${AddTest_EXECUTABLE})
+    if(NOT "${AddTest_EXECUTABLE}" STREQUAL "ogs" AND TARGET ${AddTest_EXECUTABLE})
         add_dependencies(ctest ${AddTest_EXECUTABLE})
         add_dependencies(ctest-large ${AddTest_EXECUTABLE})
     endif()
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 5f332a96757a3b0a73a68548a884688783036340..cf44de6c6630aaf3b0bfb5261ba326df532d0360 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -58,9 +58,4 @@ function (OgsTest)
         DISABLED ${OgsTest_DISABLED}
         LABELS "${DIR_LABELS}"
     )
-
-    if(TARGET ${OgsTest_EXECUTABLE})
-        add_dependencies(ctest ${OgsTest_EXECUTABLE})
-        add_dependencies(ctest-large ${OgsTest_EXECUTABLE})
-    endif()
 endfunction()
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 3f4e363989be2bc5ea166210484caa3fec5dea3c..e9e12ee39367c84ad988958cab12fb9ccc9b6bbe 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -91,3 +91,6 @@ set_directory_properties(PROPERTIES
 
 set_target_properties(ctest ctest-large ctest-cleanup ctest-large-cleanup
     PROPERTIES FOLDER Testing)
+
+add_dependencies(ctest ogs)
+add_dependencies(ctest-large ogs)