diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b82d7670..954c053e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,8 @@ option(NO_AFFINITY "Disable support for CPU affinity masks to avoid binding proc
 else()
 set(NO_AFFINITY 1)
 endif()
+option(CPP_THREAD_SAFETY_TEST "Run a massively parallel DGEMM test to confirm thread safety of the library (requires OpenMP and about 1.3GB of RAM)" OFF)
+option(CPP_THREAD_SAFETY_GEMV "Run a massively parallel DGEMV test to confirm thread safety of the library (requires OpenMP)" OFF)
 
 # Add a prefix or suffix to all exported symbol names in the shared library.
 # Avoids conflicts with other BLAS libraries, especially when using
@@ -234,6 +236,9 @@ if (NOT MSVC AND NOT NOFORTRAN)
     add_subdirectory(ctest)
   endif()
   add_subdirectory(lapack-netlib/TESTING)
+	  if (CPP_THREAD_SAFETY_TEST OR CPP_THREAD_SAFETY_GEMV)
+	  	add_subdirectory(cpp_thread_test)
+    	  endif()
 endif()
 
 set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES
diff --git a/Makefile b/Makefile
index 7a03b08f0..93e8af2eb 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,9 @@ ifneq ($(NO_CBLAS), 1)
 ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
 	$(MAKE) -C cpp_thread_test all
 endif
+ifeq ($(CPP_THREAD_SAFETY_GEMV), 1)
+	$(MAKE) -C cpp_thread_test dgemv_tester
+endif
 endif
 endif
 
diff --git a/Makefile.rule b/Makefile.rule
index 40bd1a854..4d6f2d313 100644
--- a/Makefile.rule
+++ b/Makefile.rule
@@ -272,6 +272,9 @@ COMMON_PROF = -pg
 # work at all.
 #
 # CPP_THREAD_SAFETY_TEST = 1
+#
+# use this to run only the less memory-hungry GEMV test
+# CPP_THREAD_SAFETY_GEMV = 1
 
 
 # If you want to enable the experimental BFLOAT16 support
diff --git a/cpp_thread_test/CMakeLists.txt b/cpp_thread_test/CMakeLists.txt
new file mode 100644
index 000000000..5eccb12ce
--- /dev/null
+++ b/cpp_thread_test/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories(${PROJECT_SOURCE_DIR})
+include_directories(${PROJECT_BINARY_DIR})
+
+enable_language(CXX)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -DADD${BU} -DCBLAS")
+
+if (USE_OPENMP)
+if (CPP_THREAD_SAFETY_TEST)
+  message(STATUS building thread safety test)
+  add_executable(dgemm_thread_safety dgemm_thread_safety.cpp) 
+  target_link_libraries(dgemm_thread_safety ${OpenBLAS_LIBNAME})
+  add_test( dgemm_thread_safety ${CMAKE_CURRENT_BINARY_DIR}/dgemm_thread_safety)
+endif()
+
+
+if (CPP_THREAD_SAFETY_TEST OR CPP_THREAD_SAFETY_GEMV)
+  add_executable(dgemv_thread_safety dgemv_thread_safety.cpp) 
+  target_link_libraries(dgemv_thread_safety ${OpenBLAS_LIBNAME})
+  add_test(dgemv_thread_safety ${CMAKE_CURRENT_BINARY_DIR}/dgemv_thread_safety)
+endif()
+
+endif()