diff --git a/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/dynamic.cpp b/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/dynamic.cpp
index c3aecb7c782df..df0d02a0c1e3e 100644
--- a/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/dynamic.cpp
+++ b/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/dynamic.cpp
@@ -3,20 +3,19 @@
 // DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
 // DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
 
-// DEFINE: %{tdir} = %t/..
-// RUN: mkdir -p %{tdir}
-// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/d.cpp                                    -o %{tdir}/libdevice_d.%{dynamic_lib_suffix}
-// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%{tdir}/libdevice_d.lib%} -o %{tdir}/libdevice_c.%{dynamic_lib_suffix}
-// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%{tdir}/libdevice_c.lib%} -o %{tdir}/libdevice_b.%{dynamic_lib_suffix}
-// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%{tdir}/libdevice_b.lib%} -o %{tdir}/libdevice_a.%{dynamic_lib_suffix}
-
-// RUN: %{build} --offload-new-driver -fsycl-allow-device-image-dependencies -I %S/Inputs -o %t.out            \
+// RUN: rm -rf %t.dir; mkdir -p %t.dir
+// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/d.cpp                                    -o %t.dir/libdevice_d.%{dynamic_lib_suffix}
+// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%t.dir/libdevice_d.lib%} -o %t.dir/libdevice_c.%{dynamic_lib_suffix}
+// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%t.dir/libdevice_c.lib%} -o %t.dir/libdevice_b.%{dynamic_lib_suffix}
+// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%t.dir/libdevice_b.lib%} -o %t.dir/libdevice_a.%{dynamic_lib_suffix}
+
+// RUN: %{build} --offload-new-driver -fsycl-allow-device-image-dependencies -I %S/Inputs -o %t.dir/%{t:stem}.out            \
 // RUN: %if windows                                                                       \
-// RUN:   %{%{tdir}/libdevice_a.lib%}                                                          \
+// RUN:   %{%t.dir/libdevice_a.lib%}                                                          \
 // RUN: %else                                                                             \
-// RUN:   %{-L%{tdir} -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%{tdir}%}
+// RUN:   %{-L%t.dir -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%t.dir%}
 
-// RUN: %{run} %t.out
+// RUN: %{run} %t.dir/%{t:stem}.out
 
 // XFAIL: target-native_cpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142
diff --git a/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/singleDynamicLibrary.cpp b/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/singleDynamicLibrary.cpp
index 356af2c2bf97f..f1d8ce73e0b43 100644
--- a/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/singleDynamicLibrary.cpp
+++ b/sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/singleDynamicLibrary.cpp
@@ -1,23 +1,22 @@
 // Test -fsycl-allow-device-image-dependencies with a single dynamic library on
 // Windows and Linux.
 
-// DEFINE: %{tdir} = %t/..
-// RUN: mkdir -p %{tdir}
+// RUN: rm -rf %t.dir; mkdir -p %t.dir
 // RUN: %clangxx --offload-new-driver -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs \
 // RUN:    %S/Inputs/a.cpp                                                              \
 // RUN:    %S/Inputs/b.cpp                                                              \
 // RUN:    %S/Inputs/c.cpp                                                              \
 // RUN:    %S/Inputs/d.cpp                                                              \
 // RUN:    %S/Inputs/wrapper.cpp                                                        \
-// RUN:    -o %if windows %{%{tdir}/device_single.dll%} %else %{%{tdir}/libdevice_single.so%}
+// RUN:    -o %if windows %{%t.dir/device_single.dll%} %else %{%t.dir/libdevice_single.so%}
 
-// RUN: %{build} --offload-new-driver -I%S/Inputs -o %t.out           \
+// RUN: %{build} --offload-new-driver -I%S/Inputs -o %t.dir/%{t:stem}.out           \
 // RUN: %if windows                              \
-// RUN:   %{%{tdir}/device_single.lib%}               \
+// RUN:   %{%t.dir/device_single.lib%}               \
 // RUN: %else                                    \
-// RUN:   %{-L%{tdir} -ldevice_single -Wl,-rpath=%{tdir}%}
+// RUN:   %{-L%t.dir -ldevice_single -Wl,-rpath=%t.dir%}
 
-// RUN: %{run} %t.out
+// RUN: %{run} %t.dir/%{t:stem}.out
 
 // XFAIL: target-native_cpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142
diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic.cpp
index 1a260b47dca62..97d093c39c7c1 100644
--- a/sycl/test-e2e/DeviceImageDependencies/dynamic.cpp
+++ b/sycl/test-e2e/DeviceImageDependencies/dynamic.cpp
@@ -3,20 +3,19 @@
 // DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
 // DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
 
-// DEFINE: %{tdir} = %t/..
-// RUN: mkdir -p %{tdir}
-// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/d.cpp                                    -o %{tdir}/libdevice_d.%{dynamic_lib_suffix}
-// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%{tdir}/libdevice_d.lib%} -o %{tdir}/libdevice_c.%{dynamic_lib_suffix}
-// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%{tdir}/libdevice_c.lib%} -o %{tdir}/libdevice_b.%{dynamic_lib_suffix}
-// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%{tdir}/libdevice_b.lib%} -o %{tdir}/libdevice_a.%{dynamic_lib_suffix}
+// RUN: rm -rf %t.dir; mkdir -p %t.dir
+// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/d.cpp                                    -o %t.dir/libdevice_d.%{dynamic_lib_suffix}
+// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%t.dir/libdevice_d.lib%} -o %t.dir/libdevice_c.%{dynamic_lib_suffix}
+// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%t.dir/libdevice_c.lib%} -o %t.dir/libdevice_b.%{dynamic_lib_suffix}
+// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%t.dir/libdevice_b.lib%} -o %t.dir/libdevice_a.%{dynamic_lib_suffix}
 
-// RUN: %clangxx -fsycl %{sycl_target_opts} -fsycl-allow-device-image-dependencies -fsycl-device-code-split=per_kernel %S/Inputs/basic.cpp -o %t.out            \
+// RUN: %clangxx -fsycl %{sycl_target_opts} -fsycl-allow-device-image-dependencies -fsycl-device-code-split=per_kernel %S/Inputs/basic.cpp -o %t.dir/%{t:stem}.out            \
 // RUN: %if windows                                                                       \
-// RUN:   %{%{tdir}/libdevice_a.lib%}                                                          \
+// RUN:   %{%t.dir/libdevice_a.lib%}                                                          \
 // RUN: %else                                                                             \
-// RUN:   %{-L%{tdir} -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%{tdir}%}
+// RUN:   %{-L%t.dir -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%t.dir%}
 
-// RUN: %{run} %t.out
+// RUN: %{run} %t.dir/%{t:stem}.out
 
 // XFAIL: target-native_cpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142
diff --git a/sycl/test-e2e/DeviceImageDependencies/singleDynamicLibrary.cpp b/sycl/test-e2e/DeviceImageDependencies/singleDynamicLibrary.cpp
index ca5a9e0bcfa9e..02c300f446bff 100644
--- a/sycl/test-e2e/DeviceImageDependencies/singleDynamicLibrary.cpp
+++ b/sycl/test-e2e/DeviceImageDependencies/singleDynamicLibrary.cpp
@@ -1,23 +1,22 @@
 // Test -fsycl-allow-device-image-dependencies with a single dynamic library on Windows
 // and Linux.
 
-// DEFINE: %{tdir} = %t/..
-// RUN: mkdir -p %{tdir}
+// RUN: rm -rf %t.dir; mkdir -p %t.dir
 // RUN: %clangxx -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs \
 // RUN:    %S/Inputs/a.cpp                                                              \
 // RUN:    %S/Inputs/b.cpp                                                              \
 // RUN:    %S/Inputs/c.cpp                                                              \
 // RUN:    %S/Inputs/d.cpp                                                              \
 // RUN:    %S/Inputs/wrapper.cpp                                                        \
-// RUN:    -o %if windows %{%{tdir}/device_single.dll%} %else %{%{tdir}/libdevice_single.so%}
+// RUN:    -o %if windows %{%t.dir/device_single.dll%} %else %{%t.dir/libdevice_single.so%}
 
-// RUN: %{build} -I%S/Inputs -o %t.out           \
+// RUN: %{build} -I%S/Inputs -o %t.dir/%{t:stem}.out           \
 // RUN: %if windows                              \
-// RUN:   %{%{tdir}/device_single.lib%}               \
+// RUN:   %{%t.dir/device_single.lib%}               \
 // RUN: %else                                    \
-// RUN:   %{-L%{tdir} -ldevice_single -Wl,-rpath=%{tdir}%}
+// RUN:   %{-L%t.dir -ldevice_single -Wl,-rpath=%t.dir%}
 
-// RUN: %{run} %t.out
+// RUN: %{run} %t.dir/%{t:stem}.out
 
 // XFAIL: target-native_cpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142