diff --git a/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp b/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
index 43f4b655ea6ad..1c3c3f44c0fb0 100644
--- a/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
+++ b/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
@@ -7,8 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // Issue with OpenCL CPU runtime implementation of OpGenericCastToPtrExplicit
-// FPGA emulator affected by same issue as OpenCL CPU runtime
-// UNSUPPORTED: cpu, accelerator
+// UNSUPPORTED: cpu
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp
index ce999cdc41f96..e67e67271970c 100644
--- a/sycl/test-e2e/Assert/assert_in_kernels.cpp
+++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp
@@ -7,16 +7,12 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // CHECK:      {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_kernels_win.cpp b/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
index 8f7c58b84d184..0e4f3ac44502e 100644
--- a/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
@@ -1,7 +1,6 @@
 // REQUIRES: windows
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,8 +9,5 @@
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|\(null\)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
index bae87a0144c89..fa365c84df22f 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
@@ -13,8 +13,7 @@
 // REQUIRES-INTEL-DRIVER: lin: 31294
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CUDA uses block/thread vs global/local id for SYCL, also it shows the
 // position of a thread within the block, not the absolute ID.
@@ -22,8 +21,5 @@
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp
index 267034f6fae33..30a0aab037c97 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp
@@ -10,8 +10,7 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // CUDA uses block/thread vs global/local id for SYCL, also it shows the
@@ -20,6 +19,3 @@
 // CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: int checkFunction(): {{.*}}
-// CHECK-ACC: The test ended.
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
index 9537b977b560d..3e36c69bef35f 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
@@ -1,7 +1,6 @@
 // REQUIRES: windows
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,6 +9,3 @@
 // CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0],
-// CHECK-ACC: The test ended.
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
index 573bf7d2338cc..5f1deff9f25c2 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
@@ -1,7 +1,6 @@
 // REQUIRES: windows
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
@@ -9,8 +8,5 @@
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
index bcb335aff2e8c..4f5cd322f2def 100644
--- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
+++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
@@ -8,13 +8,10 @@
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
index 73ff0505dcc7d..7ef8b6fe9b2e8 100644
--- a/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
@@ -1,15 +1,11 @@
 // REQUIRES: windows
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC:  The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
index 15854048d275b..fc7b554d15af7 100644
--- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
+++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
@@ -17,13 +17,10 @@
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}} [9,7,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
index 8ca6db17ae348..27be8e1cc8d8a 100644
--- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
@@ -9,16 +9,12 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
-// CHECK-ACC:  The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
index d43c806952990..2c6affb1df0f4 100644
--- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
+++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
@@ -16,14 +16,10 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{this message from file1|this message from file2}}
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{this message from file1|this message from file2}}
-// CHECK-ACC: The test ended.
 
 #include "Inputs/kernels_in_file2.hpp"
 #include <cstdio>
diff --git a/sycl/test-e2e/Basic/aspects.cpp b/sycl/test-e2e/Basic/aspects.cpp
index 3b8a60f8b1165..9ad57d76d1189 100644
--- a/sycl/test-e2e/Basic/aspects.cpp
+++ b/sycl/test-e2e/Basic/aspects.cpp
@@ -30,9 +30,6 @@ int main() {
     } else if (plt.has(aspect::gpu)) {
       std::cout << "Platform #" << pltIdx
                 << " type: GPU supports:" << std::endl;
-    } else if (plt.has(aspect::accelerator)) {
-      std::cout << "Platform #" << pltIdx
-                << " type: Accelerator supports:" << std::endl;
     } else if (plt.has(aspect::custom)) {
       std::cout << "Platform #" << pltIdx
                 << " type: Custom supports:" << std::endl;
diff --git a/sycl/test-e2e/Basic/device-selectors.cpp b/sycl/test-e2e/Basic/device-selectors.cpp
index 1e7e42db1142d..ca2fdf839beeb 100644
--- a/sycl/test-e2e/Basic/device-selectors.cpp
+++ b/sycl/test-e2e/Basic/device-selectors.cpp
@@ -111,12 +111,6 @@ int main() {
            "Incorrect device. Expected CPU.");
   } catch (exception &e) {
   }
-  try {
-    queue acc_queue(accelerator_selector_v);
-    assert(acc_queue.get_device().is_accelerator() &&
-           "Incorrect device. Expected Accelerator.");
-  } catch (exception &e) {
-  }
 
   // ------ aspect_selectors --------
 
@@ -154,16 +148,6 @@ int main() {
   } catch (exception &e) {
   }
 
