diff --git a/buildbot/configure.py b/buildbot/configure.py
index d3e9021668103..2d81feb57f113 100644
--- a/buildbot/configure.py
+++ b/buildbot/configure.py
@@ -158,12 +158,7 @@ def do_configure(args, passthrough_args):
             # libclc passes `--nvvm-reflect-enable=false`, build NVPTX to enable it
             if "NVPTX" not in llvm_targets_to_build:
                 llvm_targets_to_build += ";NVPTX"
-            # since we are building AMD libclc target we must have AMDGPU target
-            if "AMDGPU" not in llvm_targets_to_build:
-                llvm_targets_to_build += ";AMDGPU"
-            # Add both NVIDIA and AMD libclc targets
-            if libclc_amd_target_names not in libclc_targets_to_build:
-                libclc_targets_to_build += libclc_amd_target_names
+            # Add NVIDIA libclc targets
             if libclc_nvidia_target_names not in libclc_targets_to_build:
                 libclc_targets_to_build += libclc_nvidia_target_names
             libclc_gen_remangled_variants = "ON"
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
index 892f5a199b6e1..db874eddbd28b 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: hip_dev_kit
+// REQUIRES: target-amd && hip_dev_kit
 
 // XFAIL: new-offload-model && windows
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797