diff --git a/Applications/CLI/Tests.cmake b/Applications/CLI/Tests.cmake
index e2c3a70c6c6..9f89c013cfa 100644
--- a/Applications/CLI/Tests.cmake
+++ b/Applications/CLI/Tests.cmake
@@ -10,7 +10,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/cube_1x1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS cube_${mesh_size}.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-15 RELTOL 1e-15
             DIFF_DATA
@@ -22,7 +21,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/cube_1x1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS cube_${mesh_size}_newton.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-15 RELTOL 1e-15
             DIFF_DATA
@@ -34,7 +32,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/cube_1x1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-1 RELTOL 1e-1
             DIFF_DATA
@@ -48,7 +45,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/cube_1x1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS cube_${mesh_size}.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-13 RELTOL 1e-13
             DIFF_DATA
@@ -60,7 +56,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/cube_1x1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-2 RELTOL 1e-2
             DIFF_DATA
@@ -75,7 +70,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/square_1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS square_${mesh_size}.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-13 RELTOL 1e-13
             DIFF_DATA
@@ -87,7 +81,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/square_1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-1 RELTOL 1e-1
             DIFF_DATA
@@ -101,7 +94,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/square_1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS square_${mesh_size}.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-12 RELTOL 1e-16
             DIFF_DATA
@@ -113,7 +105,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/square_1x1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-02 RELTOL 1e-02
             DIFF_DATA
@@ -128,7 +119,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/line_1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS line_${mesh_size}.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-15 RELTOL 1e-15
             DIFF_DATA
@@ -140,7 +130,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/line_1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-14 RELTOL 1e-14
             DIFF_DATA
@@ -152,7 +141,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/line_1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS line_${mesh_size}_robin_right_picard.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 4e-14 RELTOL 2e-14
             DIFF_DATA
@@ -164,7 +152,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/line_1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS line_${mesh_size}_robin_left_picard.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-14 RELTOL 1e-14
             DIFF_DATA
@@ -176,7 +163,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/line_1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS line_${mesh_size}_time_dep_dirichlet.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-14 RELTOL 1e-14
             DIFF_DATA
@@ -190,7 +176,6 @@ if(NOT OGS_USE_MPI)
             PATH Elliptic/line_1_GroundWaterFlow
             EXECUTABLE ogs
             EXECUTABLE_ARGS line_${mesh_size}_time_dep_neumann.prj
-            WRAPPER time
             TESTER vtkdiff
             ABSTOL 1e-14 RELTOL 1e-14
             DIFF_DATA
@@ -206,7 +191,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3_top_neumann.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-14 RELTOL 1e-14
         DIFF_DATA
@@ -217,7 +201,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3_bottom_neumann.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-14 RELTOL 1e-14
         DIFF_DATA
@@ -229,7 +212,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3_top_neumann_newton.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-14 RELTOL 1e-14
         DIFF_DATA
@@ -240,7 +222,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3_bottom_neumann_newton.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-14 RELTOL 1e-14
         DIFF_DATA
@@ -253,7 +234,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3_calculatesurfaceflux.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-15 RELTOL 1e-15
         DIFF_DATA
@@ -264,7 +244,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3_neumann_calculatesurfaceflux.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-15 RELTOL 1e-15
         DIFF_DATA
@@ -276,7 +255,6 @@ if(NOT OGS_USE_MPI)
         PATH Parabolic/TES/1D
         EXECUTABLE ogs
         EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-7 RELTOL 5e-9
         DIFF_DATA
@@ -292,7 +270,6 @@ if(NOT OGS_USE_MPI)
         PATH Parabolic/TES/1D
         EXECUTABLE ogs
         EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-3 RELTOL 1e-4
         DIFF_DATA
@@ -308,7 +285,6 @@ if(NOT OGS_USE_MPI)
         PATH Parabolic/TES/1D
         EXECUTABLE ogs
         EXECUTABLE_ARGS tes-1D-zeolite-discharge-small-newton.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1.5e-3 RELTOL 1.5e-3
         DIFF_DATA
@@ -323,7 +299,6 @@ if(NOT OGS_USE_MPI)
          PATH Parabolic/T/1D_dirichlet
          EXECUTABLE ogs
          EXECUTABLE_ARGS line_60_heat.prj
