diff --git a/SYCL/USM/alloc_functions.cpp b/SYCL/USM/alloc_functions.cpp
index e9e4b95312..7d4b2b525b 100644
--- a/SYCL/USM/alloc_functions.cpp
+++ b/SYCL/USM/alloc_functions.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/allocator_container.cpp b/SYCL/USM/allocator_container.cpp
index 8294602569..34898d41e4 100644
--- a/SYCL/USM/allocator_container.cpp
+++ b/SYCL/USM/allocator_container.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/allocator_equal.cpp b/SYCL/USM/allocator_equal.cpp
index c9ed08546c..118177e258 100644
--- a/SYCL/USM/allocator_equal.cpp
+++ b/SYCL/USM/allocator_equal.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/allocator_rebind.cpp b/SYCL/USM/allocator_rebind.cpp
index a9181c6ffc..9cc149cd9b 100644
--- a/SYCL/USM/allocator_rebind.cpp
+++ b/SYCL/USM/allocator_rebind.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/allocator_shared.cpp b/SYCL/USM/allocator_shared.cpp
index f4c53a0ae5..a95fe96ff4 100644
--- a/SYCL/USM/allocator_shared.cpp
+++ b/SYCL/USM/allocator_shared.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/allocator_vector.cpp b/SYCL/USM/allocator_vector.cpp
index e3ddb1a41f..9e4a135cb8 100644
--- a/SYCL/USM/allocator_vector.cpp
+++ b/SYCL/USM/allocator_vector.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/badmalloc.cpp b/SYCL/USM/badmalloc.cpp
index 3b5ddefc3e..079b74ae3c 100644
--- a/SYCL/USM/badmalloc.cpp
+++ b/SYCL/USM/badmalloc.cpp
@@ -1,7 +1,6 @@
 // UNSUPPORTED: windows
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/buffer_location.cpp b/SYCL/USM/buffer_location.cpp
index 33e835c5f0..fecbe5df67 100644
--- a/SYCL/USM/buffer_location.cpp
+++ b/SYCL/USM/buffer_location.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: %ACC_RUN_PLACEHOLDER %t1.out
 
diff --git a/SYCL/USM/copy.cpp b/SYCL/USM/copy.cpp
index 2613326756..00c17f26db 100644
--- a/SYCL/USM/copy.cpp
+++ b/SYCL/USM/copy.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/dep_events.cpp b/SYCL/USM/dep_events.cpp
index 80d61f03de..32890ac76c 100644
--- a/SYCL/USM/dep_events.cpp
+++ b/SYCL/USM/dep_events.cpp
@@ -11,7 +11,6 @@
 // UNSUPPORTED: cuda && windows
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/depends_on.cpp b/SYCL/USM/depends_on.cpp
index 9dc2de9d46..fb43d659b9 100644
--- a/SYCL/USM/depends_on.cpp
+++ b/SYCL/USM/depends_on.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/dmem_varied.cpp b/SYCL/USM/dmem_varied.cpp
index 4d0d04edb4..74b29afef4 100644
--- a/SYCL/USM/dmem_varied.cpp
+++ b/SYCL/USM/dmem_varied.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/dmemll.cpp b/SYCL/USM/dmemll.cpp
index 1266031e7a..a20228b0a1 100644
--- a/SYCL/USM/dmemll.cpp
+++ b/SYCL/USM/dmemll.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/dmemllaligned.cpp b/SYCL/USM/dmemllaligned.cpp
index 19345a3bac..bc3ea581d3 100644
--- a/SYCL/USM/dmemllaligned.cpp
+++ b/SYCL/USM/dmemllaligned.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/fill.cpp b/SYCL/USM/fill.cpp
index c3b96abcad..54cfe76dd1 100644
--- a/SYCL/USM/fill.cpp
+++ b/SYCL/USM/fill.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/free_during_kernel_execution.cpp b/SYCL/USM/free_during_kernel_execution.cpp
index 62c6538f7a..28349395b7 100644
--- a/SYCL/USM/free_during_kernel_execution.cpp
+++ b/SYCL/USM/free_during_kernel_execution.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/hmemll.cpp b/SYCL/USM/hmemll.cpp
index 3b1481c00b..bb93139954 100644
--- a/SYCL/USM/hmemll.cpp
+++ b/SYCL/USM/hmemll.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/hmemllaligned.cpp b/SYCL/USM/hmemllaligned.cpp
index 3a9f4e26d0..b5fe85a0ea 100644
--- a/SYCL/USM/hmemllaligned.cpp
+++ b/SYCL/USM/hmemllaligned.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/math.cpp b/SYCL/USM/math.cpp
index b4201ab20b..a875b4481f 100644
--- a/SYCL/USM/math.cpp
+++ b/SYCL/USM/math.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
 
 // REQUIRES: cpu
