diff --git a/SYCL/InorderQueue/in_order_buffs_ocl.cpp b/SYCL/InorderQueue/in_order_buffs_ocl.cpp
index 81f8432dae..6fb963d892 100644
--- a/SYCL/InorderQueue/in_order_buffs_ocl.cpp
+++ b/SYCL/InorderQueue/in_order_buffs_ocl.cpp
@@ -36,7 +36,7 @@ int main() {
     bool result = true;
     cl_command_queue cq = get_native<backend::opencl>(Queue);
     device dev = Queue.get_device();
-    bool expected_result = dev.is_host() ? true : isQueueInOrder(cq);
+    bool expected_result = isQueueInOrder(cq);
 
     if (expected_result != result) {
       std::cout << "Resulting queue order is OOO but expected order is inorder"
diff --git a/SYCL/InorderQueue/in_order_dmemll_ocl.cpp b/SYCL/InorderQueue/in_order_dmemll_ocl.cpp
index 5b5cc351d5..0d72f72ad1 100644
--- a/SYCL/InorderQueue/in_order_dmemll_ocl.cpp
+++ b/SYCL/InorderQueue/in_order_dmemll_ocl.cpp
@@ -36,7 +36,7 @@ int main() {
 
   bool result = true;
   cl_command_queue cq = sycl::get_native<backend::opencl>(q);
-  bool expected_result = dev.is_host() ? true : getQueueOrder(cq);
+  bool expected_result = getQueueOrder(cq);
   if (expected_result != result) {
     std::cout << "Resulting queue order is OOO but expected order is inorder"
               << std::endl;
diff --git a/SYCL/InorderQueue/in_order_event_release.cpp b/SYCL/InorderQueue/in_order_event_release.cpp
index f25577c0c6..d4c37a5fd7 100644
--- a/SYCL/InorderQueue/in_order_event_release.cpp
+++ b/SYCL/InorderQueue/in_order_event_release.cpp
@@ -1,6 +1,5 @@
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-unnamed-lambda %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/InorderQueue/in_order_get_property.cpp b/SYCL/InorderQueue/in_order_get_property.cpp
index 1aa814ff29..36265f7884 100644
--- a/SYCL/InorderQueue/in_order_get_property.cpp
+++ b/SYCL/InorderQueue/in_order_get_property.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/InorderQueue/in_order_kernels.cpp b/SYCL/InorderQueue/in_order_kernels.cpp
index db4eeddd6a..8f646b9575 100644
--- a/SYCL/InorderQueue/in_order_kernels.cpp
+++ b/SYCL/InorderQueue/in_order_kernels.cpp
@@ -1,6 +1,5 @@
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-unnamed-lambda %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/InorderQueue/prop.cpp b/SYCL/InorderQueue/prop.cpp
index dc737c4a59..773f7bd373 100644
--- a/SYCL/InorderQueue/prop.cpp
+++ b/SYCL/InorderQueue/prop.cpp
@@ -34,11 +34,11 @@ int CheckQueueOrder(const queue &q) {
   auto dev = q.get_device();
 
   cl_command_queue cq = get_native<backend::opencl>(q);
-  bool expected_result = dev.is_host() ? true : getQueueOrder(cq);
+  bool expected_result = getQueueOrder(cq);
   if (!expected_result)
     return -1;
 
-  expected_result = dev.is_host() ? true : q.is_in_order();
+  expected_result = q.is_in_order();
   if (!expected_result)
     return -2;