diff --git a/sycl/test-e2e/Adapters/enqueue-arg-order-image.cpp b/sycl/test-e2e/Adapters/enqueue-arg-order-image.cpp
index afaab5e56e5b..56ded929c90b 100644
--- a/sycl/test-e2e/Adapters/enqueue-arg-order-image.cpp
+++ b/sycl/test-e2e/Adapters/enqueue-arg-order-image.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // spir-v gen for legacy images at O0 not working
 // UNSUPPORTED: O0
diff --git a/sycl/test-e2e/Adapters/interop-level-zero-image-get-native-mem.cpp b/sycl/test-e2e/Adapters/interop-level-zero-image-get-native-mem.cpp
index cb4b317b629b..f73f6fa4313a 100644
--- a/sycl/test-e2e/Adapters/interop-level-zero-image-get-native-mem.cpp
+++ b/sycl/test-e2e/Adapters/interop-level-zero-image-get-native-mem.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 // RUN: %{build} %level_zero_options -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
 
diff --git a/sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp b/sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp
index ab0e2cbfeb09..a88f12d5e26e 100644
--- a/sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp
+++ b/sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 
 // the ze_debug=4 memory check will fail on this test, since it itentionally
 // makes an 'unbalanced' create/destroy situation for the test.
diff --git a/sycl/test-e2e/Adapters/interop-level-zero-image.cpp b/sycl/test-e2e/Adapters/interop-level-zero-image.cpp
index 019a63b47053..e7ade059afc8 100644
--- a/sycl/test-e2e/Adapters/interop-level-zero-image.cpp
+++ b/sycl/test-e2e/Adapters/interop-level-zero-image.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 // RUN: %{build} %level_zero_options -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Basic/built-ins.cpp b/sycl/test-e2e/Basic/built-ins.cpp
index 5967e7837d50..5ec26787c676 100644
--- a/sycl/test-e2e/Basic/built-ins.cpp
+++ b/sycl/test-e2e/Basic/built-ins.cpp
@@ -5,7 +5,7 @@
 // RUN: %{run} %t_var.out | FileCheck %s
 
 // Hits an assertion and kernel page fault with AMD:
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14404
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/Basic/image/image.cpp b/sycl/test-e2e/Basic/image/image.cpp
index 15ead922d0a2..706933d0def2 100644
--- a/sycl/test-e2e/Basic/image/image.cpp
+++ b/sycl/test-e2e/Basic/image/image.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp
index f85b10be085d..37cc3a23cff0 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: cuda || target-amd
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp b/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp
index 1313bc8e9622..6930379faf0a 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: cuda || target-amd
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp b/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp
index 88cc8825f2b9..bddcee72c8dc 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image
 
-// UNSUPPORTED: cuda, hip
+// UNSUPPORTED: cuda, target-amd
 // CUDA cannot support SYCL 1.2.1 images.
 
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/Basic/image/image_array.cpp b/sycl/test-e2e/Basic/image/image_array.cpp
index 41a69d12e7ed..6fa1dc646302 100644
--- a/sycl/test-e2e/Basic/image/image_array.cpp
+++ b/sycl/test-e2e/Basic/image/image_array.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Basic/image/image_max_size.cpp b/sycl/test-e2e/Basic/image/image_max_size.cpp
index 4630fada05c1..aafb16c1a0a9 100644
--- a/sycl/test-e2e/Basic/image/image_max_size.cpp
+++ b/sycl/test-e2e/Basic/image/image_max_size.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: cuda || target-amd
 // CUDA does not support info::device::image3d_max_width query.
 
 // The test checks that 'image' with max allowed sizes is handled correctly.
diff --git a/sycl/test-e2e/Basic/image/image_read.cpp b/sycl/test-e2e/Basic/image/image_read.cpp
index 6cb9b30670b7..43e8dd03a536 100644
--- a/sycl/test-e2e/Basic/image/image_read.cpp
+++ b/sycl/test-e2e/Basic/image/image_read.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // Temporarily add explicit '-O2' to avoid GPU hang issue with O0 optimization.
 // RUN: %{build} -O2 -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Basic/image/image_read_fp16.cpp b/sycl/test-e2e/Basic/image/image_read_fp16.cpp
index 18915c4e8ae2..e8a9391a6e78 100644
--- a/sycl/test-e2e/Basic/image/image_read_fp16.cpp
+++ b/sycl/test-e2e/Basic/image/image_read_fp16.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // Temporarily add explicit '-O2' to avoid GPU hang issue with O0 optimization.
 // RUN: %{build} -O2 -o %t.out
