diff --git a/CMakeLists.txt b/CMakeLists.txt
index 445c5ae9..f084b3fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL "release")
 
 add_subdirectory(test_common)
 add_subdirectory(test_conformance)
+add_subdirectory(test_extensions)
 
 set (PY_PATH   "${CLConform_SOURCE_DIR}/test_conformance/*.py")
 set (CSV_PATH  "${CLConform_SOURCE_DIR}/test_conformance/*.csv")
@@ -220,4 +221,3 @@ if(MSVC)
 endif(MSVC)
 
 set_property(TARGET COPY_FILES${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")
-add_subdirectory( "test_extensions" )
diff --git a/test_conformance/d3d10/CMakeLists.txt b/test_conformance/d3d10/CMakeLists.txt
index 42751f61..385ea86f 100644
--- a/test_conformance/d3d10/CMakeLists.txt
+++ b/test_conformance/d3d10/CMakeLists.txt
@@ -17,8 +17,9 @@ link_directories(${CL_LIB_DIR}, ${D3D10_LIB_DIR})
 
 list(APPEND CLConform_LIBRARIES d3d10 dxgi)
 
+set(MODULE_NAME D3D10)
 
-set(D3D10_SOURCES
+set(${MODULE_NAME}_SOURCES
     buffer.cpp
     texture2d.cpp
     texture3d.cpp
@@ -27,14 +28,10 @@ set(D3D10_SOURCES
     harness.cpp
 )
 
-add_executable(conformance_test_d3d10
-    ${D3D10_SOURCES})
-
 set_source_files_properties(
-    ${D3D10_SOURCES}
+    ${MODULE_NAME}_SOURCES
     PROPERTIES LANGUAGE CXX)
 
-TARGET_LINK_LIBRARIES(conformance_test_d3d10 harness
-    ${CLConform_LIBRARIES})
-
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include(../CMakeCommon.txt)
 endif(WIN32)
diff --git a/test_conformance/d3d11/CMakeLists.txt b/test_conformance/d3d11/CMakeLists.txt
index d4ffcf47..14a378d7 100644
--- a/test_conformance/d3d11/CMakeLists.txt
+++ b/test_conformance/d3d11/CMakeLists.txt
@@ -17,8 +17,9 @@ link_directories(${CL_LIB_DIR}, ${D3D11_LIB_DIR})
 
 list(APPEND CLConform_LIBRARIES d3d11 dxgi)
 
+set(MODULE_NAME D3D11)
 
-set(D3D11_SOURCES
+set(${MODULE_NAME}_SOURCES
     buffer.cpp
     texture2d.cpp
     texture3d.cpp
@@ -27,14 +28,10 @@ set(D3D11_SOURCES
     harness.cpp
 )
 
-add_executable(conformance_test_d3d11
-    ${D3D11_SOURCES})
-
 set_source_files_properties(
-    ${D3D11_SOURCES}
+    ${MODULE_NAME}_SOURCES
     PROPERTIES LANGUAGE CXX)
 
-TARGET_LINK_LIBRARIES(conformance_test_d3d11 harness
-    ${CLConform_LIBRARIES})
-
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include(../CMakeCommon.txt)
 endif(WIN32)
diff --git a/test_extensions/CMakeLists.txt b/test_extensions/CMakeLists.txt
index 61f0b23e..3c48e186 100644
--- a/test_extensions/CMakeLists.txt
+++ b/test_extensions/CMakeLists.txt
@@ -1 +1,2 @@
+set(HARNESS_LIB harness)
 add_subdirectory( media_sharing )
diff --git a/test_extensions/media_sharing/CMakeLists.txt b/test_extensions/media_sharing/CMakeLists.txt
index e2797667..9fdde1c7 100644
--- a/test_extensions/media_sharing/CMakeLists.txt
+++ b/test_extensions/media_sharing/CMakeLists.txt
@@ -1,7 +1,8 @@
 if(WIN32)
 list(APPEND CLConform_LIBRARIES d3d9.lib dxva2.lib )
+set(MODULE_NAME MEDIA_SURFACE_SHARING)
 
-set (MEDIA_SOURCES
+set(${MODULE_NAME}_SOURCES
         main.cpp
         wrappers.cpp
         utils.cpp
@@ -14,14 +15,11 @@ set (MEDIA_SOURCES
         test_other_data_types.cpp
     )
 
-add_executable(conformance_test_media_surface_sharing
-        ${MEDIA_SOURCES})
-
 set_source_files_properties(
-        ${MEDIA_SOURCES}
+        ${MODULE_NAME}_SOURCES
         PROPERTIES LANGUAGE CXX)
 
-TARGET_LINK_LIBRARIES(conformance_test_media_surface_sharing harness
-        ${CLConform_LIBRARIES})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+include(../../test_conformance/CMakeCommon.txt)
 endif(WIN32)