diff --git a/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/math_device_lib.cpp b/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/math_device_lib.cpp
index 2d15fbe761ca3..55e8926121913 100644
--- a/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/math_device_lib.cpp
+++ b/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/math_device_lib.cpp
@@ -2,7 +2,7 @@
 
 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
 
-// RUN: %{build} --offload-new-driver -fsycl-allow-device-image-dependencies -fsycl-device-lib-jit-link %{mathflags} -o %t.out
+// RUN: %{build} --offload-new-driver -fsycl-allow-device-image-dependencies %if target-spir %{ -fsycl-device-lib-jit-link %} %{mathflags} -o %t.out
 // RUN: %{run} %t.out
 
 #include <cmath>
diff --git a/sycl/test-e2e/DeviceImageDependencies/math_device_lib.cpp b/sycl/test-e2e/DeviceImageDependencies/math_device_lib.cpp
index af4d0bec9e825..78ee082012fd8 100644
--- a/sycl/test-e2e/DeviceImageDependencies/math_device_lib.cpp
+++ b/sycl/test-e2e/DeviceImageDependencies/math_device_lib.cpp
@@ -2,7 +2,7 @@
 
 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
 
-// RUN: %{build} -fsycl-allow-device-image-dependencies -fsycl-device-lib-jit-link %{mathflags} -o %t.out
+// RUN: %{build} -fsycl-allow-device-image-dependencies %if target-spir %{ -fsycl-device-lib-jit-link %} %{mathflags} -o %t.out
 // RUN: %{run} %t.out
 
 #include <cmath>
diff --git a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp
index 7469395081c38..6cf273a9edab0 100644
--- a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp
@@ -7,8 +7,8 @@
 // RUN: %{build} %{mathflags} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
-// RUN: %{run} %t2.out
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir %{ %{run} %t2.out %}
 
 #include "math_utils.hpp"
 #include <cmath>
diff --git a/sycl/test-e2e/DeviceLib/cmath_test.cpp b/sycl/test-e2e/DeviceLib/cmath_test.cpp
index f5e3220ae0be3..df6b957e81584 100644
--- a/sycl/test-e2e/DeviceLib/cmath_test.cpp
+++ b/sycl/test-e2e/DeviceLib/cmath_test.cpp
@@ -5,8 +5,8 @@
 // RUN: %{build} -fno-builtin %{mathflags} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -Wno-error=unused-command-line-argument -fno-builtin -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
-// RUN: %if !gpu %{ %{run} %t2.out %}
+// RUN: %if target-spir %{ %{build} -fno-builtin -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir && !gpu %{ %{run} %t2.out %}
 //
 // // Check that --fast-math works with cmath funcs for CUDA
 // RUN: %if target-nvidia %{ %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s -Wno-nan-infinity-disabled -fno-builtin %{mathflags} -o %t3.out -ffast-math -DSYCL_E2E_FASTMATH %}
diff --git a/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp b/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp
index 567b6077bad1a..692f2147e3632 100644
--- a/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp b/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp
index 8ea338442e08f..e089f17b739aa 100644
--- a/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp
@@ -3,7 +3,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t1.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t1.out
 // RUN: %{run} %t1.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_double2half.cpp b/sycl/test-e2e/DeviceLib/imf_double2half.cpp
index cdb751b82254f..0f9eafd5dd569 100644
--- a/sycl/test-e2e/DeviceLib/imf_double2half.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_double2half.cpp
@@ -4,7 +4,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 
 // UNSUPPORTED: target-nvidia, target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp b/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp
index d8c1a3d7d4d69..0467ad9061ab8 100644
--- a/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp
index 12ba40ced5d53..63ba488602e6e 100644
--- a/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp
index 755111d9c0c40..a39d735605875 100644
--- a/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp
index da93d94229fa8..982ad54d4ed2c 100644
--- a/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp
index 0a9725c912947..9876e65b6b4e6 100644
--- a/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp
index 8ebd3b5f0bcd9..e3f192d39b6c5 100644
--- a/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp
@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp b/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp
index 881577618cd93..437be8257190d 100644
--- a/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp
@@ -4,7 +4,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 
 // UNSUPPORTED: target-nvidia, target-amd
