diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 7d1a81663347f375c2ab503539531cca45d4dbb9..972a2d92be6007bb4c0a651d4a6d45dbce5ded76 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -55,6 +55,23 @@ if(CMAKE_CONFIGURATION_TYPES)
     set(CONFIG_PARAMETER --build-config "$<CONFIGURATION>")
 endif()
 add_custom_target(ctest-cleanup ${CMAKE_COMMAND} -E remove -f Tests/ctest.log)
+
+set(test_dependencies ogs vtkdiff)
+if(OGS_BUILD_UTILS)
+    list(APPEND test_dependencies partmesh MapGeometryToMeshSurface)
+endif()
+if(OGS_USE_MFRONT)
+    list(APPEND test_dependencies
+        MFrontGenericBehaviourInterfaceTest
+        MFrontGenericBehaviourInterfaceTest2
+        BoundsCheckTest
+        ParameterTest
+        IntegrateTest
+        IntegrateTest2
+        IntegrateTest3
+        BehaviourTest)
+endif()
+
 add_custom_target(
     ctest
     COMMAND ${CMAKE_CTEST_COMMAND} -T Test
@@ -63,12 +80,9 @@ add_custom_target(
     --exclude-regex LARGE
     ${CONFIG_PARAMETER} --parallel ${NUM_CTEST_PROCESSORS}
     --timeout 900 # 15 minutes
-    DEPENDS ogs vtkdiff ctest-cleanup
+    DEPENDS ${test_dependencies} ctest-cleanup
     USES_TERMINAL
 )
-if(OGS_BUILD_UTILS)
-    add_dependencies(ctest partmesh MapGeometryToMeshSurface)
-endif()
 
 add_custom_target(
     ctest-serial
@@ -78,14 +92,12 @@ add_custom_target(
     --exclude-regex LARGE
     ${CONFIG_PARAMETER}
     --timeout 900 # 15 minutes
-    DEPENDS ogs vtkdiff ctest-cleanup
+    DEPENDS ${test_dependencies} ctest-cleanup
     USES_TERMINAL
 )
-if(OGS_BUILD_UTILS)
-    add_dependencies(ctest-serial partmesh MapGeometryToMeshSurface)
-endif()
 
 add_custom_target(ctest-large-cleanup ${CMAKE_COMMAND} -E remove -f Tests/ctest-large.log)
+
 add_custom_target(
     ctest-large
     COMMAND ${CMAKE_CTEST_COMMAND} -T Test
@@ -94,12 +106,9 @@ add_custom_target(
     --tests-regex LARGE
     ${CONFIG_PARAMETER} --parallel ${NUM_CTEST_LARGE_PROCESSORS}
     --timeout 3600
-    DEPENDS ogs vtkdiff ctest-large-cleanup
+    DEPENDS ${test_dependencies} ctest-large-cleanup
     USES_TERMINAL
 )
-if(OGS_BUILD_UTILS)
-    add_dependencies(ctest-large partmesh MapGeometryToMeshSurface)
-endif()
 
 add_custom_target(
     ctest-large-serial
@@ -109,18 +118,13 @@ add_custom_target(
     --tests-regex LARGE
     ${CONFIG_PARAMETER}
     --timeout 3600
-    DEPENDS ogs vtkdiff ctest-large-cleanup
+    DEPENDS ${test_dependencies} ctest-large-cleanup
     USES_TERMINAL
 )
-if(OGS_BUILD_UTILS)
-    add_dependencies(ctest-large-serial partmesh MapGeometryToMeshSurface)
-endif()
+
 set_directory_properties(PROPERTIES
     ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/Tests/Data
 )
 
-set_target_properties(ctest PROPERTIES FOLDER Testing)
-set_target_properties(ctest-large PROPERTIES FOLDER Testing)
-set_target_properties(ctest-large-serial PROPERTIES FOLDER Testing)
-set_target_properties(ctest-cleanup PROPERTIES FOLDER Testing)
-set_target_properties(ctest-large-cleanup PROPERTIES FOLDER Testing)
+set_target_properties(ctest ctest-large ctest-large-serial ctest-cleanup ctest-large-cleanup
+    PROPERTIES FOLDER Testing)