-  // Pass aspects in an allowlist and a denylist.
-  try {
-    device dev4 = device{aspect_selector(std::vector{aspect::accelerator},
-                                         std::vector{aspect::image})};
-    assert(dev4.is_accelerator() && "Incorrect device, expected accelerator.");
-    assert(!dev4.has(aspect::image) &&
-           "Device should NOT support aspect::image.");
-  } catch (exception &e) {
-  }
-
   // Validate errors.
   try {
     device dev5 = device{aspect_selector<aspect::cpu, aspect::gpu>()};
diff --git a/sycl/test-e2e/Basic/device.cpp b/sycl/test-e2e/Basic/device.cpp
index be97706f3bc92..c98ae09655ed2 100644
--- a/sycl/test-e2e/Basic/device.cpp
+++ b/sycl/test-e2e/Basic/device.cpp
@@ -13,8 +13,6 @@ using namespace sycl;
 std::string get_type(const device &dev) {
   if (dev.is_gpu()) {
     return "OpenCL.GPU";
-  } else if (dev.is_accelerator()) {
-    return "OpenCL.ACC";
   } else {
     return "OpenCL.CPU";
   }
@@ -48,12 +46,6 @@ int main() {
     std::cout << "Device " << i++ << " is available: " << get_type(dev)
               << std::endl;
   }
-  i = 1;
-  std::cout << "Get OpenCL.ACC devices in the system" << std::endl;
-  for (const auto &dev : device::get_devices(info::device_type::accelerator)) {
-    std::cout << "Device " << i++ << " is available: " << get_type(dev)
-              << std::endl;
-  }
 
   auto devices = device::get_devices();
   device &deviceA = devices[0];
diff --git a/sycl/test-e2e/Basic/diagnostics/device-check.cpp b/sycl/test-e2e/Basic/diagnostics/device-check.cpp
index 52e10db655dc5..b4784cd53408e 100644
--- a/sycl/test-e2e/Basic/diagnostics/device-check.cpp
+++ b/sycl/test-e2e/Basic/diagnostics/device-check.cpp
@@ -1,13 +1,10 @@
 // RUN: %{build} -o %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:CPU" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:GPU" %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:Fpga" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:Cpu" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:Gpu" %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:FPGA" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:XPU" %{run-unfiltered-devices} %t.out
 
 //==------------------- device-check.cpp --------------------------==//
@@ -32,7 +29,7 @@ int main() {
 
   catch (exception const &E) {
 
-    // Exception when cpu/gpu/fpga is not available on the system.
+    // Exception when cpu/gpu is not available on the system.
     if (E.code() == errc::runtime) {
       if (std::string(E.what()).find("No device of requested type") ==
           std::string::npos) {
diff --git a/sycl/test-e2e/Basic/get_backend.cpp b/sycl/test-e2e/Basic/get_backend.cpp
index d23cc27550529..fbb3090ba7f4f 100644
--- a/sycl/test-e2e/Basic/get_backend.cpp
+++ b/sycl/test-e2e/Basic/get_backend.cpp
@@ -1,7 +1,5 @@
 // RUN: %{build} -o %t.out
-// FPGA RT returns random CL_INVALID_CONTEXT in some configurations, tracked
-// internally. Avoid FPGA devices until that is fixed.
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu;*:cpu" %{run-unfiltered-devices} %t.out
+// RUN: %{run-unfiltered-devices} %t.out
 //
 //==----------------- get_backend.cpp ------------------------==//
 // This is a test of get_backend().
diff --git a/sycl/test-e2e/Basic/info.cpp b/sycl/test-e2e/Basic/info.cpp
index 8cfea54d6dda0..bc6b17aa23ca6 100644
--- a/sycl/test-e2e/Basic/info.cpp
+++ b/sycl/test-e2e/Basic/info.cpp
@@ -51,8 +51,6 @@ template <> std::string info_to_string(info::device_type info) {
     return "cpu";
   case info::device_type::gpu:
     return "gpu";
-  case info::device_type::accelerator:
-    return "accelerator";
   case info::device_type::custom:
     return "custom";
   case info::device_type::automatic:
diff --git a/sycl/test-e2e/Basic/multi_ptr_legacy.hpp b/sycl/test-e2e/Basic/multi_ptr_legacy.hpp
index 6860b21ee0683..d0e13ffaaf27a 100644
--- a/sycl/test-e2e/Basic/multi_ptr_legacy.hpp
+++ b/sycl/test-e2e/Basic/multi_ptr_legacy.hpp
@@ -127,12 +127,6 @@ template <typename T> void testMultPtr() {
             global_ptr<void> ptr_8 = global_ptr<void>(ptr_7);
             ext::intel::host_ptr<void> ptr_9((void *)RawPtr);
             global_ptr<void> ptr_10 = global_ptr<void>(ptr_9);
-            // TODO: need propagation of a7b763b26 patch to acl tool before
-            // testing these conversions - otherwise the test would fail on
-            // accelerator device during reversed translation from SPIR-V to
-            // LLVM IR device_ptr<T> ptr_11(accessorData_1); global_ptr<T>
-            // ptr_12 = global_ptr<T>(ptr_11);
-
             innerFunc<T>(wiID.get_local_id().get(0), ptr_1, ptr_2, local_ptr);
           });
     });
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
deleted file mode 100644
index 85f9330816185..0000000000000
--- a/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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
-// RUN: %{run} %t1.out
-
-//==-- multi_ptr_legacy_usm_addr_ext.cpp - SYCL multi_ptr legacy test ext --==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "multi_ptr_legacy.hpp"
diff --git a/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp b/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp
deleted file mode 100644
index d46309847f72c..0000000000000
--- a/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// REQUIRES: target-spir, accelerator
-// RUN: %{build} -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out
-// RUN: %{run} %t.out
-
-//==----- multi_ptr_usm_addr_ext.cpp - SYCL multi_ptr test with usm ext ----==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "multi_ptr.hpp"
diff --git a/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp b/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp
deleted file mode 100644
index 340d48f34fb32..0000000000000
--- a/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// REQUIRES: target-spir, accelerator
-
-// RUN: %{build} -o %t.out
-// RUN: %{run} %t.out | FileCheck %s
-
-// Test that usage of blocking pipes and stream object in the same kernel
-// doesn't cause program hang.
-
-// CHECK: 0
-// CHECK-NEXT: 1
-// CHECK-NEXT: 2
-// CHECK-NEXT: 3
-// CHECK-NEXT: 4
-// CHECK-NEXT: 5
-// CHECK-NEXT: 6
-// CHECK-NEXT: 7
-// CHECK-NEXT: 8
-// CHECK-NEXT: 9
-// CHECK-NEXT: 0
-// CHECK-NEXT: 1
-// CHECK-NEXT: 2
-// CHECK-NEXT: 3
-// CHECK-NEXT: 4
-// CHECK-NEXT: 5
-// CHECK-NEXT: 6
-// CHECK-NEXT: 7
-// CHECK-NEXT: 8
-// CHECK-NEXT: 9
-
-#include <sycl/detail/core.hpp>
-#include <sycl/ext/intel/fpga_extensions.hpp>
-#include <sycl/pipes.hpp>
-#include <sycl/stream.hpp>
-
-using namespace sycl;
-
-constexpr size_t N = 10;
-
-// Specialize a pipe type
-using my_pipe = pipe<class some_pipe, int>;
-
-class producer_task;
-class consumer_task;
-
-void producer(queue &q) {
-  // Launch the producer kernel
-  q.submit([&](handler &cgh) {
-    // Get read access to src buffer
-    sycl::stream out(1024, 16, cgh);
-    cgh.single_task<producer_task>([=] {
-      for (int i = 0; i < N; i++) {
-        // Blocking write an int to the pipe
-        my_pipe::write(i);
-        out << i << sycl::endl;
-      }
-    });
-  });
-}
-
-void consumer(queue &q) {
-  // Launch the consumer kernel
-  q.submit([&](handler &cgh) {
-    // Get write access to dst buffer
-    sycl::stream out(1024, 16, cgh);
-    cgh.single_task<consumer_task>([=] {
-      for (int i = 0; i < N; i++) {
-        // Blocking read an int from the pipe
-        int tmp = my_pipe::read();
-        out << tmp << sycl::endl;
-      }
-    });
-  });
-}
-
-int main() {
-  {
-    queue q;
-
-    producer(q);
-    consumer(q);
-    q.wait();
-  }
-
-  return 0;
-}
diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_unknown_on_host.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_unknown_on_host.cpp
deleted file mode 100644
index 71cc158690ddf..0000000000000
--- a/sycl/test-e2e/DeviceArchitecture/device_architecture_unknown_on_host.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// REQUIRES: accelerator
-
-// RUN: %{build} -o %t.out
-// RUN: %{run} %t.out
-
-// Test checks that device_architecture extension implementation correctly
-// handles unsupported HW. The unsupported HW in this test is any FPGA device,
-// as FPGA currently is not supported at all by the device_architecture
-// extension.
-
-#include <sycl/detail/core.hpp>
-
-int main() {
-  sycl::queue q;
-  sycl::device dev = q.get_device();
-
-  sycl::ext::oneapi::experimental::architecture arch = dev.get_info<
-      sycl::ext::oneapi::experimental::info::device::architecture>();
-
-  assert(arch == sycl::ext::oneapi::experimental::architecture::unknown);
-  // device::ext_oneapi_architecture_is(syclex::architecture::unknown) should
-  // return true if the device does not have a known architecture.
-  assert(dev.ext_oneapi_architecture_is(arch));
-
-  // No exceptions are expected in this test.
-
-  return 0;
-}
diff --git a/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp b/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp
index cd112913cd4ae..19debe0c79cf4 100644
--- a/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp
+++ b/sycl/test-e2e/DeviceImageBackendContent/OCL_interop_test.cpp
@@ -1,9 +1,6 @@
 // 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
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16914
-//
 #include <sycl/backend.hpp>
 #include <sycl/detail/cl.h>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp b/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp
index ed04c24b46cb6..c3904c9c6fce7 100644
--- a/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp
+++ b/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp
@@ -1,9 +1,6 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: accelerator
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17209
-
 #include <sycl/detail/core.hpp>
 #include <sycl/detail/info_desc_helpers.hpp>
 #include <sycl/kernel.hpp>
diff --git a/sycl/test-e2e/FilterSelector/Inputs/filter_list_queries.cpp b/sycl/test-e2e/FilterSelector/Inputs/filter_list_queries.cpp
index b3812cb0b96ef..90005e3bd2799 100644
--- a/sycl/test-e2e/FilterSelector/Inputs/filter_list_queries.cpp
+++ b/sycl/test-e2e/FilterSelector/Inputs/filter_list_queries.cpp
@@ -17,7 +17,6 @@ int main() {
   std::map<info::device_type, std::string> m = {
       {info::device_type::cpu, "cpu"},
       {info::device_type::gpu, "gpu"},
-      {info::device_type::accelerator, "acc"},
       {info::device_type::host, "host"},
       {info::device_type::all, "all"}};
 
diff --git a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu.cpp b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu.cpp
new file mode 100644
index 0000000000000..63fa05bc00738
--- /dev/null
+++ b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu.cpp
@@ -0,0 +1,24 @@
+//==------------------ filter_list_cpu_gpu.cpp ------------------------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===---------------------------------------------------------------------===//
+
+// REQUIRES: any-device-is-cpu, any-device-is-gpu
+
+// RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out
+
+// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
+// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
+// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-GPU-CPU
+//
+// CHECK-GPU-ONLY: Device: gpu
+// CHECK-GPU-ONLY-NOT: Device: cpu
+//
+// CHECK-CPU-ONLY: Device: cpu
+// CHECK-CPU-ONLY-NOT: Device: gpu
+//
+// CHECK-GPU-CPU: Device: gpu
+// CHECK-GPU-CPU-DAG: Device: cpu
diff --git a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp
deleted file mode 100644
index 5e9022054cb33..0000000000000
--- a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//==------------------ filter_list_cpu_gpu_acc.cpp ------------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===---------------------------------------------------------------------===//
-
-// REQUIRES: cpu, gpu, accelerator
-
-// RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out
-
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
-//
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga,cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU
-//
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu,fpga,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
-//
-// CHECK-ACC-ONLY: Device: acc
-// CHECK-ACC-ONLY-NOT: Device: cpu
-// CHECK-ACC-ONLY-NOT: Device: gpu
-//
-// CHECK-GPU-ONLY-NOT: Device: acc
-// CHECK-GPU-ONLY: Device: gpu
-// CHECK-GPU-ONLY-NOT: Device: cpu
-//
-// CHECK-CPU-ONLY-NOT: Device: acc
-// CHECK-CPU-ONLY: Device: cpu
-// CHECK-CPU-ONLY-NOT: Device: gpu
-//
-// CHECK-ACC-GPU: Device: acc
-// CHECK-ACC-GPU-NEXT: Device: gpu
-// CHECK-ACC-GPU-NOT: Device: cpu
-//
-// CHECK-ACC-CPU: Device: acc
-// CHECK-ACC-CPU-NEXT: Device: cpu
-// CHECK-ACC-CPU-NOT: Device: gpu
-//
-// CHECK-ACC-GPU-CPU: Device: acc
-// CHECK-ACC-GPU-CPU-DAG: Device: gpu
-// CHECK-ACC-GPU-CPU-DAG: Device: cpu
diff --git a/sycl/test-e2e/FilterSelector/select.cpp b/sycl/test-e2e/FilterSelector/select.cpp
index 81d57dc793028..96e8558ef6902 100644
--- a/sycl/test-e2e/FilterSelector/select.cpp
+++ b/sycl/test-e2e/FilterSelector/select.cpp
@@ -22,12 +22,10 @@ using namespace sycl::ext::oneapi;
 int main() {
   std::vector<device> CPUs;
   std::vector<device> GPUs;
-  std::vector<device> Accels;
   std::vector<device> Devs;
 
   CPUs = device::get_devices(sycl::info::device_type::cpu);
   GPUs = device::get_devices(sycl::info::device_type::gpu);
-  Accels = device::get_devices(sycl::info::device_type::accelerator);
   Devs = device::get_devices();
 
   bool HasLevelZeroDevices = false;
@@ -170,11 +168,6 @@ int main() {
            "filter_selector(\"cuda:gpu\") failed");
   }
 
-  if (!Accels.empty()) {
-    device d18(filter_selector("accelerator"));
-    assert(d18.is_accelerator() && "filter_selector(\"accelerator\") failed");
-  }
-
   if (HasHIPDevices) {
     device d19(ext::oneapi::filter_selector("hip"));
     assert(d19.get_platform().get_backend() == backend::ext_oneapi_hip &&
diff --git a/sycl/test-e2e/FilterSelector/select_device.cpp b/sycl/test-e2e/FilterSelector/select_device.cpp
index 284c613a2455a..2af253496c71a 100644
--- a/sycl/test-e2e/FilterSelector/select_device.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device.cpp
@@ -4,14 +4,16 @@
 // RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR='*:cpu;level_zero:gpu' %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run-unfiltered-devices} %t.out
 //
 // Checks if only specified device types can be acquired from select_device
 // when ONEAPI_DEVICE_SELECTOR is set
 // Checks that no device is selected when no device of desired type is
 // available.
 //
-// REQUIRES: cpu,gpu,accelerator
+// REQUIRES: any-device-is-cpu, any-device-is-gpu
+
+// XFAIL: linux
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/00000
 
 #include <iostream>
 
@@ -44,10 +46,6 @@ int main() {
       forcedPIs.find("cpu") != std::string::npos) {
     device d(cpu_selector_v);
   }
-  if (!envVal.empty() || forcedPIs == "*" ||
-      forcedPIs.find("fpga") != std::string::npos) {
-    device d(accelerator_selector_v);
-  }
   if (envVal.empty() && (forcedPIs.find("cpu") == std::string::npos &&
                          forcedPIs.find("opencl") == std::string::npos &&
                          forcedPIs.find("*") == std::string::npos)) {
diff --git a/sycl/test-e2e/FilterSelector/select_device_acc.cpp b/sycl/test-e2e/FilterSelector/select_device_acc.cpp
deleted file mode 100644
index 4a948c0142ddf..0000000000000
--- a/sycl/test-e2e/FilterSelector/select_device_acc.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// RUN: %{build} -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='*:fpga' %{run-unfiltered-devices} %t.out
-//
-// Checks if only specified device types can be acquired from select_device
-// when ONEAPI_DEVICE_SELECTOR is set
-// Checks that no device is selected when no device of desired type is
-// available.
-//
-// REQUIRES: opencl,accelerator
-
-#include <iostream>
-
-#include "../helpers.hpp"
-#include <sycl/detail/core.hpp>
-#include <sycl/platform.hpp>
-
-using namespace sycl;
-using namespace std;
-
-int main() {
-  std::string envVal = env::getVal("ONEAPI_DEVICE_SELECTOR");
-  std::string forcedPIs;
-  if (envVal.empty()) {
-    forcedPIs = envVal;
-  }
-  {
-    device d(default_selector_v);
-    string name = d.get_platform().get_info<info::platform::name>();
-    assert(name.find("OpenCL") != string::npos &&
-           "default selector failed to find acc device");
-  }
-  {
-    try {
-      device d(gpu_selector_v);
-      std::cerr << "GPU Device is found in error: " << std::boolalpha
-                << d.is_gpu() << std::endl;
-      return -1;
-    } catch (...) {
-    }
-  }
-  {
-    try {
-      device d(cpu_selector_v);
-      std::cerr << "CPU Device is found in error: " << std::boolalpha
-                << d.is_cpu() << std::endl;
-      return -1;
-    } catch (...) {
-    }
-  }
-  {
-    device d(accelerator_selector_v);
-    string name = d.get_platform().get_info<info::platform::name>();
-    assert(name.find("OpenCL") != string::npos &&
-           "accelerator_selector failed to find acc device");
-  }
-
-  return 0;
-}
diff --git a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp
index 5bce070269ab0..f26b74fe02641 100644
--- a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp
@@ -39,15 +39,8 @@ int main() {
     } catch (...) {
     }
   }
-  { device d(cpu_selector_v); }
   {
-    try {
-      device d(accelerator_selector_v);
-      std::cerr << "ACC device is found in error: " << d.is_accelerator()
-                << std::endl;
-      return -1;
-    } catch (...) {
-    }
+    device d(cpu_selector_v);
   }
 
   return 0;
diff --git a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp
index 96a4ff333791e..7cbb6243db3d8 100644
--- a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp
@@ -42,14 +42,6 @@ int main() {
     } catch (...) {
     }
   }
-  {
-    try {
-      device d(accelerator_selector_v);
-      cerr << "ACC device is found in error: " << d.is_accelerator()
-           << std::endl;
-    } catch (...) {
-    }
-  }
 
   return 0;
 }
diff --git a/sycl/test-e2e/FilterSelector/select_device_level_zero.cpp b/sycl/test-e2e/FilterSelector/select_device_level_zero.cpp
index da4a832713e85..c577e9ac5024b 100644
--- a/sycl/test-e2e/FilterSelector/select_device_level_zero.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_level_zero.cpp
@@ -41,14 +41,6 @@ int main() {
     } catch (...) {
     }
   }
-  {
-    try {
-      device d(accelerator_selector_v);
-      cerr << "ACC device is found in error: " << d.is_accelerator()
-           << std::endl;
-    } catch (...) {
-    }
-  }
 
   return 0;
 }
diff --git a/sycl/test-e2e/FilterSelector/select_device_opencl.cpp b/sycl/test-e2e/FilterSelector/select_device_opencl.cpp
index dca6ef4178f21..d836f7f4cd2d8 100644
--- a/sycl/test-e2e/FilterSelector/select_device_opencl.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_opencl.cpp
@@ -6,7 +6,7 @@
 // Checks that no device is selected when no device of desired type is
 // available.
 //
-// REQUIRES: opencl,gpu,cpu,accelerator
+// REQUIRES: opencl,gpu,any-device-is-cpu
 
 #include "../helpers.hpp"
 #include <iostream>
@@ -38,9 +38,6 @@ int main() {
   {
     device d(cpu_selector_v);
   }
-  {
-    device d(accelerator_selector_v);
-  }
 
   return 0;
 }
diff --git a/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp b/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp
index 9b84ca07ba270..12cfe5a206136 100644
--- a/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp
+++ b/sycl/test-e2e/Graph/Explicit/spec_constants_handler_api.cpp
@@ -6,11 +6,6 @@
 // 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 %}
 //
 
-// Intended - The following limitation is not restricted to Sycl-Graph
-// but comes from the orignal test : `SpecConstants/2020/handler-api.cpp`
-// FIXME: ACC devices use emulation path, which is not yet supported
-// UNSUPPORTED: accelerator
-
 #define GRAPH_E2E_EXPLICIT
 
 #include "../Inputs/spec_constants_handler_api.cpp"
diff --git a/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp b/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp
index a275bb512e949..63ab65bdae6ac 100644
--- a/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp
+++ b/sycl/test-e2e/Graph/Explicit/spec_constants_kernel_bundle_api.cpp
@@ -8,8 +8,6 @@
 
 // Intended - The following limitation is not restricted to Sycl-Graph
 // but comes from the orignal test : `SpecConstants/2020/kernel-bundle-api.cpp`
-// FIXME: ACC devices use emulation path, which is not yet supported
-// UNSUPPORTED: accelerator
 // UNSUPPORTED: hip
 
 #define GRAPH_E2E_EXPLICIT
diff --git a/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp b/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp
index d70e0375a325f..5a66e5445d4a1 100644
--- a/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp
+++ b/sycl/test-e2e/Graph/RecordReplay/spec_constants_handler_api.cpp
@@ -6,11 +6,6 @@
 // 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 %}
 //
 
-// Intended - The following limitation is not restricted to Sycl-Graph
-// but comes from the orignal test : `SpecConstants/2020/handler-api.cpp`
-// FIXME: ACC devices use emulation path, which is not yet supported
-// UNSUPPORTED: accelerator
-
 #define GRAPH_E2E_RECORD_REPLAY
 
 #include "../Inputs/spec_constants_handler_api.cpp"
diff --git a/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp b/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp
index 328feb7c244d0..195b2bbb81603 100644
--- a/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp
+++ b/sycl/test-e2e/Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp
@@ -8,8 +8,6 @@
 
 // Intended - The following limitation is not restricted to Sycl-Graph
 // but comes from the orignal test : `SpecConstants/2020/kernel-bundle-api.cpp`
-// FIXME: ACC devices use emulation path, which is not yet supported
-// UNSUPPORTED: accelerator
 // UNSUPPORTED: hip
 
 #define GRAPH_E2E_RECORD_REPLAY
diff --git a/sycl/test-e2e/GroupAlgorithm/root_group.cpp b/sycl/test-e2e/GroupAlgorithm/root_group.cpp
index c0614c69d7991..1ca09c788bffb 100644
--- a/sycl/test-e2e/GroupAlgorithm/root_group.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/root_group.cpp
@@ -1,5 +1,5 @@
 // Fails with opencl non-cpu, enable when fixed.
-// XFAIL: (opencl && !cpu && !accelerator)
+// XFAIL: (opencl && !cpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14641
 
 // RUN: %{build} -I . -o %t.out %if target-nvidia %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %}
diff --git a/sycl/test-e2e/KernelCompiler/opencl.cpp b/sycl/test-e2e/KernelCompiler/opencl.cpp
index e8d8cc44368f9..021350f057352 100644
--- a/sycl/test-e2e/KernelCompiler/opencl.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl.cpp
@@ -7,8 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: ocloc && (opencl || level_zero)
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
 
 // -- Test the kernel_compiler with OpenCL source.
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/KernelCompiler/opencl_cache_eviction.cpp b/sycl/test-e2e/KernelCompiler/opencl_cache_eviction.cpp
index 9db50e18eaf1e..1fa37ca9b9311 100644
--- a/sycl/test-e2e/KernelCompiler/opencl_cache_eviction.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl_cache_eviction.cpp
@@ -9,9 +9,6 @@
 // Tests on-disk cache and eviction with kernel_compiler.
 
 // REQUIRES: ocloc && (opencl || level_zero)
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: kernel_compiler is not available for accelerator
-// devices.
 
 // -- Test the kernel_compiler with OpenCL source.
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/KernelCompiler/opencl_multi_device.cpp b/sycl/test-e2e/KernelCompiler/opencl_multi_device.cpp
index e51351c1779af..780655ad24b33 100644
--- a/sycl/test-e2e/KernelCompiler/opencl_multi_device.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl_multi_device.cpp
@@ -7,8 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: (opencl || level_zero) && ocloc
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
 
 // RUN: %{build} -o %t.out
 // RUN: env NEOReadDebugKeys=1 CreateMultipleRootDevices=3 %{run} %t.out
diff --git a/sycl/test-e2e/KernelCompiler/sycl.cpp b/sycl/test-e2e/KernelCompiler/sycl.cpp
index fac041254778a..3095d570be946 100644
--- a/sycl/test-e2e/KernelCompiler/sycl.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_basic.cpp b/sycl/test-e2e/KernelCompiler/sycl_basic.cpp
index 5c212ee0d843d..5832d5ff50685 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_basic.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_basic.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_cache.cpp b/sycl/test-e2e/KernelCompiler/sycl_cache.cpp
index 1ec2f744b632d..405d97ce15e96 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_cache.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_cache.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // DEFINE: %{cache_vars} = env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=7 SYCL_CACHE_DIR=%t/cache_dir
 // DEFINE: %{max_cache_size} = SYCL_CACHE_MAX_SIZE=30000
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp b/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp
index c449c25647414..83b6f425ec308 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test the kernel_compiler with SYCL source.
 // RUN: %{build} -o %t.out
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_context_error.cpp b/sycl/test-e2e/KernelCompiler/sycl_context_error.cpp
index d111e77960e48..e72c733fdbf9f 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_context_error.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_context_error.cpp
@@ -8,9 +8,6 @@
 
 // REQUIRES: (opencl || level_zero)
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp b/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp
index ceda7252369e5..2296aba1d9504 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp
@@ -9,8 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator, opencl && gpu
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
 // UNSUPPORTED: opencl && gpu
 // UNSUPPORTED-TRACKER: GSD-4287
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_export_registration.cpp b/sycl/test-e2e/KernelCompiler/sycl_export_registration.cpp
index 789bab6223546..410f4f3e8d753 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_export_registration.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_export_registration.cpp
@@ -8,9 +8,6 @@
 
 // REQUIRES: (opencl || level_zero)
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test for a case where a kernel bundle is built that exports a symbol and
 // -- other kernel bundles that uses it are compiled/linked without it. These
 // -- cases should fail due to unresolved symbols, rather than picking up the
diff --git a/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp b/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp
index bf0d46b5800be..0cc50413dbad4 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_include_paths.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out %S | FileCheck %s --check-prefixes=CHECK,CHECK-NOCWD
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_join.cpp b/sycl/test-e2e/KernelCompiler/sycl_join.cpp
index 4ec0ec5c35604..33cf81dd6bdcb 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_join.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_join.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_shared_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 // RUN: %{l0_leak_check} %{run} %t.out
diff --git a/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp b/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp
index 4ef1cb2d88e9c..94864926af4c4 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_lifetimes.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: env SYCL_UR_TRACE=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_link.cpp b/sycl/test-e2e/KernelCompiler/sycl_link.cpp
index 9ff9878e387ee..7187488d0f0dc 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_link.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_link.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_shared_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test for a simple linking case with source files compiled from SYCL source
 // -- at runtime.
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_link_common_dep.cpp b/sycl/test-e2e/KernelCompiler/sycl_link_common_dep.cpp
index 49d67205b8cd1..b1d66710c2fa2 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_link_common_dep.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_link_common_dep.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_shared_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test for linking where two kernels use the same imported symbols.
 
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/KernelCompiler/sycl_link_common_dep_optional_feature.cpp b/sycl/test-e2e/KernelCompiler/sycl_link_common_dep_optional_feature.cpp
index 76fe85ce72fa9..4976a9066bc3e 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_link_common_dep_optional_feature.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_link_common_dep_optional_feature.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_shared_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test for linking where two kernels use the same imported symbols, but one
 // -- may not be supported on the device.
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_link_export_conflict.cpp b/sycl/test-e2e/KernelCompiler/sycl_link_export_conflict.cpp
index f9d6381e08b38..4f81eeb684fe4 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_link_export_conflict.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_link_export_conflict.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_shared_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test for a case where a kernel bundle with an exported symbol is compiled
 // -- before another kernel bundle using a different variant of the symbol.
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_link_kernel_conflict.cpp b/sycl/test-e2e/KernelCompiler/sycl_link_kernel_conflict.cpp
index 7fe9b0fd9db79..41b8c99c137a3 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_link_kernel_conflict.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_link_kernel_conflict.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_shared_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // -- Test for the linking of two kernels with conflicting definitions of
 // -- kernels with the same name.
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp b/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp
index fbe2a75daf617..89ad5f5e67c40 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_namespaces.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_overload.cpp b/sycl/test-e2e/KernelCompiler/sycl_overload.cpp
index 97488d880993b..2e7b5fee432a5 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_overload.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_overload.cpp
@@ -9,9 +9,6 @@
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
 
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
-
 // RUN: %{build} -o %t.out
 // RUN: %{l0_leak_check} %{run} %t.out
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp b/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp
index 77a2d89bed123..492e755bbad99 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_time_trace.cpp
@@ -7,8 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: (opencl || level_zero)
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-INTENDED: SYCL-RTC is not available for accelerator devices
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
diff --git a/sycl/test-e2e/NewOffloadDriver/lit.local.cfg b/sycl/test-e2e/NewOffloadDriver/lit.local.cfg
index 892e3cddea99e..dadf78f2122ec 100644
--- a/sycl/test-e2e/NewOffloadDriver/lit.local.cfg
+++ b/sycl/test-e2e/NewOffloadDriver/lit.local.cfg
@@ -1,7 +1,5 @@
 import platform
 
-config.unsupported_features += ['accelerator']
-
 config.substitutions.append(
     ("%{embed-ir}", "%if target-amd || target-nvidia %{ -fsycl-embed-ir %}")
 )
diff --git a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu.cpp b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu.cpp
new file mode 100644
index 0000000000000..1bc5a4387a3c4
--- /dev/null
+++ b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu.cpp
@@ -0,0 +1,39 @@
+// REQUIRES: any-device-is-cpu, gpu, opencl
+
+// RUN: %{build} -o %t.out
+
+// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
+// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
+
+// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu,gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-CPU
+// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.out | FileCheck %s --check-prefixes=CHECK-GPU-CPU
+
+// CHECK-GPU-ONLY-NOT: Device: cpu
+// CHECK-GPU-ONLY: Device: gpu
+
+// CHECK-CPU-ONLY-NOT: Device: gpu
+// CHECK-CPU-ONLY: Device: cpu
+
+// CHECK-GPU-CPU-DAG: Device: gpu
+// CHECK-GPU-CPU-DAG: Device: cpu
+
+#include <iostream>
+#include <map>
+#include <sycl/detail/core.hpp>
+
+using namespace sycl;
+
+int main() {
+
+  std::map<info::device_type, std::string> m = {
+      {info::device_type::cpu, "cpu"},
+      {info::device_type::gpu, "gpu"},
+      {info::device_type::all, "all"}};
+
+  for (auto &d : device::get_devices()) {
+    std::cout << "Device: " << m[d.get_info<info::device::device_type>()]
+              << std::endl;
+  }
+
+  return 0;
+}
diff --git a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp
index d3019a202526b..1bc5a4387a3c4 100644
--- a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp
+++ b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp
@@ -1,46 +1,21 @@
-// REQUIRES: cpu, gpu, accelerator, opencl
+// REQUIRES: any-device-is-cpu, gpu, opencl
 
 // RUN: %{build} -o %t.out
 
-// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:fpga %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
 
-// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:fpga,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU
-// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:fpga,cpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU
+// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu,gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-CPU
+// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.out | FileCheck %s --check-prefixes=CHECK-GPU-CPU
 
-// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu,fpga,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
-// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
-//
-// CHECK-ACC-ONLY-NOT: Device: cpu
-// CHECK-ACC-ONLY-NOT: Device: gpu
-// CHECK-ACC-ONLY: Device: acc
-
-//
-// CHECK-GPU-ONLY-NOT: Device: acc
 // CHECK-GPU-ONLY-NOT: Device: cpu
 // CHECK-GPU-ONLY: Device: gpu
 
-//
-// CHECK-CPU-ONLY-NOT: Device: acc
 // CHECK-CPU-ONLY-NOT: Device: gpu
 // CHECK-CPU-ONLY: Device: cpu
 
-//
-// CHECK-ACC-GPU-NOT: Device: cpu
-// CHECK-ACC-GPU-DAG: Device: acc
-// CHECK-ACC-GPU-DAG: Device: gpu
-
-//
-// CHECK-ACC-CPU-NOT: Device: gpu
-// CHECK-ACC-CPU-DAG: Device: acc
-// CHECK-ACC-CPU-DAG: Device: cpu
-
-//
-// CHECK-ACC-GPU-CPU-DAG: Device: acc
-// CHECK-ACC-GPU-CPU-DAG: Device: gpu
-// CHECK-ACC-GPU-CPU-DAG: Device: cpu
-//
+// CHECK-GPU-CPU-DAG: Device: gpu
+// CHECK-GPU-CPU-DAG: Device: cpu
 
 #include <iostream>
 #include <map>
@@ -53,7 +28,6 @@ int main() {
   std::map<info::device_type, std::string> m = {
       {info::device_type::cpu, "cpu"},
       {info::device_type::gpu, "gpu"},
-      {info::device_type::accelerator, "acc"},
       {info::device_type::all, "all"}};
 
   for (auto &d : device::get_devices()) {
diff --git a/sycl/test-e2e/OneapiDeviceSelector/cuda_top.cpp b/sycl/test-e2e/OneapiDeviceSelector/cuda_top.cpp
index 3d5c34c13534a..28c62ed3141d9 100644
--- a/sycl/test-e2e/OneapiDeviceSelector/cuda_top.cpp
+++ b/sycl/test-e2e/OneapiDeviceSelector/cuda_top.cpp
@@ -39,15 +39,6 @@ int main() {
       cout << "Expectedly, cpu device is not found." << std::endl;
     }
   }
-  {
-    try {
-      device d(accelerator_selector_v);
-      cerr << "ACC device is found in error: " << d.is_accelerator()
-           << std::endl;
-    } catch (...) {
-      cout << "Expectedly, ACC device is not found." << std::endl;
-    }
-  }
 
   return 0;
 }
diff --git a/sycl/test-e2e/OneapiDeviceSelector/level_zero_top.cpp b/sycl/test-e2e/OneapiDeviceSelector/level_zero_top.cpp
index 2cfa7dda51d4d..8bdb14da04c66 100644
--- a/sycl/test-e2e/OneapiDeviceSelector/level_zero_top.cpp
+++ b/sycl/test-e2e/OneapiDeviceSelector/level_zero_top.cpp
@@ -39,15 +39,6 @@ int main() {
       cout << "Expectedly, cpu device is not found." << std::endl;
     }
   }
-  {
-    try {
-      device d(accelerator_selector_v);
-      cerr << "ACC device is found in error: " << d.is_accelerator()
-           << std::endl;
-    } catch (...) {
-      cout << "Expectedly, ACC device is not found." << std::endl;
-    }
-  }
 
   return 0;
 }
diff --git a/sycl/test-e2e/ProfilingTag/in_order_profiling_queue.cpp b/sycl/test-e2e/ProfilingTag/in_order_profiling_queue.cpp
index 53b193744a80b..8904335a60a04 100644
--- a/sycl/test-e2e/ProfilingTag/in_order_profiling_queue.cpp
+++ b/sycl/test-e2e/ProfilingTag/in_order_profiling_queue.cpp
@@ -21,10 +21,6 @@
 // UNSUPPORTED: cuda
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14053
 
-// FPGA emulator seems to return unexpected start time for the fallback barrier.
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14315
-
 #include "common.hpp"
 
 int main() {
diff --git a/sycl/test-e2e/ProfilingTag/profiling_queue.cpp b/sycl/test-e2e/ProfilingTag/profiling_queue.cpp
index d7c98f06060ad..91a06f4848b1a 100644
--- a/sycl/test-e2e/ProfilingTag/profiling_queue.cpp
+++ b/sycl/test-e2e/ProfilingTag/profiling_queue.cpp
@@ -16,10 +16,6 @@
 // UNSUPPORTED: hip
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/12904
 
-// FPGA emulator seems to return unexpected start time for the fallback barrier.
-// UNSUPPORTED: accelerator
-// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14315
-
 // Flaky on CUDA
 // UNSUPPORTED: cuda
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14053
diff --git a/sycl/test-e2e/Reduction/reduction_utils.hpp b/sycl/test-e2e/Reduction/reduction_utils.hpp
index eba0be4d4f42e..a137326eb5a3c 100644
--- a/sycl/test-e2e/Reduction/reduction_utils.hpp
+++ b/sycl/test-e2e/Reduction/reduction_utils.hpp
@@ -348,13 +348,6 @@ int testInner(queue &Q, OptionalIdentity<T, HasIdentity> Identity, T Init,
     return 0;
   }
 
-  // TODO: Perhaps, this is a _temporary_ fix for CI. The test may run
-  // for too long when the range is big. That is especially bad on ACC.
-  if (GlobalRange.size() > 65536 && Q.get_device().is_accelerator()) {
-    std::cout << " SKIPPED due to risk of timeout in CI" << std::endl;
-    return 0;
-  }
-
   buffer<T, Dims> InBuf(GlobalRange);
   buffer<T, 1> OutBuf(1);
 
diff --git a/sycl/test-e2e/Regression/device_num.cpp b/sycl/test-e2e/Regression/device_num.cpp
index 8e79985de09ea..b548335cba89f 100644
--- a/sycl/test-e2e/Regression/device_num.cpp
+++ b/sycl/test-e2e/Regression/device_num.cpp
@@ -17,9 +17,7 @@ using namespace sycl;
 using namespace std;
 
 const std::map<info::device_type, std::string> DeviceTypeStringMap = {
-    {info::device_type::cpu, "cpu"},
-    {info::device_type::gpu, "gpu"},
-    {info::device_type::accelerator, "acc"}};
+    {info::device_type::cpu, "cpu"}, {info::device_type::gpu, "gpu"}};
 
 const std::map<backend, std::string> BackendStringMap = {
     {backend::opencl, "opencl"},
@@ -108,9 +106,7 @@ int GetPreferredDeviceIndex(const std::vector<device> &devices,
   //   cpu
   //   acc
   const std::map<info::device_type, int> scoreByType = {
-      {info::device_type::cpu, 300},
-      {info::device_type::gpu, 500},
-      {info::device_type::accelerator, 75}};
+      {info::device_type::cpu, 300}, {info::device_type::gpu, 500}};
   int score = -1;
   int index = -1;
   int devCount = devices.size();
@@ -198,15 +194,6 @@ int main() {
     assert(devices[targetDevIndex] == d &&
            "The selected device is not the target device specified.");
   }
-  targetDevIndex =
-      GetPreferredDeviceIndex(devices, info::device_type::accelerator);
-  if (targetDevIndex >= 0) {
-    device d(accelerator_selector_v);
-    std::cout << "accelerator_selector_v selected ";
-    printDeviceType(d);
-    assert(devices[targetDevIndex] == d &&
-           "The selected device is not the target device specified.");
-  }
 
   return 0;
 }
diff --git a/sycl/test-e2e/Regression/get_subgroup_sizes.cpp b/sycl/test-e2e/Regression/get_subgroup_sizes.cpp
index f076d18494244..2020844f653e7 100644
--- a/sycl/test-e2e/Regression/get_subgroup_sizes.cpp
+++ b/sycl/test-e2e/Regression/get_subgroup_sizes.cpp
@@ -1,8 +1,6 @@
-// UNSUPPORTED: accelerator
-// TODO: FPGAs currently report `sub_group_sizes` as non-empty list,
-// despite not having extension `cl_intel_required_subgroup_size`
 // UNSUPPORTED: cuda || hip
-// TODO: Similar issue to FPGAs
+// TODO: CUDA/HIP currently report `sub_group_sizes` as non-empty list,
+// despite not having extension `cl_intel_required_subgroup_size`
 
 // RUN: %{build} -Wno-error=deprecated-declarations -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 48941115da641..2ba68203a6da4 100644
--- a/sycl/test-e2e/Sampler/basic-rw.cpp
+++ b/sycl/test-e2e/Sampler/basic-rw.cpp
@@ -13,10 +13,6 @@
     ONEAPI_DEVICE_SELECTOR=opencl:gpu ./binx.bin
     ONEAPI_DEVICE_SELECTOR=level_zero:gpu ./binx.bin
     ONEAPI_DEVICE_SELECTOR=opencl:cpu ./binx.bin
-
-    ONEAPI_DEVICE_SELECTOR=opencl:fpga ../binx.bin    <--  does not support
-   image operations at this time.
-
 */
 
 #include "common.hpp"
diff --git a/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp b/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp
index 6d32468c8c02a..434fed2206019 100644
--- a/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp
+++ b/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: xptifw, opencl, (cpu || accelerator)
+// REQUIRES: xptifw, opencl, cpu
 // RUN: %build_collector
 // RUN: %{build} -o %t.out
 // RUN: env XPTI_TRACE_ENABLE=1 XPTI_FRAMEWORK_DISPATCHER=%xptifw_dispatcher XPTI_SUBSCRIBERS=%t_collector.dll %{run} %t.out | FileCheck %s
@@ -15,10 +15,7 @@
 int main() {
   bool MismatchFound = false;
 
-  auto selector_v = [](const sycl::device &d) {
-    return std::max(cpu_selector_v(d), accelerator_selector_v(d));
-  };
-  sycl::device Device{selector_v};
+  sycl::device Device{sycl::default_selector_v};
   auto Devices = Device.create_sub_devices<
       sycl::info::partition_property::partition_equally>(2);
 
diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py
index 99d841a49d391..da79466ca5d22 100644
--- a/sycl/test-e2e/lit.cfg.py
+++ b/sycl/test-e2e/lit.cfg.py
@@ -672,7 +672,7 @@ def remove_level_zero_suffix(devices):
 
 
 available_devices = {
-    "opencl": ("cpu", "gpu", "fpga"),
+    "opencl": ("cpu", "gpu"),
     "cuda": "gpu",
     "level_zero": "gpu",
     "hip": "gpu",
@@ -682,10 +682,12 @@ def remove_level_zero_suffix(devices):
     be, dev = d.split(":")
     # Verify platform
     if be not in available_devices:
-        lit_config.error("Unsupported device {}".format(d))
+        config.sycl_devices.remove(d)
+        lit_config.warning("Unsupported device {}".format(d))
     # Verify device from available_devices or accept if contains "arch-"
     if dev not in available_devices[be] and not "arch-" in dev:
-        lit_config.error("Unsupported device {}".format(d))
+        config.sycl_devices.remove(d)
+        lit_config.warning("Unsupported device {}".format(d))
 
 if "cuda:gpu" in config.sycl_devices:
     if "CUDA_PATH" not in os.environ:
@@ -1025,24 +1027,17 @@ def get_sycl_ls_verbose(sycl_device, env):
     sg_sizes = set(dev_sg_sizes[0]).intersection(*dev_sg_sizes)
     lit_config.note("SG sizes for {}: {}".format(sycl_device, ", ".join(sg_sizes)))
 
-    # Currently, for fpga, the architecture reported by sycl-ls will always
-    # be unknown, as there are currently no architectures specified for fpga
-    # in sycl_ext_oneapi_device_architecture. Skip adding architecture features
-    # in this case.
-    if sycl_device == "opencl:fpga":
-        architectures = set()
-    else:
-        lit_config.note(
-            "Architectures for {}: {}".format(sycl_device, ", ".join(architectures))
-        )
-        if len(architectures) != 1 or "unknown" in architectures:
-            if not config.allow_unknown_arch:
-                lit_config.error(
-                    "Cannot detect architecture for {}\nstdout:\n{}\nstderr:\n{}".format(
-                        sycl_device, sycl_ls_sp.stdout, sycl_ls_sp.stderr
-                    )
+    lit_config.note(
+        "Architectures for {}: {}".format(sycl_device, ", ".join(architectures))
+    )
+    if len(architectures) != 1 or "unknown" in architectures:
+        if not config.allow_unknown_arch:
+            lit_config.error(
+                "Cannot detect architecture for {}\nstdout:\n{}\nstderr:\n{}".format(
+                    sycl_device, sycl_ls_sp.stdout, sycl_ls_sp.stderr
                 )
-            architectures = set()
+            )
+        architectures = set()
 
     aspect_features = set("aspect-" + a for a in aspects)
     sg_size_features = set("sg-" + s for s in sg_sizes)
@@ -1070,7 +1065,7 @@ def get_sycl_ls_verbose(sycl_device, env):
     features.update(device_family)
 
     be, dev = sycl_device.split(":")
-    features.add(dev.replace("fpga", "accelerator"))
+    features.add(dev)
     if "v2" in full_name:
         features.add("level_zero_v2_adapter")
     # Use short names for LIT rules.
diff --git a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
index fa6a319a305ff..6565ccd41dcc0 100644
--- a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
+++ b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
@@ -54,7 +54,7 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number and the list below.
 //
-// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 254
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 251
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -157,7 +157,6 @@
 // CHECK-NEXT: Graph/Explicit/interop-level-zero-launch-kernel.cpp
 // CHECK-NEXT: Graph/Explicit/memadvise.cpp
 // CHECK-NEXT: Graph/Explicit/prefetch.cpp
-// CHECK-NEXT: Graph/Explicit/spec_constants_handler_api.cpp
 // CHECK-NEXT: Graph/Explicit/spec_constants_kernel_bundle_api.cpp
 // CHECK-NEXT: Graph/Explicit/work_group_size_prop.cpp
 // CHECK-NEXT: Graph/RecordReplay/buffer_copy_host2target.cpp
@@ -171,7 +170,6 @@
 // CHECK-NEXT: Graph/RecordReplay/interop-level-zero-launch-kernel.cpp
 // CHECK-NEXT: Graph/RecordReplay/memadvise.cpp
 // CHECK-NEXT: Graph/RecordReplay/prefetch.cpp
-// CHECK-NEXT: Graph/RecordReplay/spec_constants_handler_api.cpp
 // CHECK-NEXT: Graph/RecordReplay/spec_constants_kernel_bundle_api.cpp
 // CHECK-NEXT: Graph/RecordReplay/work_group_size_prop.cpp
 // CHECK-NEXT: Graph/UnsupportedDevice/device_query.cpp
@@ -277,7 +275,6 @@
 // CHECK-NEXT: Regression/complex_global_object.cpp
 // CHECK-NEXT: Regression/event_destruction.cpp
 // CHECK-NEXT: Regression/get_subgroup_sizes.cpp
-// CHECK-NEXT: Regression/get_subgroup_sizes.cpp
 // CHECK-NEXT: Regression/invalid_reqd_wg_size_correct_exception.cpp
 // CHECK-NEXT: Regression/kernel_bundle_ignore_sycl_external.cpp
 // CHECK-NEXT: Regression/kernel_bundle_ignore_sycl_external.cpp