diff --git a/SYCL/SubGroup/barrier.cpp b/SYCL/SubGroup/barrier.cpp
index 050424b359..5334d6633f 100644
--- a/SYCL/SubGroup/barrier.cpp
+++ b/SYCL/SubGroup/barrier.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/SubGroup/broadcast_fp64.cpp b/SYCL/SubGroup/broadcast_fp64.cpp
index 46af65d9e1..a776270690 100644
--- a/SYCL/SubGroup/broadcast_fp64.cpp
+++ b/SYCL/SubGroup/broadcast_fp64.cpp
@@ -15,7 +15,12 @@
 
 int main() {
   queue Queue;
-  check<double>(Queue);
-  std::cout << "Test passed." << std::endl;
+  if (Queue.get_device().has(sycl::aspect::fp64)) {
+    check<double>(Queue);
+    std::cout << "Test passed." << std::endl;
+  } else {
+    std::cout << "Test skipped because device doesn't support aspect::fp64"
+              << std::endl;
+  }
   return 0;
 }
diff --git a/SYCL/SubGroup/load_store.cpp b/SYCL/SubGroup/load_store.cpp
index 9a1ea2a9f0..b73a4c6a88 100644
--- a/SYCL/SubGroup/load_store.cpp
+++ b/SYCL/SubGroup/load_store.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
@@ -262,14 +262,16 @@ int main() {
     check<aligned_ulong, 4>(Queue);
     check<aligned_ulong, 8>(Queue);
     check<aligned_ulong, 16>(Queue);
-    typedef double aligned_double __attribute__((aligned(16)));
-    check<aligned_double>(Queue);
-    check<aligned_double, 1>(Queue);
-    check<aligned_double, 2>(Queue);
-    check<aligned_double, 3>(Queue);
-    check<aligned_double, 4>(Queue);
-    check<aligned_double, 8>(Queue);
-    check<aligned_double, 16>(Queue);
+    if (Queue.get_device().has(sycl::aspect::fp64)) {
+      typedef double aligned_double __attribute__((aligned(16)));
+      check<aligned_double>(Queue);
+      check<aligned_double, 1>(Queue);
+      check<aligned_double, 2>(Queue);
+      check<aligned_double, 3>(Queue);
+      check<aligned_double, 4>(Queue);
+      check<aligned_double, 8>(Queue);
+      check<aligned_double, 16>(Queue);
+    }
   }
   std::cout << "Test passed." << std::endl;
   return 0;
diff --git a/SYCL/SubGroup/shuffle_fp64.cpp b/SYCL/SubGroup/shuffle_fp64.cpp
index cc6baeb6e3..065b5afbac 100644
--- a/SYCL/SubGroup/shuffle_fp64.cpp
+++ b/SYCL/SubGroup/shuffle_fp64.cpp
@@ -16,7 +16,12 @@
 
 int main() {
   queue Queue;
-  check<double>(Queue);
-  std::cout << "Test passed." << std::endl;
+  if (Queue.get_device().has(sycl::aspect::fp64)) {
+    check<double>(Queue);
+    std::cout << "Test passed." << std::endl;
+  } else {
+    std::cout << "Test skipped because device doesn't support aspect::fp64"
+              << std::endl;
+  }
   return 0;
 }