diff --git a/tests/ci/run_cross_mingw_tests.sh b/tests/ci/run_cross_mingw_tests.sh
index fb85e86d6f..bad82a7f74 100755
--- a/tests/ci/run_cross_mingw_tests.sh
+++ b/tests/ci/run_cross_mingw_tests.sh
@@ -38,7 +38,6 @@ cat <<EOF > ${TARGET_CPU}-${TARGET_PLATFORM}.cmake
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR ${TARGET_CPU})
 
-# Specify the cross-compiler
 # Specify the cross-compiler
 set(CMAKE_C_COMPILER /usr/bin/${TARGET_CPU}-${TARGET_PLATFORM}-gcc-${THREAD_MODEL})
 set(CMAKE_CXX_COMPILER /usr/bin/${TARGET_CPU}-${TARGET_PLATFORM}-g++-${THREAD_MODEL})
@@ -53,8 +52,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 # Static to minimize runtime linking requirements
-set(CMAKE_C_FLAGS --static)
-set(CMAKE_CXX_FLAGS --static)
+set(CMAKE_EXE_LINKER_FLAGS --static)
 
 set(CMAKE_GENERATOR Ninja)
 EOF
@@ -70,6 +68,7 @@ for BO in "${BUILD_OPTIONS[@]}"; do
   shard_gtest ${BUILD_ROOT}/crypto/urandom_test.exe
   shard_gtest ${BUILD_ROOT}/crypto/mem_test.exe
   shard_gtest ${BUILD_ROOT}/crypto/mem_set_test.exe
+  shard_gtest ${BUILD_ROOT}/crypto/rwlock_static_init.exe
 
   shard_gtest ${BUILD_ROOT}/ssl/ssl_test.exe
   shard_gtest ${BUILD_ROOT}/ssl/integration_test.exe
diff --git a/tests/ci/run_cross_tests.sh b/tests/ci/run_cross_tests.sh
index 648c6df57a..56eead5f5a 100755
--- a/tests/ci/run_cross_tests.sh
+++ b/tests/ci/run_cross_tests.sh
@@ -64,6 +64,7 @@ for BO in "${BUILD_OPTIONS[@]}"; do
   shard_gtest ${BUILD_ROOT}/crypto/urandom_test
   shard_gtest ${BUILD_ROOT}/crypto/mem_test
   shard_gtest ${BUILD_ROOT}/crypto/mem_set_test
+  shard_gtest ${BUILD_ROOT}/crypto/rwlock_static_init
 
   shard_gtest ${BUILD_ROOT}/ssl/ssl_test
   shard_gtest ${BUILD_ROOT}/ssl/integration_test