diff --git a/sycl/test-e2e/Basic/image/image_sample.cpp b/sycl/test-e2e/Basic/image/image_sample.cpp
index f73a4fd3b056..c2c7824461a8 100644
--- a/sycl/test-e2e/Basic/image/image_sample.cpp
+++ b/sycl/test-e2e/Basic/image/image_sample.cpp
@@ -1,7 +1,7 @@
 // REQUIRES: aspect-ext_intel_legacy_image
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 #include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/Basic/image/image_write.cpp b/sycl/test-e2e/Basic/image/image_write.cpp
index 83894985f3c9..aedeaa664e59 100644
--- a/sycl/test-e2e/Basic/image/image_write.cpp
+++ b/sycl/test-e2e/Basic/image/image_write.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // TODO: re-enable on cuda device.
 // See https://github.com/intel/llvm/issues/1542#issuecomment-707877817 for more
 // details.
diff --git a/sycl/test-e2e/Basic/image/image_write_fp16.cpp b/sycl/test-e2e/Basic/image/image_write_fp16.cpp
index a805d9976dd7..7569719bc12b 100644
--- a/sycl/test-e2e/Basic/image/image_write_fp16.cpp
+++ b/sycl/test-e2e/Basic/image/image_write_fp16.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Basic/image/srgba-read.cpp b/sycl/test-e2e/Basic/image/srgba-read.cpp
index 22c63a83e048..24cc8284f9da 100644
--- a/sycl/test-e2e/Basic/image/srgba-read.cpp
+++ b/sycl/test-e2e/Basic/image/srgba-read.cpp
@@ -3,6 +3,9 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14387
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
+//
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: legacy image not supported on AMD
 
 #include <iostream>
 #include <sycl/accessor_image.hpp>
diff --git a/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp b/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp
index 76651914de1b..85f933081618 100644
--- a/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp
+++ b/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: accelerator
+// REQUIRES: target-spir, accelerator
 // RUN: %{build} -Wno-error=deprecated-declarations -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out
 // RUN: %{run} %t.out
 // RUN: %{build} -Wno-error=deprecated-declarations -D__ENABLE_USM_ADDR_SPACE__ -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl-dead-args-optimization -o %t1.out
diff --git a/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp b/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp
index 84dc6d16812a..d46309847f72 100644
--- a/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp
+++ b/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: accelerator
+// REQUIRES: target-spir, accelerator
 // RUN: %{build} -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp b/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp
index 4eeca56acc47..0717bdea3462 100644
--- a/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp
+++ b/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: opencl, opencl_icd, aspect-usm_shared_allocations
+// REQUIRES: target-spir, opencl, opencl_icd, aspect-usm_shared_allocations
 // RUN: %{build} %opencl_lib -fno-sycl-dead-args-optimization -o %t.out
 // RUN: %{run} %t.out
 // XFAIL: accelerator
diff --git a/sycl/test-e2e/DiscardEvents/discard_events_check_images.cpp b/sycl/test-e2e/DiscardEvents/discard_events_check_images.cpp
index d671045c624b..3de2f0303dd4 100644
--- a/sycl/test-e2e/DiscardEvents/discard_events_check_images.cpp
+++ b/sycl/test-e2e/DiscardEvents/discard_events_check_images.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // REQUIRES: aspect-ext_intel_legacy_image
 //
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
index 00aafba08fc4..c93620e91e53 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
@@ -1,6 +1,8 @@
 // FIXME: the rocm include path and link path are highly platform dependent,
 // we should set this with some variable instead.
-// RUN: %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
+// https://github.com/intel/llvm/issues/17018
+
+// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
 // REQUIRES: target-amd
 
diff --git a/sycl/test-e2e/Graph/Explicit/work_group_static_memory.cpp b/sycl/test-e2e/Graph/Explicit/work_group_static_memory.cpp
index c3d9d4f950dd..c22c857870a4 100644
--- a/sycl/test-e2e/Graph/Explicit/work_group_static_memory.cpp
+++ b/sycl/test-e2e/Graph/Explicit/work_group_static_memory.cpp
@@ -5,7 +5,7 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
 // AMD
 