-         WRAPPER time
          TESTER vtkdiff
          ABSTOL 1e-5 RELTOL 1e-5
          DIFF_DATA
@@ -336,7 +311,6 @@ if(NOT OGS_USE_MPI)
          PATH Parabolic/T/1D_neumann
          EXECUTABLE ogs
          EXECUTABLE_ARGS line_60_heat.prj
-         WRAPPER time
          TESTER vtkdiff
          ABSTOL 1e-4 RELTOL 1e-4
          DIFF_DATA
@@ -350,7 +324,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Linear
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_1e0.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-16 RELTOL 1e-16
         DIFF_DATA
@@ -361,7 +334,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Linear
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_1e2.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-16 RELTOL 1e-16
         DIFF_DATA
@@ -372,7 +344,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Linear
         EXECUTABLE ogs
         EXECUTABLE_ARGS disc_with_hole.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-16 RELTOL 1e-16
         DIFF_DATA
@@ -383,7 +354,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Linear
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_1e5.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-16 RELTOL 1e-16
         DIFF_DATA
@@ -407,7 +377,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Burgers
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e0.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-16 RELTOL 1e-16
         DIFF_DATA
@@ -419,7 +388,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Burgers
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_1e3.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1e-16 RELTOL 1e-16
         DIFF_DATA
@@ -434,7 +402,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/square_1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_1e2_axi.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1.6e-5 RELTOL 1e-5
         DIFF_DATA
@@ -455,7 +422,6 @@ if(NOT OGS_USE_MPI)
         PATH Elliptic/square_1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_1e4_axi.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 1.6e-5 RELTOL 1e-5
         DIFF_DATA
@@ -475,7 +441,6 @@ if(NOT OGS_USE_MPI)
         PATH Mechanics/Linear
         EXECUTABLE ogs
         EXECUTABLE_ARGS ring_plane_strain.prj
-        WRAPPER time
         TESTER vtkdiff
         ABSTOL 6e-4 RELTOL 1e-4
         DIFF_DATA
@@ -491,7 +456,6 @@ if(NOT OGS_USE_MPI)
          PATH Parabolic/T/2D_axially_symmetric
          EXECUTABLE ogs
          EXECUTABLE_ARGS square_1e2_axi.prj
-         WRAPPER time
          TESTER vtkdiff
          ABSTOL 1.7e-5 RELTOL 1e-5
          DIFF_DATA
@@ -513,7 +477,6 @@ if(NOT OGS_USE_MPI)
         PATH Parabolic/TES/2D
         EXECUTABLE ogs
         EXECUTABLE_ARGS tes-inert-axi.prj
-        WRAPPER time
         TESTER vtkdiff
         # Note: Since the temperature and pressure only vary by a factor of ~ 1.e-6 in x-direction
         # the relative tolerance has to be much smaller than 1.e-6
diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
index 95b7cc39fc8..5d7047cde68 100644
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -4,7 +4,6 @@ AddTest(
     PATH MeshGeoToolsLib/Ammer/
     EXECUTABLE MapGeometryToMeshSurface
     EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
-    WRAPPER time
     TESTER diff
     DIFF_DATA Ammer-Rivers-Mapped.gml
 )
@@ -14,7 +13,6 @@ AddTest(
     PATH MeshGeoToolsLib/Bode/
     EXECUTABLE MapGeometryToMeshSurface
     EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
-    WRAPPER time
     TESTER diff
     DIFF_DATA BodeEZG_Fliessgewaesser-Mapped.gml
 )
@@ -24,7 +22,6 @@ AddTest(
     PATH MeshGeoToolsLib/Naegelstedt
     EXECUTABLE MapGeometryToMeshSurface
     EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
-    WRAPPER time
     TESTER diff
     DIFF_DATA RiverNetwork-Mapped.gml
 )