diff --git a/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp b/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp
index 0f51c69006b5a..203c8d96966b1 100644
--- a/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
+// RUN: %{build} -fno-builtin %if target-spir %{ -fsycl-device-lib-jit-link %} -o %t2.out
 // RUN: %{run} %t2.out
 //
 // UNSUPPORTED: target-nvidia || target-amd
diff --git a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp
index 1a52b322775ad..c7c9c77aefed9 100644
--- a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp
@@ -7,8 +7,8 @@
 // RUN: %{build} %{mathflags} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t2.out
-// RUN: %if !gpu %{ %{run} %t2.out %}
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir && !gpu %{ %{run} %t2.out %}
 
 #include "math_utils.hpp"
 #include <cstdint>
diff --git a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
index 71e8a43387093..06316e83ac5db 100644
--- a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
@@ -2,11 +2,11 @@
 
 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
 
-// RUN: %{build} %{mathflags} -o %t.out
-// RUN: %{run} %t.out
+// RUN: %{build} %{mathflags} -o %t1.out
+// RUN: %{run} %t1.out
 
-// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t.out
-// RUN: %if !gpu %{ %{run} %t.out %}
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir && !gpu %{ %{run} %t2.out %}
 
 #include "math_utils.hpp"
 #include <iostream>
diff --git a/sycl/test-e2e/DeviceLib/math_test.cpp b/sycl/test-e2e/DeviceLib/math_test.cpp
index 3ddcee36a9b5e..5bd459cf1f381 100644
--- a/sycl/test-e2e/DeviceLib/math_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_test.cpp
@@ -5,8 +5,8 @@
 // RUN: %{build} %{mathflags} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
-// RUN: %if !gpu %{ %{run} %t2.out %}
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir && !gpu %{ %{run} %t2.out %}
 
 #include "math_utils.hpp"
 #include <cstdint>
diff --git a/sycl/test-e2e/DeviceLib/math_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
index ab18cf1abe254..dce740d851c4b 100644
--- a/sycl/test-e2e/DeviceLib/math_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
@@ -4,11 +4,11 @@
 
 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
 
-// RUN: %{build} %{mathflags} -o %t.out
-// RUN: %{run} %t.out
+// RUN: %{build} %{mathflags} -o %t1.out
+// RUN: %{run} %t1.out
 
-// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t.out
-// RUN: %if !gpu %{ %{run} %t.out %}
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir && !gpu %{ %{run} %t2.out %}
 
 #include "math_utils.hpp"
 #include <iostream>
diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp
index b9c4e424d8357..f89bccfe18da6 100644
--- a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp
@@ -4,8 +4,8 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link -o %t2.out
-// RUN: %{run} %t2.out
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link -o %t2.out %}
+// RUN: %if target-spir %{ %{run} %t2.out %}
 
 #include <array>
 #include <cassert>
diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp
index 906b8013cabb7..b650a3b53f43d 100644
--- a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp
+++ b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp
@@ -2,8 +2,8 @@
 // RUN: %{build} %{mathflags} -o %t1.out
 // RUN: %{run} %t1.out
 
-// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
-// RUN: %{run} %t2.out
+// RUN: %if target-spir %{ %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out %}
+// RUN: %if target-spir %{ %{run} %t2.out %}
 
 #include <array>
 #include <cassert>
diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp
index 2b7f2e904c470..96e4439e15f98 100644
--- a/sycl/test-e2e/DeviceLib/string_test.cpp
+++ b/sycl/test-e2e/DeviceLib/string_test.cpp
@@ -1,8 +1,8 @@
 // RUN: %{build} -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -o %t1.out
 // RUN: %{run} %t1.out
 //
-// RUN: %{build} -Wno-error=unused-command-line-argument -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
-// RUN: %if !gpu %{ %{run} %t2.out %}
+// RUN: %if target-spir %{ %{build} -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -fsycl-device-lib-jit-link -o %t2.out %}
+// RUN: %if target-spir && !gpu %{ %{run} %t2.out %}
 
 #include <cassert>
 #include <cstdint>