diff --git a/sycl/test-e2e/Graph/RecordReplay/work_group_static_memory.cpp b/sycl/test-e2e/Graph/RecordReplay/work_group_static_memory.cpp
index 98d4f045df50..f5bdc672a22f 100644
--- a/sycl/test-e2e/Graph/RecordReplay/work_group_static_memory.cpp
+++ b/sycl/test-e2e/Graph/RecordReplay/work_group_static_memory.cpp
@@ -5,7 +5,7 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
 // AMD
 
diff --git a/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp b/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp
index 0d4f935d4c47..084be871046e 100644
--- a/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp
+++ b/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp
@@ -5,7 +5,7 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
 // AMD
 
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
index 23856043230f..458f55e693ab 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
@@ -1,6 +1,8 @@
 // FIXME: the rocm include path and link path are highly platform dependent,
 // we should set this with some variable instead.
-// RUN: %{build} -Wno-error=deprecated-pragma -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
+// https://github.com/intel/llvm/issues/17018
+
+// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
 // REQUIRES: target-amd
 
diff --git a/sycl/test-e2e/Printf/char.cpp b/sycl/test-e2e/Printf/char.cpp
index f409a5f8150d..fef3f88dad25 100644
--- a/sycl/test-e2e/Printf/char.cpp
+++ b/sycl/test-e2e/Printf/char.cpp
@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
diff --git a/sycl/test-e2e/Printf/double.cpp b/sycl/test-e2e/Printf/double.cpp
index ab756e6e8337..f34a7713346c 100644
--- a/sycl/test-e2e/Printf/double.cpp
+++ b/sycl/test-e2e/Printf/double.cpp
@@ -5,7 +5,7 @@
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
 // REQUIRES: aspect-fp64
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
diff --git a/sycl/test-e2e/Printf/float.cpp b/sycl/test-e2e/Printf/float.cpp
index 070649f99d84..624a5977bc70 100644
--- a/sycl/test-e2e/Printf/float.cpp
+++ b/sycl/test-e2e/Printf/float.cpp
@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
diff --git a/sycl/test-e2e/Printf/int.cpp b/sycl/test-e2e/Printf/int.cpp
index d87d35bbf518..5a4678825141 100644
--- a/sycl/test-e2e/Printf/int.cpp
+++ b/sycl/test-e2e/Printf/int.cpp
@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // FIXME: The 'short' type gets overflown with sporadic values on CUDA.
 // XFAIL: cuda
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14734
diff --git a/sycl/test-e2e/Printf/mixed-address-space.cpp b/sycl/test-e2e/Printf/mixed-address-space.cpp
index 72d7c009569b..1e256f561928 100644
--- a/sycl/test-e2e/Printf/mixed-address-space.cpp
+++ b/sycl/test-e2e/Printf/mixed-address-space.cpp
@@ -1,7 +1,7 @@
 // This test is written with an aim to check that experimental::printf versions
 // for constant and generic address space can be used in the same module.
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // XFAIL: cuda && windows
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
 // FIXME: Drop the test once generic AS support is considered stable and the
diff --git a/sycl/test-e2e/Printf/percent-symbol.cpp b/sycl/test-e2e/Printf/percent-symbol.cpp
index ea3e1ea40a92..364016220a62 100644
--- a/sycl/test-e2e/Printf/percent-symbol.cpp
+++ b/sycl/test-e2e/Printf/percent-symbol.cpp
@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // XFAIL: cuda && windows
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
index 54f57395acc3..54d2e306d451 100644
--- a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
+++ b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
@@ -3,7 +3,7 @@
 //
 // XFAIL: target-nvidia
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/16417
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // Windows doesn't yet have full shutdown().
 // UNSUPPORTED: ze_debug && windows
diff --git a/sycl/test-e2e/Sampler/basic-rw-float.cpp b/sycl/test-e2e/Sampler/basic-rw-float.cpp
index 2d13e899c552..b140d47ea70c 100644
--- a/sycl/test-e2e/Sampler/basic-rw-float.cpp
+++ b/sycl/test-e2e/Sampler/basic-rw-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/basic-rw.cpp b/sycl/test-e2e/Sampler/basic-rw.cpp
index aa3e179da71a..d8d6e3a55978 100644
--- a/sycl/test-e2e/Sampler/basic-rw.cpp
+++ b/sycl/test-e2e/Sampler/basic-rw.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp
index 3f6a76a63d3b..6e59650db408 100644
--- a/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp b/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp
index 3fd75b236af2..1684fb23a97a 100644
--- a/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp
index 0322f317db0d..b063a9ba3859 100644
--- a/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp
@@ -2,7 +2,7 @@
 // UNSUPPORTED: cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-// XFAIL: hip