diff --git a/BaseLib/DateTools.cpp b/BaseLib/DateTools.cpp
index 4f2c665fdf8..8d27bd79539 100644
--- a/BaseLib/DateTools.cpp
+++ b/BaseLib/DateTools.cpp
@@ -121,7 +121,7 @@ std::string formatDate(
 {
     auto const time_t = std::chrono::system_clock::to_time_t(time);
     char time_str[100];
-    if (std::strftime(time_str, sizeof(time_str), "%F %T%z",
+    if (std::strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S%z",
                       std::localtime(&time_t))) {
         return time_str;
     } else {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b18638bc505..a7b06796eb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 ### Features:
 ### Utilities
 ### Infrastructure:
+
+- ctest now works on Windows too by removing time-wrappers
+
 ### Fixes:
 
 # 6.0.7
diff --git a/scripts/cmake/ExternalProjectEigen.cmake b/scripts/cmake/ExternalProjectEigen.cmake
index 0d72c570f38..c9b34582b33 100644
--- a/scripts/cmake/ExternalProjectEigen.cmake
+++ b/scripts/cmake/ExternalProjectEigen.cmake
@@ -5,12 +5,12 @@ if(USE_CONAN)
 endif()
 
 if(OGS_LIB_EIGEN STREQUAL "System")
-    find_package(Eigen3 3.2.5 REQUIRED)
+    find_package(Eigen3 3.2.8 REQUIRED)
     if(NOT EIGEN3_FOUND)
         message(FATAL_ERROR "Aborting CMake because system Eigen was not found!")
     endif()
 elseif(OGS_LIB_EIGEN STREQUAL "Default")
-    find_package(Eigen3 3.2.5)
+    find_package(Eigen3 3.2.8)
 endif()
 
 # First check for system Eigen
diff --git a/scripts/cmake/ThirdPartyLibVersions.cmake b/scripts/cmake/ThirdPartyLibVersions.cmake
index 52c4cb13d39..4286d94a4e3 100644
--- a/scripts/cmake/ThirdPartyLibVersions.cmake
+++ b/scripts/cmake/ThirdPartyLibVersions.cmake
@@ -3,8 +3,8 @@ string(REPLACE "." "_" OGS_BOOST_VERSION_UNDERLINE ${OGS_BOOST_VERSION})
 set(OGS_BOOST_URL "http://opengeosys.s3.amazonaws.com/ogs6-lib-sources/boost_${OGS_BOOST_VERSION_UNDERLINE}.tar.bz2")
 set(OGS_BOOST_MD5 "a744cf167b05d72335f27c88115f211d")
 
-set(OGS_EIGEN_URL "http://opengeosys.s3.amazonaws.com/ogs6-lib-sources/eigen-3.2.5.tar.gz")
-set(OGS_EIGEN_MD5 "8cc513ac6ec687117acadddfcacf551b")
+set(OGS_EIGEN_URL "http://opengeosys.s3.amazonaws.com/ogs6-lib-sources/eigen-3.2.8.tar.gz")
+set(OGS_EIGEN_MD5 "135d8d43aaee5fb54cf5f3e981b1a6db")
 
 set(OGS_VTK_VERSION 6.3.0)
 set(OGS_VTK_URL "http://www.vtk.org/files/release/6.3/VTK-6.3.0.tar.gz")
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 8f5ad7599b1..66b2acff45b 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -9,10 +9,9 @@
 #   PATH <working directory> # relative to SourceDir/Tests/Data
 #   EXECUTABLE <executable target> # optional, defaults to ogs
 #   EXECUTABLE_ARGS <arguments>
-#   WRAPPER <time|memcheck|callgrind> # optional, defaults to time
+#   WRAPPER <time|memcheck|callgrind> # optional
 #   WRAPPER_ARGS <arguments> # optional
-#   TESTER <diff|memcheck> # optional
-#   DATA <list of all required data files, white-space separated, have to be in PATH>
+#   TESTER <diff|vtkdiff|memcheck> # optional
 # )
 #
 # Conditional arguments:
@@ -53,16 +52,11 @@ function (AddTest)
     if (NOT AddTest_RELTOL)
         set (AddTest_RELTOL 1e-16)
     endif()
-    # message("AddTest_ABSTOL ${AddTest_ABSTOL}")
 
     if("${AddTest_EXECUTABLE}" STREQUAL "ogs")
         set(AddTest_EXECUTABLE_ARGS -o ${AddTest_BINARY_PATH_NATIVE} ${AddTest_EXECUTABLE_ARGS})
     endif()
 
-    if(NOT AddTest_WRAPPER)
-        set(AddTest_WRAPPER time)
-    endif()
-
     # --- Implement wrappers ---
     # check requirements, disable if not met
     if(AddTest_WRAPPER STREQUAL "time" AND NOT TIME_TOOL_PATH)
@@ -172,8 +166,12 @@ function (AddTest)
     endforeach()
 
     # Run the wrapper
+    if(DEFINED AddTest_WRAPPER)
+        set(AddTest_WRAPPER_STRING "-${AddTest_WRAPPER}")
+    endif()
+    set(TEST_NAME "${AddTest_EXECUTABLE}-${AddTest_NAME}${AddTest_WRAPPER_STRING}")
     add_test(
-        NAME "${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER}"
+        NAME ${TEST_NAME}
         COMMAND ${CMAKE_COMMAND}
         -DEXECUTABLE=${AddTest_EXECUTABLE_PARSED}
         "-DEXECUTABLE_ARGS=${AddTest_EXECUTABLE_ARGS}"
@@ -195,14 +193,14 @@ function (AddTest)
     endif()
 
     # Run the tester
+    set(TESTER_NAME "${TEST_NAME}-${AddTest_TESTER}")
     add_test(
-        NAME "${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER}-${AddTest_TESTER}"
+        NAME ${TESTER_NAME}
         COMMAND ${CMAKE_COMMAND}
         -Dcase_path=${AddTest_SOURCE_PATH}
         -DTESTER_COMMAND=${TESTER_COMMAND}
         -P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestTester.cmake
     )
-    set_tests_properties(${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER}-${AddTest_TESTER}
-        PROPERTIES DEPENDS ${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER})
+    set_tests_properties(${TESTER_NAME} PROPERTIES DEPENDS ${TEST_NAME})
 
 endfunction()
diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake
index 12c79cf4c2c..806bf527f8b 100644
--- a/scripts/cmake/test/AddTestTester.cmake
+++ b/scripts/cmake/test/AddTestTester.cmake
@@ -1,8 +1,18 @@
-execute_process(
-    COMMAND bash -c ${TESTER_COMMAND}
-    WORKING_DIRECTORY ${case_path}
-    RESULT_VARIABLE EXIT_CODE
-)
+if(WIN32)
+    execute_process(
+        COMMAND cmd /C ${TESTER_COMMAND}
+        WORKING_DIRECTORY ${case_path}
+        RESULT_VARIABLE EXIT_CODE
+        OUTPUT_VARIABLE OUTPUT
+  )
+else()
+    execute_process(
+        COMMAND bash -c ${TESTER_COMMAND}
+        WORKING_DIRECTORY ${case_path}
+        RESULT_VARIABLE EXIT_CODE
+        OUTPUT_VARIABLE OUTPUT
+    )
+endif()
 
 if(NOT EXIT_CODE STREQUAL "0")
     message(FATAL_ERROR "Error exit code: ${EXIT_CODE}")
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 0d5ba42ae1e..ac317ae6498 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -62,6 +62,20 @@ add_custom_target(
     ${CONFIG_PARAMETER} --parallel ${NUM_PROCESSORS} --test-action test
     DEPENDS ogs vtkdiff ctest-large-cleanup
 )
+add_custom_target(
+    ctest-large-serial
+    COMMAND ${CMAKE_CTEST_COMMAND} -T Test
+    --force-new-ctest-process
+    --output-on-failure --output-log Tests/ctest-large.log
+    ${CONFIG_PARAMETER} --test-action test
+    DEPENDS ogs vtkdiff ctest-large-cleanup
+)
 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)
diff --git a/scripts/jenkins/msvc.groovy b/scripts/jenkins/msvc.groovy
index e3396825e23..94b06ac1a19 100644
--- a/scripts/jenkins/msvc.groovy
+++ b/scripts/jenkins/msvc.groovy
@@ -26,6 +26,7 @@ node('win && conan') {
 
         stage 'Test (Win)'
         build.win 'build', 'tests'
+        build.win 'build', 'ctest'
 
         stage 'Data Explorer (Win)'
         configure.win 'build', "${defaultCMakeOptions} ${guiCMakeOptions}",