diff --git a/SYCL/USM/memadvise.cpp b/SYCL/USM/memadvise.cpp
index 4a3719693c..a8fc44e684 100644
--- a/SYCL/USM/memadvise.cpp
+++ b/SYCL/USM/memadvise.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/memadvise_cuda.cpp b/SYCL/USM/memadvise_cuda.cpp
index 4247f8286e..e5c77a4418 100755
--- a/SYCL/USM/memadvise_cuda.cpp
+++ b/SYCL/USM/memadvise_cuda.cpp
@@ -1,6 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out
 // REQUIRES: cuda
-// 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/USM/memcpy.cpp b/SYCL/USM/memcpy.cpp
index c6afc5b713..940126bb6a 100644
--- a/SYCL/USM/memcpy.cpp
+++ b/SYCL/USM/memcpy.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/memset.cpp b/SYCL/USM/memset.cpp
index f2cd8f54b1..67128fa905 100644
--- a/SYCL/USM/memset.cpp
+++ b/SYCL/USM/memset.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/mixed.cpp b/SYCL/USM/mixed.cpp
index d16c9c87ee..e102499d28 100644
--- a/SYCL/USM/mixed.cpp
+++ b/SYCL/USM/mixed.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/mixed2.cpp b/SYCL/USM/mixed2.cpp
index 70d5ae5c11..88d07bb02a 100644
--- a/SYCL/USM/mixed2.cpp
+++ b/SYCL/USM/mixed2.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/mixed2template.cpp b/SYCL/USM/mixed2template.cpp
index f8f4d10597..b7e65a9469 100644
--- a/SYCL/USM/mixed2template.cpp
+++ b/SYCL/USM/mixed2template.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/mixed_queue.cpp b/SYCL/USM/mixed_queue.cpp
index 4b87cac7d7..d2dcc05513 100644
--- a/SYCL/USM/mixed_queue.cpp
+++ b/SYCL/USM/mixed_queue.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/pfor_flatten.cpp b/SYCL/USM/pfor_flatten.cpp
index b20ca1ed0d..c0f28d9399 100644
--- a/SYCL/USM/pfor_flatten.cpp
+++ b/SYCL/USM/pfor_flatten.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-unnamed-lambda -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/USM/pfor_flatten_range_shortcut.cpp b/SYCL/USM/pfor_flatten_range_shortcut.cpp
index 08f96cccf0..d5e866b213 100644
--- a/SYCL/USM/pfor_flatten_range_shortcut.cpp
+++ b/SYCL/USM/pfor_flatten_range_shortcut.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple  -fsycl-unnamed-lambda %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/USM/pointer_query.cpp b/SYCL/USM/pointer_query.cpp
index 7280406acd..ddefa92138 100644
--- a/SYCL/USM/pointer_query.cpp
+++ b/SYCL/USM/pointer_query.cpp
@@ -1,5 +1,4 @@
 // 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: %ACC_RUN_PLACEHOLDER %t1.out
@@ -36,16 +35,8 @@ int main() {
     return 1;
   }
   Kind = get_pointer_type(array, ctxt);
-  if (ctxt.is_host()) {
-    // for now, host device treats all allocations
-    // as host allocations
-    if (Kind != usm::alloc::host) {
-      return 2;
-    }
-  } else {
-    if (Kind != usm::alloc::device) {
-      return 3;
-    }
+  if (Kind != usm::alloc::device) {
+    return 3;
   }
   device D = get_pointer_device(array, ctxt);
   if (D != dev) {
@@ -59,16 +50,8 @@ int main() {
     return 5;
   }
   Kind = get_pointer_type(array, ctxt);
-  if (ctxt.is_host()) {
-    // for now, host device treats all allocations
-    // as host allocations
-    if (Kind != usm::alloc::host) {
-      return 6;
-    }
-  } else {
-    if (Kind != usm::alloc::shared) {
-      return 7;
-    }
+  if (Kind != usm::alloc::shared) {
+    return 7;
   }
   D = get_pointer_device(array, ctxt);
   if (D != dev) {
@@ -103,22 +86,15 @@ int main() {
   // next checks only valid for non-host contexts
   array = (int *)malloc(N * sizeof(int));
   Kind = get_pointer_type(array, ctxt);
-  if (!ctxt.is_host()) {
-    if (Kind != usm::alloc::unknown) {
-      return 12;
-    }
-    try {
-      D = get_pointer_device(array, ctxt);
-    } catch (runtime_error) {
-      return 0;
-    }
-    return 13;
-  } else {
-    // host ctxts always report host
-    if (Kind != usm::alloc::host) {
-      return 14;
-    }
+  if (Kind != usm::alloc::unknown) {
+    return 12;
+  }
+  try {
+    D = get_pointer_device(array, ctxt);
+  } catch (runtime_error) {
+    return 0;
   }
+  return 13;
   free(array);
 
   return 0;
diff --git a/SYCL/USM/prefetch.cpp b/SYCL/USM/prefetch.cpp
index 19241281cb..4e49f5bd65 100644
--- a/SYCL/USM/prefetch.cpp
+++ b/SYCL/USM/prefetch.cpp
@@ -11,7 +11,6 @@
 // UNSUPPORTED: cuda && windows
 //
 // 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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/queue_wait.cpp b/SYCL/USM/queue_wait.cpp
index 65e0db1982..f121df90cc 100644
--- a/SYCL/USM/queue_wait.cpp
+++ b/SYCL/USM/queue_wait.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/USM/smem_concurrent.cpp b/SYCL/USM/smem_concurrent.cpp
index da9a66a042..d6d267ffab 100644
--- a/SYCL/USM/smem_concurrent.cpp
+++ b/SYCL/USM/smem_concurrent.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/smem_varied.cpp b/SYCL/USM/smem_varied.cpp
index 1ab6648d6a..d939e37e92 100644
--- a/SYCL/USM/smem_varied.cpp
+++ b/SYCL/USM/smem_varied.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out -DTEST_SHARED
-// 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/USM/smemll.cpp b/SYCL/USM/smemll.cpp
index ee52abe06d..ee546fc72c 100644
--- a/SYCL/USM/smemll.cpp
+++ b/SYCL/USM/smemll.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/smemllaligned.cpp b/SYCL/USM/smemllaligned.cpp
index ed381016c5..2a5b819b44 100644
--- a/SYCL/USM/smemllaligned.cpp
+++ b/SYCL/USM/smemllaligned.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
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/usm_pooling.cpp b/SYCL/USM/usm_pooling.cpp
index 921474ac09..45b7142e83 100755
--- a/SYCL/USM/usm_pooling.cpp
+++ b/SYCL/USM/usm_pooling.cpp
@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
   device D = Q.get_device();
   context C = Q.get_context();
 
-  const char *devType = D.is_host() ? "Host" : D.is_cpu() ? "CPU" : "GPU";
+  const char *devType = D.is_cpu() ? "CPU" : "GPU";
   std::string pluginName =
       D.get_platform().get_info<sycl::info::platform::name>();
   std::cout << "Running on device " << devType << " ("