diff --git a/SYCL/Basic/access_to_subset.cpp b/SYCL/Basic/access_to_subset.cpp
index 4350eae9d0..231dfea4fa 100644
--- a/SYCL/Basic/access_to_subset.cpp
+++ b/SYCL/Basic/access_to_subset.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/accessor/accessor.cpp b/SYCL/Basic/accessor/accessor.cpp
index 5ca49f0067..dc39eda1bb 100644
--- a/SYCL/Basic/accessor/accessor.cpp
+++ b/SYCL/Basic/accessor/accessor.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
@@ -141,28 +140,26 @@ int main() {
   // Device accessor with 2-dimensional subscript operators.
   {
     sycl::queue Queue;
-    if (!Queue.is_host()) {
-      int array[2][3] = {0};
-      {
-        sycl::range<2> Range(2, 3);
-        sycl::buffer<int, 2> buf((int *)array, Range,
-                                 {sycl::property::buffer::use_host_ptr()});
+    int array[2][3] = {0};
+    {
+      sycl::range<2> Range(2, 3);
+      sycl::buffer<int, 2> buf((int *)array, Range,
+                               {sycl::property::buffer::use_host_ptr()});
 
-        Queue.submit([&](sycl::handler &cgh) {
-          auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
-          cgh.parallel_for<class dim2_subscr>(Range, [=](sycl::item<2> itemID) {
-            acc[itemID.get_id(0)][itemID.get_id(1)] += itemID.get_linear_id();
-          });
+      Queue.submit([&](sycl::handler &cgh) {
+        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        cgh.parallel_for<class dim2_subscr>(Range, [=](sycl::item<2> itemID) {
+          acc[itemID.get_id(0)][itemID.get_id(1)] += itemID.get_linear_id();
         });
-        Queue.wait();
-      }
-      for (int i = 0; i < 2; i++) {
-        for (int j = 0; j < 3; j++) {
-          if (array[i][j] != i * 3 + j) {
-            std::cerr << array[i][j] << " != " << (i * 3 + j) << std::endl;
-            assert(0);
-            return 1;
-          }
+      });
+      Queue.wait();
+    }
+    for (int i = 0; i < 2; i++) {
+      for (int j = 0; j < 3; j++) {
+        if (array[i][j] != i * 3 + j) {
+          std::cerr << array[i][j] << " != " << (i * 3 + j) << std::endl;
+          assert(0);
+          return 1;
         }
       }
     }
@@ -172,52 +169,48 @@ int main() {
   // check compile error
   {
     sycl::queue queue;
-    if (!queue.is_host()) {
-      sycl::range<2> range(1, 1);
-      int Arr[] = {2};
-      {
-        sycl::buffer<int, 1> Buf(Arr, 1);
-        queue.submit([&](sycl::handler &cgh) {
-          auto acc = sycl::accessor<int, 2, sycl::access::mode::atomic,
-                                    sycl::target::local>(range, cgh);
-          cgh.parallel_for<class dim2_subscr_atomic>(
-              sycl::nd_range<2>{range, range}, [=](sycl::nd_item<2>) {
-                sycl::atomic<int, sycl::access::address_space::local_space>
-                    value = acc[0][0];
-              });
-        });
-      }
+    sycl::range<2> range(1, 1);
+    int Arr[] = {2};
+    {
+      sycl::buffer<int, 1> Buf(Arr, 1);
+      queue.submit([&](sycl::handler &cgh) {
+        auto acc = sycl::accessor<int, 2, sycl::access::mode::atomic,
+                                  sycl::target::local>(range, cgh);
+        cgh.parallel_for<class dim2_subscr_atomic>(
+            sycl::nd_range<2>{range, range}, [=](sycl::nd_item<2>) {
+              sycl::atomic<int, sycl::access::address_space::local_space>
+                  value = acc[0][0];
+            });
+      });
     }
   }
 
   // Device accessor with 3-dimensional subscript operators.
   {
     sycl::queue Queue;
-    if (!Queue.is_host()) {
-      int array[2][3][4] = {0};
-      {
-        sycl::range<3> Range(2, 3, 4);
-        sycl::buffer<int, 3> buf((int *)array, Range,
-                                 {sycl::property::buffer::use_host_ptr()});
+    int array[2][3][4] = {0};
+    {
+      sycl::range<3> Range(2, 3, 4);
+      sycl::buffer<int, 3> buf((int *)array, Range,
+                               {sycl::property::buffer::use_host_ptr()});
 
-        Queue.submit([&](sycl::handler &cgh) {
-          auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
-          cgh.parallel_for<class dim3_subscr>(Range, [=](sycl::item<3> itemID) {
-            acc[itemID.get_id(0)][itemID.get_id(1)][itemID.get_id(2)] +=
-                itemID.get_linear_id();
-          });
+      Queue.submit([&](sycl::handler &cgh) {
+        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        cgh.parallel_for<class dim3_subscr>(Range, [=](sycl::item<3> itemID) {
+          acc[itemID.get_id(0)][itemID.get_id(1)][itemID.get_id(2)] +=
+              itemID.get_linear_id();
         });
-        Queue.wait();
-      }
-      for (int i = 0; i < 2; i++) {
-        for (int j = 0; j < 3; j++) {
-          for (int k = 0; k < 4; k++) {
-            int expected = k + 4 * (j + 3 * i);
-            if (array[i][j][k] != expected) {
-              std::cerr << array[i][j][k] << " != " << expected << std::endl;
-              assert(0);
-              return 1;
-            }
+      });
+      Queue.wait();
+    }
+    for (int i = 0; i < 2; i++) {
+      for (int j = 0; j < 3; j++) {
+        for (int k = 0; k < 4; k++) {
+          int expected = k + 4 * (j + 3 * i);
+          if (array[i][j][k] != expected) {
+            std::cerr << array[i][j][k] << " != " << expected << std::endl;
+            assert(0);
+            return 1;
           }
         }
       }
@@ -295,28 +288,26 @@ int main() {
   // Check that accessor is initialized when accessor is wrapped to some class.
   {
     sycl::queue queue;
-    if (!queue.is_host()) {
-      int array[10] = {0};
-      {
-        sycl::buffer<int, 1> buf((int *)array, sycl::range<1>(10),
-                                 {sycl::property::buffer::use_host_ptr()});
-        queue.submit([&](sycl::handler &cgh) {
-          auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
-          auto acc_wrapped = AccWrapper<decltype(acc)>{acc};
-          cgh.parallel_for<class wrapped_access1>(
-              sycl::range<1>(buf.get_count()), [=](sycl::item<1> it) {
-                auto idx = it.get_linear_id();
-                acc_wrapped.accessor[idx] = 333;
-              });
-        });
-        queue.wait();
-      }
-      for (int i = 0; i < 10; i++) {
-        if (array[i] != 333) {
-          std::cerr << array[i] << " != 333" << std::endl;
-          assert(0);
-          return 1;
-        }
+    int array[10] = {0};
+    {
+      sycl::buffer<int, 1> buf((int *)array, sycl::range<1>(10),
+                               {sycl::property::buffer::use_host_ptr()});
+      queue.submit([&](sycl::handler &cgh) {
+        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc_wrapped = AccWrapper<decltype(acc)>{acc};
+        cgh.parallel_for<class wrapped_access1>(
+            sycl::range<1>(buf.get_count()), [=](sycl::item<1> it) {
+              auto idx = it.get_linear_id();
+              acc_wrapped.accessor[idx] = 333;
+            });
+      });
+      queue.wait();
+    }
+    for (int i = 0; i < 10; i++) {
+      if (array[i] != 333) {
+        std::cerr << array[i] << " != 333" << std::endl;
+        assert(0);
+        return 1;
       }
     }
   }
@@ -325,40 +316,38 @@ int main() {
   // initialized in proper way and value is assigned.
   {
     sycl::queue queue;
-    if (!queue.is_host()) {
-      int array1[10] = {0};
-      int array2[10] = {0};
-      {
-        sycl::buffer<int, 1> buf1((int *)array1, sycl::range<1>(10),
-                                  {sycl::property::buffer::use_host_ptr()});
-        sycl::buffer<int, 1> buf2((int *)array2, sycl::range<1>(10),
-                                  {sycl::property::buffer::use_host_ptr()});
-        queue.submit([&](sycl::handler &cgh) {
-          auto acc1 = buf1.get_access<sycl::access::mode::read_write>(cgh);
-          auto acc2 = buf2.get_access<sycl::access::mode::read_write>(cgh);
-          auto acc_wrapped =
-              AccsWrapper<decltype(acc1), decltype(acc2)>{10, acc1, 5, acc2};
-          cgh.parallel_for<class wrapped_access2>(
-              sycl::range<1>(10), [=](sycl::item<1> it) {
-                auto idx = it.get_linear_id();
-                acc_wrapped.accessor1[idx] = 333;
-                acc_wrapped.accessor2[idx] = 777;
-              });
-        });
-        queue.wait();
-      }
+    int array1[10] = {0};
+    int array2[10] = {0};
+    {
+      sycl::buffer<int, 1> buf1((int *)array1, sycl::range<1>(10),
+                                {sycl::property::buffer::use_host_ptr()});
+      sycl::buffer<int, 1> buf2((int *)array2, sycl::range<1>(10),
+                                {sycl::property::buffer::use_host_ptr()});
+      queue.submit([&](sycl::handler &cgh) {
+        auto acc1 = buf1.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc2 = buf2.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc_wrapped =
+            AccsWrapper<decltype(acc1), decltype(acc2)>{10, acc1, 5, acc2};
+        cgh.parallel_for<class wrapped_access2>(
+            sycl::range<1>(10), [=](sycl::item<1> it) {
+              auto idx = it.get_linear_id();
+              acc_wrapped.accessor1[idx] = 333;
+              acc_wrapped.accessor2[idx] = 777;
+            });
+      });
+      queue.wait();
+    }
+    for (int i = 0; i < 10; i++) {
       for (int i = 0; i < 10; i++) {
-        for (int i = 0; i < 10; i++) {
-          if (array1[i] != 333) {
-            std::cerr << array1[i] << " != 333" << std::endl;
-            assert(0);
-            return 1;
-          }
-          if (array2[i] != 777) {
-            std::cerr << array2[i] << " != 777" << std::endl;
-            assert(0);
-            return 1;
-          }
+        if (array1[i] != 333) {
+          std::cerr << array1[i] << " != 333" << std::endl;
+          assert(0);
+          return 1;
+        }
+        if (array2[i] != 777) {
+          std::cerr << array2[i] << " != 777" << std::endl;
+          assert(0);
+          return 1;
         }
       }
     }
@@ -367,31 +356,29 @@ int main() {
   // Several levels of wrappers for accessor.
   {
     sycl::queue queue;
-    if (!queue.is_host()) {
-      int array[10] = {0};
-      {
-        sycl::buffer<int, 1> buf((int *)array, sycl::range<1>(10),
-                                 {sycl::property::buffer::use_host_ptr()});
-        queue.submit([&](sycl::handler &cgh) {
-          auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
-          auto acc_wrapped = AccWrapper<decltype(acc)>{acc};
-          Wrapper1 wr1;
-          auto wr2 = Wrapper2<decltype(acc)>{wr1, acc_wrapped};
-          auto wr3 = Wrapper3<decltype(acc)>{wr2};
-          cgh.parallel_for<class wrapped_access3>(
-              sycl::range<1>(buf.get_count()), [=](sycl::item<1> it) {
-                auto idx = it.get_linear_id();
-                wr3.w2.wrapped.accessor[idx] = 333;
-              });
-        });
-        queue.wait();
-      }
-      for (int i = 0; i < 10; i++) {
-        if (array[i] != 333) {
-          std::cerr << array[i] << " != 333" << std::endl;
-          assert(0);
-          return 1;
-        }
+    int array[10] = {0};
+    {
+      sycl::buffer<int, 1> buf((int *)array, sycl::range<1>(10),
+                               {sycl::property::buffer::use_host_ptr()});
+      queue.submit([&](sycl::handler &cgh) {
+        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc_wrapped = AccWrapper<decltype(acc)>{acc};
+        Wrapper1 wr1;
+        auto wr2 = Wrapper2<decltype(acc)>{wr1, acc_wrapped};
+        auto wr3 = Wrapper3<decltype(acc)>{wr2};
+        cgh.parallel_for<class wrapped_access3>(
+            sycl::range<1>(buf.get_count()), [=](sycl::item<1> it) {
+              auto idx = it.get_linear_id();
+              wr3.w2.wrapped.accessor[idx] = 333;
+            });
+      });
+      queue.wait();
+    }
+    for (int i = 0; i < 10; i++) {
+      if (array[i] != 333) {
+        std::cerr << array[i] << " != 333" << std::endl;
+        assert(0);
+        return 1;
       }
     }
   }
@@ -563,31 +550,28 @@ int main() {
     sycl::queue q;
     // host device executes kernels via a different method and there
     // is no good way to throw an exception at this time.
-    if (!q.is_host()) {
-      sycl::range<1> r(4);
-      sycl::buffer<int, 1> b(r);
-      try {
-        sycl::accessor<int, 1, sycl::access::mode::read_write,
-                       sycl::access::target::device,
-                       sycl::access::placeholder::true_t>
-            acc(b);
+    sycl::range<1> r(4);
+    sycl::buffer<int, 1> b(r);
+    try {
+      sycl::accessor<int, 1, sycl::access::mode::read_write,
+                     sycl::access::target::device,
+                     sycl::access::placeholder::true_t>
+          acc(b);
 
-        q.submit([&](sycl::handler &cgh) {
-          // we do NOT call .require(acc) without which we should throw a
-          // synchronous exception with errc::kernel_argument
-          cgh.parallel_for<class ph>(
-              r, [=](sycl::id<1> index) { acc[index] = 0; });
-        });
-        q.wait_and_throw();
-        assert(false && "we should not be here, missing exception");
-      } catch (sycl::exception &e) {
-        std::cout << "exception received: " << e.what() << std::endl;
-        assert(e.code() == sycl::errc::kernel_argument &&
-               "incorrect error code");
-      } catch (...) {
-        std::cout << "some other exception" << std::endl;
-        return 1;
-      }
+      q.submit([&](sycl::handler &cgh) {
+        // we do NOT call .require(acc) without which we should throw a
+        // synchronous exception with errc::kernel_argument
+        cgh.parallel_for<class ph>(r,
+                                   [=](sycl::id<1> index) { acc[index] = 0; });
+      });
+      q.wait_and_throw();
+      assert(false && "we should not be here, missing exception");
+    } catch (sycl::exception &e) {
+      std::cout << "exception received: " << e.what() << std::endl;
+      assert(e.code() == sycl::errc::kernel_argument && "incorrect error code");
+    } catch (...) {
+      std::cout << "some other exception" << std::endl;
+      return 1;
     }
   }
 
diff --git a/SYCL/Basic/accessor/device_accessor_deduction.cpp b/SYCL/Basic/accessor/device_accessor_deduction.cpp
index c63102cb00..dd8cc836c3 100644
--- a/SYCL/Basic/accessor/device_accessor_deduction.cpp
+++ b/SYCL/Basic/accessor/device_accessor_deduction.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Daccessor_new_api_test %S/Inputs/device_accessor.cpp -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/accessor/get_device_access_deduction.cpp b/SYCL/Basic/accessor/get_device_access_deduction.cpp
index bf80d9a6c9..6e3fe38f22 100644
--- a/SYCL/Basic/accessor/get_device_access_deduction.cpp
+++ b/SYCL/Basic/accessor/get_device_access_deduction.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Dbuffer_new_api_test %S/Inputs/device_accessor.cpp -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/accessor/get_host_access_deduction.cpp b/SYCL/Basic/accessor/get_host_access_deduction.cpp
index 6588b66575..5767a3389e 100644
--- a/SYCL/Basic/accessor/get_host_access_deduction.cpp
+++ b/SYCL/Basic/accessor/get_host_access_deduction.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Dbuffer_new_api_test %S/Inputs/host_accessor.cpp -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/accessor/get_host_task_access_deduction.cpp b/SYCL/Basic/accessor/get_host_task_access_deduction.cpp
index 6edf230fb5..129d173310 100644
--- a/SYCL/Basic/accessor/get_host_task_access_deduction.cpp
+++ b/SYCL/Basic/accessor/get_host_task_access_deduction.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Dbuffer_new_api_test %S/Inputs/host_task_accessor.cpp -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/accessor/host_accessor_deduction.cpp b/SYCL/Basic/accessor/host_accessor_deduction.cpp
index 680d430a63..6b4b3d17a3 100644
--- a/SYCL/Basic/accessor/host_accessor_deduction.cpp
+++ b/SYCL/Basic/accessor/host_accessor_deduction.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Daccessor_new_api_test %S/Inputs/host_accessor.cpp -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/accessor/host_task_accessor_deduction.cpp b/SYCL/Basic/accessor/host_task_accessor_deduction.cpp
index 059f934a2a..d71b9adf98 100644
--- a/SYCL/Basic/accessor/host_task_accessor_deduction.cpp
+++ b/SYCL/Basic/accessor/host_task_accessor_deduction.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Daccessor_new_api_test %S/Inputs/host_task_accessor.cpp -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/alloc_pinned_host_memory.cpp b/SYCL/Basic/alloc_pinned_host_memory.cpp
index 37ff556a51..0d8a026750 100644
--- a/SYCL/Basic/alloc_pinned_host_memory.cpp
+++ b/SYCL/Basic/alloc_pinned_host_memory.cpp
@@ -2,7 +2,6 @@
 
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
 // RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t2.out 2>&1 %GPU_L0_CHECK_PLACEHOLDER
-// RUN: %HOST_RUN_PLACEHOLDER %t2.out
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
diff --git a/SYCL/Basic/barrier_order.cpp b/SYCL/Basic/barrier_order.cpp
index 207685adbc..1d4d0769ba 100644
--- a/SYCL/Basic/barrier_order.cpp
+++ b/SYCL/Basic/barrier_order.cpp
@@ -1,6 +1,5 @@
 // UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/bit_cast/bit_cast.cpp b/SYCL/Basic/bit_cast/bit_cast.cpp
index 1e0604772c..d6b8ce6002 100644
--- a/SYCL/Basic/bit_cast/bit_cast.cpp
+++ b/SYCL/Basic/bit_cast/bit_cast.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/boolean.cpp b/SYCL/Basic/boolean.cpp
index 7908bd0d42..388ca72103 100644
--- a/SYCL/Basic/boolean.cpp
+++ b/SYCL/Basic/boolean.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/buffer/buffer.cpp b/SYCL/Basic/buffer/buffer.cpp
index 5ced4c9a04..a1fb01c761 100644
--- a/SYCL/Basic/buffer/buffer.cpp
+++ b/SYCL/Basic/buffer/buffer.cpp
@@ -1,7 +1,4 @@
-// RUN: %clangxx %cxx_std_optionc++17 %s -o %t1.out %sycl_options
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
-// RUN: %HOST_RUN_PLACEHOLDER %t2.out
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
diff --git a/SYCL/Basic/buffer/buffer_container.cpp b/SYCL/Basic/buffer/buffer_container.cpp
index e61d6e93b2..d39d619345 100644
--- a/SYCL/Basic/buffer/buffer_container.cpp
+++ b/SYCL/Basic/buffer/buffer_container.cpp
@@ -1,7 +1,4 @@
-// RUN: %clangxx %s %cxx_std_optionc++17 -o %t1.out %sycl_options
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %clangxx %cxx_std_optionc++17 -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
-// RUN: %HOST_RUN_PLACEHOLDER %t2.out
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
diff --git a/SYCL/Basic/buffer/buffer_dev_to_dev.cpp b/SYCL/Basic/buffer/buffer_dev_to_dev.cpp
index c66102be18..b9773412ee 100644
--- a/SYCL/Basic/buffer/buffer_dev_to_dev.cpp
+++ b/SYCL/Basic/buffer/buffer_dev_to_dev.cpp
@@ -1,7 +1,6 @@
 // FIXME flaky fail on HIP
 // UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/buffer/buffer_full_copy.cpp b/SYCL/Basic/buffer/buffer_full_copy.cpp
index 780b05edec..ee41ad02c6 100644
--- a/SYCL/Basic/buffer/buffer_full_copy.cpp
+++ b/SYCL/Basic/buffer/buffer_full_copy.cpp
@@ -1,7 +1,4 @@
-// RUN: %clangxx %cxx_std_optionc++17 %s -o %t1.out %sycl_options
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple  %s -o %t2.out
-// RUN: %HOST_RUN_PLACEHOLDER %t2.out
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
diff --git a/SYCL/Basic/buffer/subbuffer.cpp b/SYCL/Basic/buffer/subbuffer.cpp
index 110f3c612f..4b25afc493 100644
--- a/SYCL/Basic/buffer/subbuffer.cpp
+++ b/SYCL/Basic/buffer/subbuffer.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple  %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/context-with-multiple-devices.cpp b/SYCL/Basic/context-with-multiple-devices.cpp
index 6cc17177ee..861fd45a1f 100644
--- a/SYCL/Basic/context-with-multiple-devices.cpp
+++ b/SYCL/Basic/context-with-multiple-devices.cpp
@@ -20,11 +20,6 @@ int main() {
   auto DeviceList =
       sycl::device::get_devices(sycl::info::device_type::accelerator);
 
-  // remove host device from the list
-  DeviceList.erase(std::remove_if(DeviceList.begin(), DeviceList.end(),
-                                  [](auto Device) { return Device.is_host(); }),
-                   DeviceList.end());
-
   sycl::context Context(DeviceList, &exceptionHandler);
 
   std::vector<sycl::queue> QueueList;
diff --git a/SYCL/Basic/default_device.cpp b/SYCL/Basic/default_device.cpp
index cb13268d18..a87a5449ba 100644
--- a/SYCL/Basic/default_device.cpp
+++ b/SYCL/Basic/default_device.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/default_platform.cpp b/SYCL/Basic/default_platform.cpp
index 89c6606581..14a903693e 100644
--- a/SYCL/Basic/default_platform.cpp
+++ b/SYCL/Basic/default_platform.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/device_equality.cpp b/SYCL/Basic/device_equality.cpp
index 20295a393f..199380af64 100644
--- a/SYCL/Basic/device_equality.cpp
+++ b/SYCL/Basic/device_equality.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 
@@ -37,18 +36,5 @@ int main() {
   assert((dev1 == dev2) && "Device 1 == Device 2");
   assert((plat1 == plat2) && "Platform 1 == Platform 2");
 
-  device h1{host_selector{}};
-  device h2{host_selector{}};
-
-  assert(h1.is_host() && "Device h1 is host");
-  assert(h2.is_host() && "Device h2 is host");
-  assert(h1 == h2 && "Host devices equal each other");
-
-  platform hp1 = h1.get_platform();
-  platform hp2 = h2.get_platform();
-  assert(hp1.is_host() && "Platform hp1 is host");
-  assert(hp2.is_host() && "Platform hp2 is host");
-  assert(hp1 == hp2 && "Host platforms equal each other");
-
   return 0;
 }
diff --git a/SYCL/Basic/device_event.cpp b/SYCL/Basic/device_event.cpp
index c2bfcd5c3f..b2218cba74 100644
--- a/SYCL/Basic/device_event.cpp
+++ b/SYCL/Basic/device_event.cpp
@@ -2,15 +2,11 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.run
 // RUN: %CPU_RUN_PLACEHOLDER %t.run
 // RUN: %ACC_RUN_PLACEHOLDER %t.run
-// TODO: nd_item::barrier() is not implemented on HOST
-// RUNx: %HOST_RUN_PLACEHOLDER %t.run
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DUSE_DEPRECATED_LOCAL_ACC %s -o %t.run
 // RUN: %GPU_RUN_PLACEHOLDER %t.run
 // RUN: %CPU_RUN_PLACEHOLDER %t.run
 // RUN: %ACC_RUN_PLACEHOLDER %t.run
-// TODO: nd_item::barrier() is not implemented on HOST
-// RUNx: %HOST_RUN_PLACEHOLDER %t.run
 //
 // Returns error "Barrier is not supported on the host device
 // yet." with Nvidia.
diff --git a/SYCL/Basic/diagnostics/device-check.cpp b/SYCL/Basic/diagnostics/device-check.cpp
index 0f3dcdc2d8..fa10b0de39 100644
--- a/SYCL/Basic/diagnostics/device-check.cpp
+++ b/SYCL/Basic/diagnostics/device-check.cpp
@@ -2,15 +2,12 @@
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=cpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=gpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=acc %t.out
-// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=host %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=CPU %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=GPU %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=ACC %t.out
-// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=Cpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=Gpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=Acc %t.out
-// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=Host %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_DEVICE_TYPE=XPU %t.out
 
 //==------------------- device-check.cpp --------------------------==//
diff --git a/SYCL/Basic/event.cpp b/SYCL/Basic/event.cpp
index c31dba4665..bfcbfaa333 100644
--- a/SYCL/Basic/event.cpp
+++ b/SYCL/Basic/event.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/event_creation.cpp b/SYCL/Basic/event_creation.cpp
index 3d2234f642..19a001d965 100644
--- a/SYCL/Basic/event_creation.cpp
+++ b/SYCL/Basic/event_creation.cpp
@@ -1,7 +1,6 @@
 // REQUIRES: opencl, opencl_icd
 
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/event_profiling_info.cpp b/SYCL/Basic/event_profiling_info.cpp
index db3d9a1100..23b62da676 100644
--- a/SYCL/Basic/event_profiling_info.cpp
+++ b/SYCL/Basic/event_profiling_info.cpp
@@ -1,6 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 //
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/fpga_tests/fpga_queue.cpp b/SYCL/Basic/fpga_tests/fpga_queue.cpp
index 2366ba4c81..05cd8c4412 100644
--- a/SYCL/Basic/fpga_tests/fpga_queue.cpp
+++ b/SYCL/Basic/fpga_tests/fpga_queue.cpp
@@ -107,9 +107,7 @@ int main() {
     int result = cl_queues.size();
     device dev = Queue.get_device();
     int expected_result =
-        dev.is_host()
-            ? 0
-            : getExpectedQueueNumber(get_native<backend::opencl>(dev), 3);
+        getExpectedQueueNumber(get_native<backend::opencl>(dev), 3);
 
     if (expected_result != result) {
       std::cout << "Result Num of queues = " << result << std::endl
@@ -150,9 +148,7 @@ int main() {
     int result = cl_queues.size();
     device dev = Queue.get_device();
     int expected_result =
-        dev.is_host() ? 0
-                      : getExpectedQueueNumber(get_native<backend::opencl>(dev),
-                                               maxNumQueues);
+        getExpectedQueueNumber(get_native<backend::opencl>(dev), maxNumQueues);
 
     if (expected_result != result) {
       std::cout << "Result Num of queues = " << result << std::endl
diff --git a/SYCL/Basic/fpga_tests/pipes_info.cpp b/SYCL/Basic/fpga_tests/pipes_info.cpp
index 73a6daf487..dcbe4d7411 100644
--- a/SYCL/Basic/fpga_tests/pipes_info.cpp
+++ b/SYCL/Basic/fpga_tests/pipes_info.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/free_function_queries/free_function_queries_sub_group.cpp b/SYCL/Basic/free_function_queries/free_function_queries_sub_group.cpp
index 2f7abfab48..e60f9c12d0 100644
--- a/SYCL/Basic/free_function_queries/free_function_queries_sub_group.cpp
+++ b/SYCL/Basic/free_function_queries/free_function_queries_sub_group.cpp
@@ -4,7 +4,6 @@
 // CUDA and HIP compilation and runtime do not yet support sub-groups.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/get_backend.cpp b/SYCL/Basic/get_backend.cpp
index 7da435a4e9..ed5407d4bc 100644
--- a/SYCL/Basic/get_backend.cpp
+++ b/SYCL/Basic/get_backend.cpp
@@ -20,7 +20,6 @@ bool check(backend be) {
   case backend::ext_oneapi_level_zero:
   case backend::ext_oneapi_cuda:
   case backend::ext_oneapi_hip:
-  case backend::host:
     return true;
   default:
     return false;
@@ -35,34 +34,32 @@ inline void return_fail() {
 
 int main() {
   for (const auto &plt : platform::get_platforms()) {
-    if (!plt.is_host()) {
-      if (check(plt.get_backend()) == false) {
-        return_fail();
-      }
+    if (check(plt.get_backend()) == false) {
+      return_fail();
+    }
 
-      context c(plt);
-      if (c.get_backend() != plt.get_backend()) {
-        return_fail();
-      }
+    context c(plt);
+    if (c.get_backend() != plt.get_backend()) {
+      return_fail();
+    }
 
-      default_selector sel;
-      queue q(c, sel);
-      if (q.get_backend() != plt.get_backend()) {
-        return_fail();
-      }
+    default_selector sel;
+    queue q(c, sel);
+    if (q.get_backend() != plt.get_backend()) {
+      return_fail();
+    }
 
-      auto device = q.get_device();
-      if (device.get_backend() != plt.get_backend()) {
-        return_fail();
-      }
+    auto device = q.get_device();
+    if (device.get_backend() != plt.get_backend()) {
+      return_fail();
+    }
 
-      unsigned char *HostAlloc = (unsigned char *)malloc_host(1, c);
-      auto e = q.memset(HostAlloc, 42, 1);
-      if (e.get_backend() != plt.get_backend()) {
-        return_fail();
-      }
-      free(HostAlloc, c);
+    unsigned char *HostAlloc = (unsigned char *)malloc_host(1, c);
+    auto e = q.memset(HostAlloc, 42, 1);
+    if (e.get_backend() != plt.get_backend()) {
+      return_fail();
     }
+    free(HostAlloc, c);
   }
   std::cout << "Passed" << std::endl;
   return 0;
diff --git a/SYCL/Basic/get_nonhost_devices.cpp b/SYCL/Basic/get_nonhost_devices.cpp
deleted file mode 100644
index ebdfbdc528..0000000000
--- a/SYCL/Basic/get_nonhost_devices.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %BE_RUN_PLACEHOLDER %t.out
-//
-// Check that the host device is not included in devices returned by
-// get_devices() if a non-host device type is specified.
-
-#include <sycl/sycl.hpp>
-
-#include <cassert>
-
-using namespace sycl;
-
-void check(info::device_type DT) {
-  std::vector<device> Devices = device::get_devices(DT);
-  for (const auto &Device : Devices)
-    assert(!Device.is_host());
-}
-
-int main() {
-  check(info::device_type::cpu);
-  check(info::device_type::gpu);
-  check(info::device_type::accelerator);
-  check(info::device_type::custom);
-  check(info::device_type::automatic);
-}
diff --git a/SYCL/Basic/group_async_copy.cpp b/SYCL/Basic/group_async_copy.cpp
index 056774d60d..9ca9bd6c97 100644
--- a/SYCL/Basic/group_async_copy.cpp
+++ b/SYCL/Basic/group_async_copy.cpp
@@ -2,7 +2,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.run
 // RUN: %CPU_RUN_PLACEHOLDER %t.run
 // RUN: %ACC_RUN_PLACEHOLDER %t.run
-// RUN: env SYCL_DEVICE_FILTER=host %t.run
 
 #include <iostream>
 #include <sycl/sycl.hpp>
diff --git a/SYCL/Basic/half_builtins.cpp b/SYCL/Basic/half_builtins.cpp
index f346eab1b6..1ef9cb2da9 100644
--- a/SYCL/Basic/half_builtins.cpp
+++ b/SYCL/Basic/half_builtins.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/half_type.cpp b/SYCL/Basic/half_type.cpp
index 1387948b95..c46649411e 100644
--- a/SYCL/Basic/half_type.cpp
+++ b/SYCL/Basic/half_type.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
@@ -239,7 +238,7 @@ int main() {
   constexpr_verify_div();
 
   device dev{default_selector()};
-  if (!dev.is_host() && !dev.has(sycl::aspect::fp16)) {
+  if (!dev.has(sycl::aspect::fp16)) {
     std::cout << "This device doesn't support the extension cl_khr_fp16"
               << std::endl;
     return 0;
@@ -261,10 +260,6 @@ int main() {
   verify_vec(q);
   verify_numeric_limits(q);
 
-  if (!dev.is_host()) {
-    return 0;
-  }
-
   // Basic tests: fp32->fp16
   // The following references are from `_cvtss_sh` with truncate mode.
   // +inf
diff --git a/SYCL/Basic/handler/handler_copy_with_offset.cpp b/SYCL/Basic/handler/handler_copy_with_offset.cpp
index 8f1948b28c..f63ad464f2 100644
--- a/SYCL/Basic/handler/handler_copy_with_offset.cpp
+++ b/SYCL/Basic/handler/handler_copy_with_offset.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/handler/handler_mem_op.cpp b/SYCL/Basic/handler/handler_mem_op.cpp
index e8f8d7730a..9f63401115 100644
--- a/SYCL/Basic/handler/handler_mem_op.cpp
+++ b/SYCL/Basic/handler/handler_mem_op.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/handler/run_on_host_intel.cpp b/SYCL/Basic/handler/run_on_host_intel.cpp
index 34f1b86a04..1b63c811b5 100644
--- a/SYCL/Basic/handler/run_on_host_intel.cpp
+++ b/SYCL/Basic/handler/run_on_host_intel.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 
 //==-- run_on_host_intel.cpp -----------------------------------------------==//
diff --git a/SYCL/Basic/handler/run_on_host_intel2.cpp b/SYCL/Basic/handler/run_on_host_intel2.cpp
index 5aa1a55395..97b9480848 100644
--- a/SYCL/Basic/handler/run_on_host_intel2.cpp
+++ b/SYCL/Basic/handler/run_on_host_intel2.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 
 #include <iostream>
diff --git a/SYCL/Basic/host_platform_avail.cpp b/SYCL/Basic/host_platform_avail.cpp
deleted file mode 100644
index 7f0578a55f..0000000000
--- a/SYCL/Basic/host_platform_avail.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// RUN: %clangxx -fsycl %s -o %t1.out
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
-// RUN: %CPU_RUN_PLACEHOLDER %t1.out
-// RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// RUN: env SYCL_DEVICE_FILTER=acc,host %t1.out
-
-// Temporarily disable on L0 due to fails in CI
-// UNSUPPORTED: level_zero
-
-//==------ host_platform_avail.cpp - Host Platform Availability test -------==//
-//
-// 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 <sycl/sycl.hpp>
-
-using namespace sycl;
-
-int main() {
-  auto plats = platform::get_platforms();
-  bool found_host = false;
-
-  // Look for a host platform
-  for (const auto &plat : plats) {
-    if (plat.is_host()) {
-      found_host = true;
-    }
-  }
-
-  // Fail if we didn't find a host platform
-  return (!found_host);
-}
diff --git a/SYCL/Basic/image/image.cpp b/SYCL/Basic/image/image.cpp
index e9aaa8ddb6..8180d4e6f8 100644
--- a/SYCL/Basic/image/image.cpp
+++ b/SYCL/Basic/image/image.cpp
@@ -1,6 +1,5 @@
 // UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_accessor_range.cpp b/SYCL/Basic/image/image_accessor_range.cpp
index a92640d820..92d43b7d17 100755
--- a/SYCL/Basic/image/image_accessor_range.cpp
+++ b/SYCL/Basic/image/image_accessor_range.cpp
@@ -5,7 +5,6 @@
 // CUDA does not support SYCL 1.2.1 images.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_accessor_readsampler.cpp b/SYCL/Basic/image/image_accessor_readsampler.cpp
index 02b1964c1b..6470ea1d64 100644
--- a/SYCL/Basic/image/image_accessor_readsampler.cpp
+++ b/SYCL/Basic/image/image_accessor_readsampler.cpp
@@ -3,7 +3,6 @@
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/Basic/image/image_accessor_readwrite.cpp b/SYCL/Basic/image/image_accessor_readwrite.cpp
index 1f765e8b4d..10a6653eb1 100644
--- a/SYCL/Basic/image/image_accessor_readwrite.cpp
+++ b/SYCL/Basic/image/image_accessor_readwrite.cpp
@@ -2,7 +2,6 @@
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_accessor_readwrite_half.cpp b/SYCL/Basic/image/image_accessor_readwrite_half.cpp
index fe0499c735..305e6d03bf 100644
--- a/SYCL/Basic/image/image_accessor_readwrite_half.cpp
+++ b/SYCL/Basic/image/image_accessor_readwrite_half.cpp
@@ -2,7 +2,6 @@
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
@@ -148,7 +147,7 @@ int main() {
   // Checking if default selected device supports half datatype.
   // Same device will be selected in the write/read functions.
   s::device Dev{s::default_selector()};
-  if (!Dev.is_host() && !Dev.has(sycl::aspect::fp16)) {
+  if (!Dev.has(sycl::aspect::fp16)) {
     std::cout << "This device doesn't support the extension cl_khr_fp16"
               << std::endl;
     return 0;
diff --git a/SYCL/Basic/image/image_array.cpp b/SYCL/Basic/image/image_array.cpp
index dc6c541d70..0e12d3e2d5 100644
--- a/SYCL/Basic/image/image_array.cpp
+++ b/SYCL/Basic/image/image_array.cpp
@@ -2,7 +2,6 @@
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUNx: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUNx: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_constructors.cpp b/SYCL/Basic/image/image_constructors.cpp
index a953126a73..d2dcc53726 100644
--- a/SYCL/Basic/image/image_constructors.cpp
+++ b/SYCL/Basic/image/image_constructors.cpp
@@ -1,7 +1,4 @@
-// RUN: %clangxx %s %cxx_std_optionc++17 -o %t1.out %sycl_options
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
-// RUN: %HOST_RUN_PLACEHOLDER %t2.out
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
diff --git a/SYCL/Basic/image/image_max_size.cpp b/SYCL/Basic/image/image_max_size.cpp
index e8f598ee1f..6d44181eed 100644
--- a/SYCL/Basic/image/image_max_size.cpp
+++ b/SYCL/Basic/image/image_max_size.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
@@ -125,16 +124,6 @@ int main() {
   std::cout << "3d: Max image height: " << MaxHeight3D << std::endl;
   std::cout << "3d: Max image depth: " << MaxDepth3D << std::endl;
 
-  // For HOST the max image size may be huge, limit it to some reasonably big
-  // number here, e.g. the max sizes for opencl:gpu on UHD Graphics 630.
-  if (Q.is_host()) {
-    MaxWidth2D = 16 * 1024;
-    MaxHeight2D = 16 * 1024;
-    MaxWidth3D = 16 * 1024;
-    MaxHeight3D = 16 * 1024;
-    MaxDepth3D = 16 * 1024;
-  }
-
   // Using max sizes in one image may require too much memory.
   // Check them one by one.
   NumErrors += test2D(Q, MaxWidth2D, 2);
diff --git a/SYCL/Basic/image/image_read.cpp b/SYCL/Basic/image/image_read.cpp
index f76b891297..1edb1ca3f9 100644
--- a/SYCL/Basic/image/image_read.cpp
+++ b/SYCL/Basic/image/image_read.cpp
@@ -1,6 +1,5 @@
 // UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_read_fp16.cpp b/SYCL/Basic/image/image_read_fp16.cpp
index 2d415d2c6d..a40b31bedb 100644
--- a/SYCL/Basic/image/image_read_fp16.cpp
+++ b/SYCL/Basic/image/image_read_fp16.cpp
@@ -1,6 +1,5 @@
 // UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_write.cpp b/SYCL/Basic/image/image_write.cpp
index 3f4aa66d7f..852fa13a17 100644
--- a/SYCL/Basic/image/image_write.cpp
+++ b/SYCL/Basic/image/image_write.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/image/image_write_fp16.cpp b/SYCL/Basic/image/image_write_fp16.cpp
index 6b9458cfdf..091782a8d8 100644
--- a/SYCL/Basic/image/image_write_fp16.cpp
+++ b/SYCL/Basic/image/image_write_fp16.cpp
@@ -1,6 +1,5 @@
 // UNSUPPORTED: hip || cuda
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/info.cpp b/SYCL/Basic/info.cpp
index b18f4c2100..642c7cbb5a 100644
--- a/SYCL/Basic/info.cpp
+++ b/SYCL/Basic/info.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
@@ -59,8 +58,6 @@ template <> std::string info_to_string(info::device_type info) {
     return "custom";
   case info::device_type::automatic:
     return "automatic";
-  case info::device_type::host:
-    return "host";
   case info::device_type::all:
     return "all";
   default:
@@ -165,16 +162,10 @@ template <> std::string info_to_string(info::partition_affinity_domain info) {
 }
 
 template <> std::string info_to_string(platform info) {
-  if (info.is_host()) {
-    return "SYCL host platform";
-  }
   return "SYCL OpenCL platform";
 }
 
 template <> std::string info_to_string(device info) {
-  if (info.is_host()) {
-    return "SYCL host device";
-  }
   return "SYCL OpenCL device";
 }
 
@@ -344,15 +335,11 @@ int main() {
                                                        "Printf buffer size");
   print_info<info::device::preferred_interop_user_sync, bool>(
       dev, "Preferred interop user sync");
-  // TODO test once subdevice creation is enabled
-  // print_info<info::device::parent_device, device>(dev, "Parent device");
-  if (!dev.is_host()) {
-    try {
-      print_info<info::device::parent_device, device>(dev, "Parent device");
-    } catch (invalid_object_error e) {
-      std::cout << "Expected exception has been caught: " << e.what()
-                << std::endl;
-    }
+  try {
+    print_info<info::device::parent_device, device>(dev, "Parent device");
+  } catch (invalid_object_error e) {
+    std::cout << "Expected exception has been caught: " << e.what()
+              << std::endl;
   }
   print_info<info::device::partition_max_sub_devices, sycl::cl_uint>(
       dev, "Partition max sub devices");
diff --git a/SYCL/Basic/info_ocl_version.cpp b/SYCL/Basic/info_ocl_version.cpp
index e988effe28..23e19affc0 100644
--- a/SYCL/Basic/info_ocl_version.cpp
+++ b/SYCL/Basic/info_ocl_version.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: env %CPU_RUN_PLACEHOLDER %t.out
 // RUN: env %GPU_RUN_PLACEHOLDER %t.out
 // RUN: env %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp
index 3c58aa9111..b7321230a4 100644
--- a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp
+++ b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp
@@ -43,10 +43,6 @@ int main() {
   sycl::queue Q{Ctx, Dev};
   sycl::queue Q2{Ctx2, Dev2};
 
-  // No support for host device so far.
-  if (Q.is_host() || Q2.is_host())
-    return 0;
-
   // The code is needed to just have device images in the executable
   if (0) {
     Q.submit([](sycl::handler &CGH) { CGH.single_task<Kernel1Name>([]() {}); });
diff --git a/SYCL/Basic/linear-sub_group.cpp b/SYCL/Basic/linear-sub_group.cpp
index 1598b3bcba..9b980836b2 100644
--- a/SYCL/Basic/linear-sub_group.cpp
+++ b/SYCL/Basic/linear-sub_group.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/multi_ptr.cpp b/SYCL/Basic/multi_ptr.cpp
index adf34d20b4..59aedd88a9 100644
--- a/SYCL/Basic/multi_ptr.cpp
+++ b/SYCL/Basic/multi_ptr.cpp
@@ -1,10 +1,8 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 // RUN: %clangxx -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t1.out
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/Basic/multisource.cpp b/SYCL/Basic/multisource.cpp
index 534162d08b..ddf486eb4c 100644
--- a/SYCL/Basic/multisource.cpp
+++ b/SYCL/Basic/multisource.cpp
@@ -10,7 +10,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.kernel.o %s -DINIT_KERNEL -DCALC_KERNEL
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.main.o %s -DMAIN_APP
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.kernel.o %t.main.o -o %t.fat
-// RUN: %HOST_RUN_PLACEHOLDER %t.fat
 // RUN: %CPU_RUN_PLACEHOLDER %t.fat
 // RUN: %GPU_RUN_PLACEHOLDER %t.fat
 // RUN: %ACC_RUN_PLACEHOLDER %t.fat
@@ -20,7 +19,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.calc.o %s -DCALC_KERNEL
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.main.o %s -DMAIN_APP
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.init.o %t.calc.o %t.main.o -o %t.fat
-// RUN: %HOST_RUN_PLACEHOLDER %t.fat
 // RUN: %CPU_RUN_PLACEHOLDER %t.fat
 // RUN: %GPU_RUN_PLACEHOLDER %t.fat
 // RUN: %ACC_RUN_PLACEHOLDER %t.fat
diff --git a/SYCL/Basic/parallel_for_indexers.cpp b/SYCL/Basic/parallel_for_indexers.cpp
index 721836ef09..ab4d391a42 100644
--- a/SYCL/Basic/parallel_for_indexers.cpp
+++ b/SYCL/Basic/parallel_for_indexers.cpp
@@ -1,7 +1,4 @@
-// RUN: %clangxx %cxx_std_optionc++17 %s -o %t1.out %sycl_options -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
-// RUN: %HOST_RUN_PLACEHOLDER %t2.out
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
diff --git a/SYCL/Basic/parallel_for_user_types.cpp b/SYCL/Basic/parallel_for_user_types.cpp
index e078cd1e75..e1cfa66d63 100644
--- a/SYCL/Basic/parallel_for_user_types.cpp
+++ b/SYCL/Basic/parallel_for_user_types.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/queue/queue.cpp b/SYCL/Basic/queue/queue.cpp
index 0187e90c23..e6cb8161d8 100644
--- a/SYCL/Basic/queue/queue.cpp
+++ b/SYCL/Basic/queue/queue.cpp
@@ -16,15 +16,13 @@
 using namespace sycl;
 
 std::string get_type(const device &dev) {
-  return ((dev.is_host()) ? "host"
-                          : (dev.is_gpu() ? "OpenCL.GPU" : "OpenCL.CPU"));
+  return dev.is_gpu() ? "OpenCL.GPU" : "OpenCL.CPU";
 }
 
 void print_queue_info(const queue &q) {
   std::cout << "ID=" << std::hex
-            << ((q.get_device().is_host() ||
-                 q.get_context().get_platform().get_backend() !=
-                     sycl::backend::opencl)
+            << ((q.get_context().get_platform().get_backend() !=
+                 sycl::backend::opencl)
                     ? nullptr
                     : sycl::get_native<sycl::backend::opencl>(q))
             << std::endl;
@@ -50,9 +48,7 @@ int main() {
     size_t hash = std::hash<queue>()(Queue);
     queue MovedQueue(std::move(Queue));
     assert(hash == std::hash<queue>()(MovedQueue));
-    assert(deviceA.is_host() == MovedQueue.is_host());
-    if (!deviceA.is_host() &&
-        deviceA.get_platform().get_backend() == sycl::backend::opencl) {
+    if (deviceA.get_platform().get_backend() == sycl::backend::opencl) {
       assert(sycl::get_native<sycl::backend::opencl>(MovedQueue) != nullptr);
     }
   }
@@ -63,9 +59,7 @@ int main() {
     queue WillMovedQueue(deviceB);
     WillMovedQueue = std::move(Queue);
     assert(hash == std::hash<queue>()(WillMovedQueue));
-    assert(deviceA.is_host() == WillMovedQueue.is_host());
-    if (!deviceA.is_host() &&
-        deviceA.get_platform().get_backend() == sycl::backend::opencl) {
+    if (deviceA.get_platform().get_backend() == sycl::backend::opencl) {
       assert(sycl::get_native<sycl::backend::opencl>(WillMovedQueue) !=
              nullptr);
     }
@@ -78,7 +72,6 @@ int main() {
     assert(hash == std::hash<queue>()(Queue));
     assert(hash == std::hash<queue>()(QueueCopy));
     assert(Queue == QueueCopy);
-    assert(Queue.is_host() == QueueCopy.is_host());
   }
   {
     std::cout << "copy assignment operator" << std::endl;
@@ -89,7 +82,6 @@ int main() {
     assert(hash == std::hash<queue>()(Queue));
     assert(hash == std::hash<queue>()(WillQueueCopy));
     assert(Queue == WillQueueCopy);
-    assert(Queue.is_host() == WillQueueCopy.is_host());
   }
 
   {
diff --git a/SYCL/Basic/queue/queue_parallel_for_generic.cpp b/SYCL/Basic/queue/queue_parallel_for_generic.cpp
index e5ef6d2ab3..db32903a50 100644
--- a/SYCL/Basic/queue/queue_parallel_for_generic.cpp
+++ b/SYCL/Basic/queue/queue_parallel_for_generic.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/sampler/sampler.cpp b/SYCL/Basic/sampler/sampler.cpp
index f145f38377..360dc172c6 100644
--- a/SYCL/Basic/sampler/sampler.cpp
+++ b/SYCL/Basic/sampler/sampler.cpp
@@ -1,6 +1,5 @@
 // REQUIRES: opencl
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/scalar_vec_access.cpp b/SYCL/Basic/scalar_vec_access.cpp
index 42d136e1e0..b945db3964 100644
--- a/SYCL/Basic/scalar_vec_access.cpp
+++ b/SYCL/Basic/scalar_vec_access.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
diff --git a/SYCL/Basic/stream/stream.cpp b/SYCL/Basic/stream/stream.cpp
index dcc2fba469..0d3587e65b 100644
--- a/SYCL/Basic/stream/stream.cpp
+++ b/SYCL/Basic/stream/stream.cpp
@@ -1,6 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// FIXME Disabled on host until sporadic failure is fixed
-// RUNx: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
diff --git a/SYCL/Basic/stream/stream_copies_buffer_sync.cpp b/SYCL/Basic/stream/stream_copies_buffer_sync.cpp
index b7e342aa4e..e32d1d7f99 100644
--- a/SYCL/Basic/stream/stream_copies_buffer_sync.cpp
+++ b/SYCL/Basic/stream/stream_copies_buffer_sync.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
diff --git a/SYCL/Basic/stream/stream_max_stmt_exceed.cpp b/SYCL/Basic/stream/stream_max_stmt_exceed.cpp
index 298152321e..f333368246 100644
--- a/SYCL/Basic/stream/stream_max_stmt_exceed.cpp
+++ b/SYCL/Basic/stream/stream_max_stmt_exceed.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
diff --git a/SYCL/Basic/submit_barrier.cpp b/SYCL/Basic/submit_barrier.cpp
index 071072bfa3..815f7105c6 100755
--- a/SYCL/Basic/submit_barrier.cpp
+++ b/SYCL/Basic/submit_barrier.cpp
@@ -1,6 +1,5 @@
 // UNSUPPORTED: hip_amd
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/Basic/swizzle_op.cpp b/SYCL/Basic/swizzle_op.cpp
index 30744add2e..706312b84c 100644
--- a/SYCL/Basic/swizzle_op.cpp
+++ b/SYCL/Basic/swizzle_op.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/sycl-namespace.cpp b/SYCL/Basic/sycl-namespace.cpp
index a034cdf2ca..c06c9b7674 100644
--- a/SYCL/Basic/sycl-namespace.cpp
+++ b/SYCL/Basic/sycl-namespace.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/unused_pointer.cpp b/SYCL/Basic/unused_pointer.cpp
index 4b5c04fb63..50e4eae83a 100644
--- a/SYCL/Basic/unused_pointer.cpp
+++ b/SYCL/Basic/unused_pointer.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Basic/vector_byte.cpp b/SYCL/Basic/vector_byte.cpp
index 260b46ce3b..2e03350590 100644
--- a/SYCL/Basic/vector_byte.cpp
+++ b/SYCL/Basic/vector_byte.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -std=c++17 -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
@@ -297,4 +296,4 @@ int main() {
   }
 
   return 0;
-}
\ No newline at end of file
+}
diff --git a/SYCL/Basic/vector_operators.cpp b/SYCL/Basic/vector_operators.cpp
index 0446aff741..c52f7592b9 100644
--- a/SYCL/Basic/vector_operators.cpp
+++ b/SYCL/Basic/vector_operators.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out