diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt
index efc3548e..42a1042e 100644
--- a/test_conformance/api/CMakeLists.txt
+++ b/test_conformance/api/CMakeLists.txt
@@ -22,6 +22,7 @@ set(${MODULE_NAME}_SOURCES
          test_null_buffer_arg.c
          test_mem_object_info.cpp
          test_queue_hint.cpp
+         test_queue_properties.cpp
          test_sub_group_dispatch.cpp
          test_clone_kernel.cpp
          test_zero_sized_enqueue.cpp
diff --git a/test_conformance/api/main.c b/test_conformance/api/main.c
index d0634b08..a2ab9353 100644
--- a/test_conformance/api/main.c
+++ b/test_conformance/api/main.c
@@ -117,6 +117,7 @@ test_definition test_list[] = {
     ADD_TEST( get_image1d_array_info ),
     ADD_TEST( get_image2d_array_info ),
     ADD_TEST( queue_hint ),
+    ADD_TEST( queue_properties ),
     ADD_TEST_VERSION( sub_group_dispatch, Version(2, 1) ),
     ADD_TEST_VERSION( clone_kernel, Version(2, 1) ),
     ADD_TEST_VERSION( zero_sized_enqueue, Version(2, 1) ),
diff --git a/test_conformance/api/procs.h b/test_conformance/api/procs.h
index 1ba74d80..1eaa303f 100644
--- a/test_conformance/api/procs.h
+++ b/test_conformance/api/procs.h
@@ -111,3 +111,4 @@ extern int      test_queue_hint(cl_device_id deviceID, cl_context context, cl_co
 extern int      test_sub_group_dispatch(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
 extern int      test_clone_kernel(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
 extern int      test_zero_sized_enqueue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
+extern int      test_queue_properties( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
diff --git a/test_conformance/compatibility/test_conformance/api/test_queue_properties.cpp b/test_conformance/api/test_queue_properties.cpp
similarity index 100%
rename from test_conformance/compatibility/test_conformance/api/test_queue_properties.cpp
rename to test_conformance/api/test_queue_properties.cpp
diff --git a/test_conformance/compatibility/test_conformance/api/CMakeLists.txt b/test_conformance/compatibility/test_conformance/api/CMakeLists.txt
index 4f40dec4..1b387a9e 100644
--- a/test_conformance/compatibility/test_conformance/api/CMakeLists.txt
+++ b/test_conformance/compatibility/test_conformance/api/CMakeLists.txt
@@ -4,7 +4,6 @@ set(${MODULE_NAME}_SOURCES
          main.c
          test_mem_object_info.cpp
          test_kernel_arg_info.c
-         test_queue_properties.cpp
 )
 
 set(${MODULE_NAME}_LIBS harness-compat)
diff --git a/test_conformance/compatibility/test_conformance/api/main.c b/test_conformance/compatibility/test_conformance/api/main.c
index 30151b4c..5a07741a 100644
--- a/test_conformance/compatibility/test_conformance/api/main.c
+++ b/test_conformance/compatibility/test_conformance/api/main.c
@@ -39,7 +39,6 @@ test_definition test_list[] = {
     ADD_TEST( get_image1d_info ),
     ADD_TEST( get_image1d_array_info ),
     ADD_TEST( get_image2d_array_info ),
-    ADD_TEST( queue_properties ),
 };
 
 const int test_num = ARRAY_SIZE( test_list );
diff --git a/test_conformance/compatibility/test_conformance/api/procs.h b/test_conformance/compatibility/test_conformance/api/procs.h
index bdeb0e7c..6d8e1be2 100644
--- a/test_conformance/compatibility/test_conformance/api/procs.h
+++ b/test_conformance/compatibility/test_conformance/api/procs.h
@@ -105,5 +105,4 @@ extern int      test_get_image1d_info( cl_device_id deviceID, cl_context context
 extern int      test_get_image1d_array_info( cl_device_id deviceID, cl_context context, cl_command_queue ignoreQueue, int num_elements );
 extern int      test_get_image2d_array_info( cl_device_id deviceID, cl_context context, cl_command_queue ignoreQueue, int num_elements );
 extern int      test_get_kernel_arg_info( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
-extern int      test_queue_properties( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );