diff --git a/tests/accessor_legacy/accessor_types_image_core.h b/tests/accessor_legacy/accessor_types_image_core.h
index f1f89e8e7..9168d3559 100644
--- a/tests/accessor_legacy/accessor_types_image_core.h
+++ b/tests/accessor_legacy/accessor_types_image_core.h
@@ -46,9 +46,9 @@ class check_all_types_image_core {
       return;
 
     const auto types =
-        named_type_pack<sycl::opencl::cl_int4,
-                        sycl::opencl::cl_uint4,
-                        sycl::opencl::cl_float4,
+        named_type_pack<sycl::cl_int4,
+                        sycl::cl_uint4,
+                        sycl::cl_float4,
                         user_alias>::generate(
                         "sycl::opencl::cl_int",
                         "sycl::opencl::cl_uint",
diff --git a/tests/accessor_legacy/accessor_types_image_fp16.h b/tests/accessor_legacy/accessor_types_image_fp16.h
index 8cd9225a2..fa412e697 100644
--- a/tests/accessor_legacy/accessor_types_image_fp16.h
+++ b/tests/accessor_legacy/accessor_types_image_fp16.h
@@ -44,7 +44,7 @@ class check_all_types_image_fp16 {
     if (!availability::check(queue, log))
       return;
 
-    check_type<sycl::opencl::cl_half4>()(log, queue, "sycl::opencl::cl_half");
+    check_type<sycl::cl_half4>()(log, queue, "sycl::opencl::cl_half");
 
     queue.wait_and_throw();
   }
diff --git a/tests/common/common.h b/tests/common/common.h
index 266c06355..4469681d1 100644
--- a/tests/common/common.h
+++ b/tests/common/common.h
@@ -465,8 +465,8 @@ struct image_access<1> {
  */
 template <>
 struct image_access<2> {
-  using int_type = sycl::opencl::cl_int2;
-  using float_type = sycl::opencl::cl_float2;
+  using int_type = sycl::cl_int2;
+  using float_type = sycl::cl_float2;
   static int_type get_int(const sycl::id<2>& i) {
     return int_type(i.get(0), i.get(1));
   }
@@ -503,8 +503,8 @@ struct image_access<2> {
  */
 template <>
 struct image_access<3> {
-  using int_type = sycl::opencl::cl_int4;
-  using float_type = sycl::opencl::cl_float4;
+  using int_type = sycl::cl_int4;
+  using float_type = sycl::cl_float4;
   static int_type get_int(const sycl::id<3>& i) {
     return int_type(i.get(0), i.get(1), i.get(2), 0);
   }