diff --git a/cpp_thread_test/CMakeLists.txt b/cpp_thread_test/CMakeLists.txt
index 154742d0a..53bb3f75b 100644
--- a/cpp_thread_test/CMakeLists.txt
+++ b/cpp_thread_test/CMakeLists.txt
@@ -35,7 +35,7 @@ if (CPP_THREAD_SAFETY_TEST)
     add_executable(dgemm_thread_safety_shutdown dgemm_thread_safety_shutdown.cpp)
     target_link_libraries(dgemm_thread_safety_shutdown ${CPP_THREAD_SAFETY_LIBS})
     add_test(NAME dgemm_thread_safety_shutdown COMMAND ${CMAKE_CURRENT_BINARY_DIR}/dgemm_thread_safety_shutdown ${CPP_THREAD_SAFETY_SHUTDOWN_ARGS})
-    set_tests_properties(dgemm_thread_safety_shutdown PROPERTIES TIMEOUT 600)
+    set_tests_properties(dgemm_thread_safety_shutdown PROPERTIES TIMEOUT 900)
   if (USE_THREAD AND (USE_OPENMP OR (NOT WIN32 AND NOT CYGWIN)))
     add_test(NAME dgemm_thread_safety_mixed_callback COMMAND ${CMAKE_CURRENT_BINARY_DIR}/dgemm_thread_safety_mixed ${CPP_THREAD_SAFETY_DGEMM_MIXED_ARGS} --callback)
   endif()
diff --git a/cpp_thread_test/dgemm_thread_safety_shutdown.cpp b/cpp_thread_test/dgemm_thread_safety_shutdown.cpp
index 4afc7828f..2b24aa640 100644
--- a/cpp_thread_test/dgemm_thread_safety_shutdown.cpp
+++ b/cpp_thread_test/dgemm_thread_safety_shutdown.cpp
@@ -43,7 +43,7 @@ const blasint poolDim = 320; /* above the multithreading threshold, so the pool
 const uint32_t defaultStormCallers = 128;
 const uint32_t stormDelayMs = 3; /* gate to sweep; at 0 the sweep beats the allocations */
 const int stormBlasThreads = 4;
-const int stormTimeoutSec = 10;
+const int stormTimeoutSec = 15;
 const int numStormChildren = 40;
 
 std::atomic<uint32_t> parked(0); /* callers built and waiting on the gate */