diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23154a2c6..a1fb15394 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,12 +581,12 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
 
 add_custom_target(
     run_tests
+    COMMAND ${GO_EXECUTABLE} test ${GO_TESTS}
     COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
             ${CMAKE_CURRENT_BINARY_DIR}
     COMMAND cd ssl/test/runner &&
             ${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
               ${HANDSHAKER_ARGS} ${RUNNER_ARGS}
-    COMMAND ${GO_EXECUTABLE} test ${GO_TESTS}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
     USES_TERMINAL)