diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 571dbbb24a..6f81d8f55e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -77,10 +77,16 @@ function(add_test_executable TEST_TARGET OUT_VARIABLE)
     add_dependencies(${TEST_TARGET} roadrunner-static gtest gtest_main gmock gmock_main rr-mockups)
     set_target_properties(${TEST_TARGET} PROPERTIES LINKER_LANGUAGE CXX)
 
-    # Add to ctest.
+    # Add to ctest. DISCOVERY_MODE PRE_TEST defers running the built binary
+    # with --gtest_list_tests until ctest itself is invoked, instead of
+    # running it immediately after linking (the POST_BUILD default). That
+    # avoids a Windows race where the freshly-linked exe isn't fully
+    # released yet, which was causing ParseTestList.cmake to fail on
+    # truncated/empty JSON output.
     set(TEST_ENV_VARS "testdir=${RR_ROOT}/test" "CTEST_OUTPUT_ON_FAILURE=TRUE")
     gtest_discover_tests(
             ${TEST_TARGET}
+            DISCOVERY_MODE PRE_TEST
             DISCOVERY_TIMEOUT 500
             PROPERTIES
             TIMEOUT 500
diff --git a/test/c_api_core/CMakeLists.txt b/test/c_api_core/CMakeLists.txt
index 44d75537a6..9263e928f4 100644
--- a/test/c_api_core/CMakeLists.txt
+++ b/test/c_api_core/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_test_executable(test_c_api_core test_targets
-        rrSBMLTestSuiteSimulation_CAPI
+        rrSBMLTestSuiteSimulation_CAPI.cpp
         ${SharedTestFiles}
         exceptions.cpp
-        CAPICoreTest
+        CAPICoreTest.cpp
         libstruct.cpp
         model_editing.cpp
         SimulateOptionsCAPITests.cpp
diff --git a/test/c_api_rrtests/CMakeLists.txt b/test/c_api_rrtests/CMakeLists.txt
index cdb61357d6..344be10970 100644
--- a/test/c_api_rrtests/CMakeLists.txt
+++ b/test/c_api_rrtests/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_test_executable(test_c_api_rrtests test_targets
-        ${SharedTestFiles} NomTests.cpp RRTestFileTests OtherRRTestFileTests.cpp
+        ${SharedTestFiles} NomTests.cpp RRTestFileTests.cpp OtherRRTestFileTests.cpp
         )
 
 # make test_targets list global to all tests
diff --git a/test/sundials-tests/SundialsSteadyStateTests/CMakeLists.txt b/test/sundials-tests/SundialsSteadyStateTests/CMakeLists.txt
index e9da69a265..28222e1d19 100644
--- a/test/sundials-tests/SundialsSteadyStateTests/CMakeLists.txt
+++ b/test/sundials-tests/SundialsSteadyStateTests/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 
-set(SharedTestFiles "${SharedTestFiles}" "${CMAKE_CURRENT_SOURCE_DIR}/SundialsSteadyStateSolverUnitTest")
+set(SharedTestFiles "${SharedTestFiles}" "${CMAKE_CURRENT_SOURCE_DIR}/SundialsSteadyStateSolverUnitTest.cpp")
 ## FixedPointIteration not finished due to difficulties getting it to work.
 #add_test_executable(
 #        FixedPointIterationTests test_targets
@@ -15,7 +15,6 @@ add_test_executable(
 add_test_executable(
         test_sundials_automatic_moiety_conservation test_targets
         AutomaticMoietyConservationTests.cpp
-        SundialsSteadyStateSolverUnitTest
         ${SharedTestFiles}
 )
 
@@ -23,7 +22,6 @@ add_test_executable(
 add_test_executable(
         test_sundials_steady_state_unit_basic_newton test_targets
         SundialsNewtonIterationUnitTests.cpp
-        SundialsSteadyStateSolverUnitTest
         ${SharedTestFiles}
 )