diff --git a/README.md b/README.md
index 34322f48cc..6d46ce992f 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ require compilation, these are:
 
 The Khronos [Conformance Process Document](https://members.khronos.org/document/dl/911)
 details the steps required for a conformance submission.
-In this repository [opencl_conformance_tests_full.csv](test_conformance/submission_details_template.txt)
+In this repository [opencl_conformance_tests_full.csv](test_conformance/opencl_conformance_tests_full.csv)
 defines the full list of tests which must be run for conformance. The output log
 of which must be included alongside a filled in
 [submission details template](test_conformance/submission_details_template.txt).
diff --git a/test_conformance/extensions/CMakeLists.txt b/test_conformance/extensions/CMakeLists.txt
index 77aa2f18eb..e0e790c235 100644
--- a/test_conformance/extensions/CMakeLists.txt
+++ b/test_conformance/extensions/CMakeLists.txt
@@ -1,3 +1,7 @@
+# Note: Each extension adds its own test executable to the build. When
+# creating tests for a new extension ensure to update the
+# `opencl_conformance_tests_*.csv` files with the path to the new binary so
+# that the extension tests are included in conformance test runs.
 add_subdirectory( cl_ext_cxx_for_opencl )
 add_subdirectory( cl_khr_command_buffer )
 add_subdirectory( cl_khr_dx9_media_sharing )
diff --git a/test_conformance/opencl_conformance_tests_full.csv b/test_conformance/opencl_conformance_tests_full.csv
index 2b0dc8aa12..4d49305289 100644
--- a/test_conformance/opencl_conformance_tests_full.csv
+++ b/test_conformance/opencl_conformance_tests_full.csv
@@ -105,3 +105,12 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
 Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
 Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
 Subgroups,subgroups/test_subgroups
+cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl
+#Binary only created on Windows builds
+#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
+cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
+#Binary only created when Vulkan SDK is available
+#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore
+cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer
+cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch
+cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock
diff --git a/test_conformance/opencl_conformance_tests_full_binary.csv b/test_conformance/opencl_conformance_tests_full_binary.csv
index 348f32eb86..6cb9eee4b6 100644
--- a/test_conformance/opencl_conformance_tests_full_binary.csv
+++ b/test_conformance/opencl_conformance_tests_full_binary.csv
@@ -105,3 +105,12 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
 Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps --compilation-mode binary --compilation-cache-path .
 Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps --compilation-mode binary --compilation-cache-path .
 Subgroups,subgroups/test_subgroups --compilation-mode binary --compilation-cache-path .
+cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl --compilation-mode binary --compilation-cache-path .
+#Binary only created on Windows builds
+#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing --compilation-mode binary --compilation-cache-path .
+cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore  --compilation-mode binary --compilation-cache-path .
+#Binary only created when Vulkan SDK is available
+#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore --compilation-mode binary --compilation-cache-path .
+cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer --compilation-mode binary --compilation-cache-path .
+cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch --compilation-mode binary --compilation-cache-path .
+cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock --compilation-mode binary --compilation-cache-path .
diff --git a/test_conformance/opencl_conformance_tests_full_no_math_or_conversions.csv b/test_conformance/opencl_conformance_tests_full_no_math_or_conversions.csv
index 89d4490724..0dfd7b14de 100644
--- a/test_conformance/opencl_conformance_tests_full_no_math_or_conversions.csv
+++ b/test_conformance/opencl_conformance_tests_full_no_math_or_conversions.csv
@@ -103,3 +103,12 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
 Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
 Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
 Subgroups,subgroups/test_subgroups
+cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl
+#Binary only created on Windows builds
+#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
+cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
+#Binary only created when Vulkan SDK is available
+#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore
+cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer
+cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch
+cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock
diff --git a/test_conformance/opencl_conformance_tests_full_spirv.csv b/test_conformance/opencl_conformance_tests_full_spirv.csv
index 24b41865b2..1f2c2aa2b8 100644
--- a/test_conformance/opencl_conformance_tests_full_spirv.csv
+++ b/test_conformance/opencl_conformance_tests_full_spirv.csv
@@ -105,3 +105,12 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
 Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps --compilation-mode spir-v --compilation-cache-path .
 Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps --compilation-mode spir-v --compilation-cache-path .
 Subgroups,subgroups/test_subgroups --compilation-mode spir-v --compilation-cache-path .
+cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl --compilation-mode spir-v --compilation-cache-path .
+#Binary only created on Windows builds
+#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing --compilation-mode spir-v --compilation-cache-path .
+cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore --compilation-mode spir-v --compilation-cache-path .
+#Binary only created when Vulkan SDK is available
+#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore --compilation-mode spir-v --compilation-cache-path .
+cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer --compilation-mode spir-v --compilation-cache-path .
+cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch --compilation-mode spir-v --compilation-cache-path .
+cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock --compilation-mode spir-v --compilation-cache-path .
diff --git a/test_conformance/opencl_conformance_tests_quick.csv b/test_conformance/opencl_conformance_tests_quick.csv
index 043df8214c..4d742aa6ed 100644
--- a/test_conformance/opencl_conformance_tests_quick.csv
+++ b/test_conformance/opencl_conformance_tests_quick.csv
@@ -105,3 +105,12 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
 Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
 Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
 Subgroups,subgroups/test_subgroups
+cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl
+#Binary only created on Windows builds
+#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
+cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
+#Binary only created when Vulkan SDK is available
+#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore
+cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer
+cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch
+cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock