diff --git a/test_common/CMakeLists.txt b/test_common/CMakeLists.txt
index 15b2d8be..94efad73 100644
--- a/test_common/CMakeLists.txt
+++ b/test_common/CMakeLists.txt
@@ -1,32 +1,28 @@
 
 set(HARNESS_COMMON_SOURCES
-    harness/threadTesting.c
+    harness/threadTesting.cpp
     harness/typeWrappers.cpp
     harness/mt19937.c
-    harness/conversions.c
+    harness/conversions.cpp
     harness/rounding_mode.c
     harness/msvc9.c
 )
 
-set_source_files_properties(${HARNESS_COMMON_SOURCES} PROPERTIES LANGUAGE CXX)
-
 add_library(harness-common STATIC ${HARNESS_COMMON_SOURCES})
 
 set(HARNESS_SOURCES
     harness/crc32.c
-    harness/errorHelpers.c
+    harness/errorHelpers.cpp
     harness/genericThread.cpp
     harness/imageHelpers.cpp
-    harness/kernelHelpers.c
+    harness/kernelHelpers.cpp
     harness/deviceInfo.cpp
     harness/os_helpers.cpp
     harness/parseParameters.cpp
-    harness/testHarness.c
-    harness/ThreadPool.c
+    harness/testHarness.cpp
+    harness/ThreadPool.cpp
     miniz/miniz.c
-)    
-
-set_source_files_properties(${HARNESS_SOURCES} PROPERTIES LANGUAGE CXX)
+)
 
 add_library(harness STATIC ${HARNESS_SOURCES})
 
diff --git a/test_common/harness/ThreadPool.c b/test_common/harness/ThreadPool.cpp
similarity index 100%
rename from test_common/harness/ThreadPool.c
rename to test_common/harness/ThreadPool.cpp
diff --git a/test_common/harness/conversions.c b/test_common/harness/conversions.cpp
similarity index 100%
rename from test_common/harness/conversions.c
rename to test_common/harness/conversions.cpp
diff --git a/test_common/harness/errorHelpers.c b/test_common/harness/errorHelpers.cpp
similarity index 100%
rename from test_common/harness/errorHelpers.c
rename to test_common/harness/errorHelpers.cpp
diff --git a/test_common/harness/kernelHelpers.c b/test_common/harness/kernelHelpers.cpp
similarity index 100%
rename from test_common/harness/kernelHelpers.c
rename to test_common/harness/kernelHelpers.cpp
diff --git a/test_common/harness/testHarness.c b/test_common/harness/testHarness.cpp
similarity index 100%
rename from test_common/harness/testHarness.c
rename to test_common/harness/testHarness.cpp
diff --git a/test_common/harness/threadTesting.c b/test_common/harness/threadTesting.cpp
similarity index 100%
rename from test_common/harness/threadTesting.c
rename to test_common/harness/threadTesting.cpp