diff --git a/test_conformance/contractions/CMakeLists.txt b/test_conformance/contractions/CMakeLists.txt
index 5e8224c5..5ff06361 100644
--- a/test_conformance/contractions/CMakeLists.txt
+++ b/test_conformance/contractions/CMakeLists.txt
@@ -18,7 +18,8 @@ endif()
 
 if(WIN32)
 set_source_files_properties(
-        contractions.c    
+        contractions.c
+        ../../test_common/harness/mt19937.c        
         ../../test_common/harness/msvc9.c        
         ../../test_common/harness/mingw_compat.c
         ../../test_common/harness/errorHelpers.c
diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt
index b3a50e6f..83e78576 100644
--- a/test_conformance/conversions/CMakeLists.txt
+++ b/test_conformance/conversions/CMakeLists.txt
@@ -22,6 +22,7 @@ add_executable(conformance_test_conversions
 
 set_source_files_properties(
         Sleep.c test_conversions.c basic_test_conversions.c
+        ../../test_common/harness/mt19937.c
         ../../test_common/harness/ThreadPool.c
         ../../test_common/harness/rounding_mode.c
         ../../test_common/harness/mingw_compat.c
diff --git a/test_conformance/geometrics/CMakeLists.txt b/test_conformance/geometrics/CMakeLists.txt
index 00748459..e9e16f76 100644
--- a/test_conformance/geometrics/CMakeLists.txt
+++ b/test_conformance/geometrics/CMakeLists.txt
@@ -19,6 +19,7 @@ add_executable(conformance_test_geometrics
 
 set_source_files_properties(
         main.c
+    ../../test_common/harness/mt19937.c
 	../../test_common/harness/errorHelpers.c
 	../../test_common/harness/threadTesting.c
 	../../test_common/harness/testHarness.c
diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt
index 58787e2a..c99dfe5c 100644
--- a/test_conformance/math_brute_force/CMakeLists.txt
+++ b/test_conformance/math_brute_force/CMakeLists.txt
@@ -46,6 +46,7 @@ set_source_files_properties(
     ../../test_common/harness/rounding_mode.c
     ../../test_common/harness/ThreadPool.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/mt19937.c
 	PROPERTIES LANGUAGE CXX)
 endif(MSVC)
 
diff --git a/test_conformance/multiple_device_context/CMakeLists.txt b/test_conformance/multiple_device_context/CMakeLists.txt
index 84dd1f11..f3adb7e9 100644
--- a/test_conformance/multiple_device_context/CMakeLists.txt
+++ b/test_conformance/multiple_device_context/CMakeLists.txt
@@ -21,6 +21,7 @@ endif()
 set_source_files_properties(
         main.c
 	test_multiple_contexts.c
+    ../../test_common/harness/mt19937.c
 	../../test_common/harness/errorHelpers.c
 	../../test_common/harness/threadTesting.c
 	../../test_common/harness/testHarness.c
diff --git a/test_conformance/profiling/CMakeLists.txt b/test_conformance/profiling/CMakeLists.txt
index f25675db..ae9096bb 100644
--- a/test_conformance/profiling/CMakeLists.txt
+++ b/test_conformance/profiling/CMakeLists.txt
@@ -19,6 +19,7 @@ endif()
 set_source_files_properties(
         main.c readArray.c writeArray.c readImage.c writeImage.c copy.c
         execute.c execute_multipass.c
+        ../../test_common/harness/mt19937.c
         ../../test_common/harness/testHarness.c
 	../../test_common/harness/errorHelpers.c
 	../../test_common/harness/kernelHelpers.c
diff --git a/test_conformance/relationals/CMakeLists.txt b/test_conformance/relationals/CMakeLists.txt
index 8430b8ba..bddd6f00 100644
--- a/test_conformance/relationals/CMakeLists.txt
+++ b/test_conformance/relationals/CMakeLists.txt
@@ -24,6 +24,7 @@ set_source_files_properties(
     test_comparisons_float.cpp
     test_comparisons_double.cpp
 	test_shuffles.cpp
+    ../../test_common/harness/mt19937.c
 	../../test_common/harness/errorHelpers.c
 	../../test_common/harness/threadTesting.c
 	../../test_common/harness/testHarness.c
diff --git a/test_conformance/select/CMakeLists.txt b/test_conformance/select/CMakeLists.txt
index 8130f35f..e4f2b048 100644
--- a/test_conformance/select/CMakeLists.txt
+++ b/test_conformance/select/CMakeLists.txt
@@ -17,6 +17,7 @@ endif()
 set_source_files_properties(
         test_select.c
         util_select.c
+        ../../test_common/harness/mt19937.c
         ../../test_common/harness/msvc9.c
         ../../test_common/harness/kernelHelpers.c
         ../../test_common/harness/errorHelpers.c
diff --git a/test_conformance/spir/CMakeLists.txt b/test_conformance/spir/CMakeLists.txt
index 35e1397a..27da3424 100644
--- a/test_conformance/spir/CMakeLists.txt
+++ b/test_conformance/spir/CMakeLists.txt
@@ -5,9 +5,9 @@ endfunction()
 
 # Import function list from math_brute_force
 add_definitions(-DFUNCTION_LIST_ULPS_ONLY)
-
-add_executable(
-    conformance_test_spir
+set(SPIR_OUT conformance_test_spir)
+    
+set (SPIR_SOURCES
     main.cpp
     datagen.cpp
     run_build_test.cpp
@@ -22,11 +22,17 @@ add_executable(
     ../../test_common/harness/testHarness.c
     ../../test_common/miniz/miniz.c)
 
+add_executable(${SPIR_OUT}
+    ${SPIR_SOURCES})
+
+
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)" AND NOT MSVC)
 set_source_files_properties(
         COMPILE_FLAGS -msse2)
 endif()
 
+set_source_files_properties(${SPIR_SOURCES} PROPERTIES LANGUAGE CXX)
+
 if(UNIX)
     set_target_properties(conformance_test_spir PROPERTIES
 	   COMPILE_FLAGS "-fexceptions -frtti")
diff --git a/test_conformance/thread_dimensions/CMakeLists.txt b/test_conformance/thread_dimensions/CMakeLists.txt
index b2baa719..e4df188a 100644
--- a/test_conformance/thread_dimensions/CMakeLists.txt
+++ b/test_conformance/thread_dimensions/CMakeLists.txt
@@ -19,6 +19,7 @@ endif()
 set_source_files_properties(
         main.c
 	test_thread_dimensions.c
+    ../../test_common/harness/mt19937.c
 	../../test_common/harness/errorHelpers.c
 	../../test_common/harness/threadTesting.c
 	../../test_common/harness/testHarness.c
diff --git a/test_conformance/vec_align/CMakeLists.txt b/test_conformance/vec_align/CMakeLists.txt
index eab91377..ec6229a6 100644
--- a/test_conformance/vec_align/CMakeLists.txt
+++ b/test_conformance/vec_align/CMakeLists.txt
@@ -23,6 +23,7 @@ set_source_files_properties(
         structs.c
         test_vec_align.c
         type_replacer.c
+        ../../test_common/harness/mt19937.c
         ../../test_common/harness/testHarness.c
         ../../test_common/harness/msvc9.c
         ../../test_common/harness/kernelHelpers.c
diff --git a/test_conformance/vec_step/CMakeLists.txt b/test_conformance/vec_step/CMakeLists.txt
index 3083f338..f3434029 100644
--- a/test_conformance/vec_step/CMakeLists.txt
+++ b/test_conformance/vec_step/CMakeLists.txt
@@ -22,6 +22,7 @@ set_source_files_properties(
         main.c
         structs.c
         type_replacer.c
+        ../../test_common/harness/mt19937.c
         ../../test_common/harness/testHarness.c
         ../../test_common/harness/msvc9.c
         ../../test_common/harness/kernelHelpers.c