+// XFAIL: target-amd
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14732
 
 // CUDA works with image_channel_type::fp32, but not with any 8-bit per channel
diff --git a/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp b/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
index b1f13e0b6314..cae8d8aee12a 100644
--- a/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
@@ -4,7 +4,7 @@
 //
 // Missing __spirv_ImageWrite, __spirv_SampledImage,
 // __spirv_ImageSampleExplicitLod on AMD
-// XFAIL: hip
+// XFAIL: target-amd
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14732
 
 /*
diff --git a/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp
index 586002154671..6d5650098bb8 100644
--- a/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp b/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp
index 1562cea2a925..557041362e09 100644
--- a/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp
index 39b3b905551d..4d549fe759fd 100644
--- a/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-none-nearest.cpp b/sycl/test-e2e/Sampler/normalized-none-nearest.cpp
index d1d514b2bffb..9f8c0f78ae4f 100644
--- a/sycl/test-e2e/Sampler/normalized-none-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-none-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp
index 7e57642726a0..667da8b40965 100644
--- a/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp b/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp
index db6d5ad002b6..9eef2abf4bf6 100644
--- a/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp b/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp
index 2742bf2d26a8..e845c9ac6f27 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp b/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp
index 86c5232bd557..90ad085859b4 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp b/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp
index b67b2134242d..c23eb7e65c04 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp b/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp
index f75368321d4f..4dd25dd90d9a 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp b/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp
index 4834633e0a94..d70b2616aa5f 100644
--- a/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp b/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp
index abfd9d805a88..bb6779eaa591 100644
--- a/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp b/sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp
index 469dc7741120..27be29565819 100644
--- a/sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp
+++ b/sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} -o %t.out -fsycl-dead-args-optimization
 // RUN: %{run} %t.out
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED: native_cpu
 
 #include <cstdlib>
diff --git a/sycl/test-e2e/Tracing/usm/queue_single_task_nullptr.cpp b/sycl/test-e2e/Tracing/usm/queue_single_task_nullptr.cpp
index d7407bbeeab9..ef8b98b98301 100644
--- a/sycl/test-e2e/Tracing/usm/queue_single_task_nullptr.cpp
+++ b/sycl/test-e2e/Tracing/usm/queue_single_task_nullptr.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: windows || hip
+// UNSUPPORTED: windows || target-amd
 // RUN: %{build} -o %t.out
 // RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
 
diff --git a/sycl/test-e2e/WorkGroupStatic/lit.local.cfg b/sycl/test-e2e/WorkGroupStatic/lit.local.cfg
index bafde197c494..e2303be9184e 100644
--- a/sycl/test-e2e/WorkGroupStatic/lit.local.cfg
+++ b/sycl/test-e2e/WorkGroupStatic/lit.local.cfg
@@ -1,3 +1,3 @@
 
 # https://github.com/intel/llvm/issues/16072
-config.unsupported_features += ['hip']
+config.unsupported_features += ['target-amd']
diff --git a/sycl/test-e2e/XPTI/kernel/basic.cpp b/sycl/test-e2e/XPTI/kernel/basic.cpp
index 9075d2c2f52c..0b510e563a73 100644
--- a/sycl/test-e2e/XPTI/kernel/basic.cpp
+++ b/sycl/test-e2e/XPTI/kernel/basic.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: xptifw, opencl
+// REQUIRES: xptifw, opencl, target-spir
 // RUN: %clangxx %s -DXPTI_COLLECTOR -DXPTI_CALLBACK_API_EXPORTS %xptifw_lib %shared_lib %fPIC %cxx_std_optionc++17 -o %t_collector.dll
 // RUN: %{build} -O2 -o %t.opt.out
 // RUN: env XPTI_TRACE_ENABLE=1 XPTI_FRAMEWORK_DISPATCHER=%xptifw_dispatcher XPTI_SUBSCRIBERS=%t_collector.dll %{run} %t.opt.out | FileCheck %s --check-prefixes=CHECK,CHECK-OPT
diff --git a/sycl/test-e2e/XPTI/kernel/content.cpp b/sycl/test-e2e/XPTI/kernel/content.cpp
index 67b9f4884645..4bfb69112a5a 100644
--- a/sycl/test-e2e/XPTI/kernel/content.cpp
+++ b/sycl/test-e2e/XPTI/kernel/content.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: xptifw, opencl
+// REQUIRES: xptifw, opencl, target-spir
 // RUN: %clangxx %s -DXPTI_COLLECTOR -DXPTI_CALLBACK_API_EXPORTS %xptifw_lib %shared_lib %fPIC %cxx_std_optionc++17 -o %t_collector.dll
 // RUN: %{build} -Wno-error=deprecated-declarations -O2 -o %t.opt.out
 // RUN: env XPTI_TRACE_ENABLE=1 XPTI_FRAMEWORK_DISPATCHER=%xptifw_dispatcher XPTI_SUBSCRIBERS=%t_collector.dll %{run} %t.opt.out | FileCheck %s --check-prefix=CHECK-OPT
diff --git a/sycl/test-e2e/bindless_images/3_channel_format.cpp b/sycl/test-e2e/bindless_images/3_channel_format.cpp
index 1f8a14ed2919..7c502170bab1 100644
--- a/sycl/test-e2e/bindless_images/3_channel_format.cpp
+++ b/sycl/test-e2e/bindless_images/3_channel_format.cpp
@@ -3,7 +3,7 @@
 // Test requires at least this version of the Intel GPU driver on Arc.
 // REQUIRES-INTEL-DRIVER: lin: 32370
 
-// UNSUPPORTED: hip || level_zero
+// UNSUPPORTED: target-amd || level_zero
 // UNSUPPORTED-INTENDED: Unimplemented in the HIP adapter yet.
 // Also, the feature is not fully implemented in the Level Zero stack.
 
diff --git a/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp b/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
index c6a1fad34d18..0d25ea754e17 100644
--- a/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
+++ b/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_image_array
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: image array not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/examples/example_3_1D_mipmap_anisotropic_filtering_and_levels.cpp b/sycl/test-e2e/bindless_images/examples/example_3_1D_mipmap_anisotropic_filtering_and_levels.cpp
index c4fad4c74ee9..931b8f8b0b46 100644
--- a/sycl/test-e2e/bindless_images/examples/example_3_1D_mipmap_anisotropic_filtering_and_levels.cpp
+++ b/sycl/test-e2e/bindless_images/examples/example_3_1D_mipmap_anisotropic_filtering_and_levels.cpp
@@ -1,5 +1,7 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
 // REQUIRES: aspect-ext_oneapi_mipmap_anisotropy
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: mipmap not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp
index 39a81d68190c..962c3605783c 100644
--- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp
+++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: mipmap not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp
index 49011973ef08..5f6cbb92767b 100644
--- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp
+++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: mipmap not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
index 778dd187aa2d..8608c320e47c 100644
--- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
+++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: mipmap not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp
index 5f537ea8855c..0a835e50c40b 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_1d_usm
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp
index 4518832215e9..9ffc437105e6 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_2d
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp
index 2dccb63645ab..aa162fc6d826 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_2d_usm
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
index 0cffd4ef864a..35a883050ac7 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_3d
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/user_types/mipmap_read_user_type_2D.cpp b/sycl/test-e2e/bindless_images/user_types/mipmap_read_user_type_2D.cpp
index 087b341bb74f..cad5e5e6714a 100644
--- a/sycl/test-e2e/bindless_images/user_types/mipmap_read_user_type_2D.cpp
+++ b/sycl/test-e2e/bindless_images/user_types/mipmap_read_user_type_2D.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
+// UNSUPPORTED-INTENDED: mipmap not currently supported on AMD
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp
index f43c60d8a358..ed85a966b242 100644
--- a/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp
+++ b/sycl/test-e2e/syclcompat/atomic/atomic_class.cpp
@@ -30,7 +30,7 @@
 //
 // ===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: hip || (windows && level_zero)
+// UNSUPPORTED: target-amd || (windows && level_zero)
 
 // RUN: %{build} %if target-nvidia %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/syclcompat/atomic/atomic_memory_acq_rel.cpp b/sycl/test-e2e/syclcompat/atomic/atomic_memory_acq_rel.cpp
index b3c48d0867b9..765440e4175f 100644
--- a/sycl/test-e2e/syclcompat/atomic/atomic_memory_acq_rel.cpp
+++ b/sycl/test-e2e/syclcompat/atomic/atomic_memory_acq_rel.cpp
@@ -30,7 +30,7 @@
 //
 // ===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} %if target-nvidia %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %} -o %t.out
 // RUN: %{run} %t.out