diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_host.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_host.cpp
index 2b8723580d612..2fa7157b07c95 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_host.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_host.cpp
@@ -13,11 +13,11 @@
 #include <sycl/ext/oneapi/bindless_images.hpp>
 #include <sycl/usm.hpp>
 
-class kernel_sampled_fetch;
-
 // Uncomment to print additional test information
 // #define VERBOSE_PRINT
 
+class kernel_sampled_fetch;
+
 int main() {
   sycl::device dev;
   sycl::queue q(dev);
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_shared.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_shared.cpp
index be664ff71a063..30eb4654b94b6 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_shared.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM_shared.cpp
@@ -12,6 +12,9 @@
 #include <sycl/ext/oneapi/bindless_images.hpp>
 #include <sycl/usm.hpp>
 
+// Uncomment to print additional test information
+// #define VERBOSE_PRINT
+
 class kernel_sampled_fetch;
 
 int main() {
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.hpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.hpp
index 550c5f877d256..362fba1472edc 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.hpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.hpp
@@ -2,6 +2,9 @@
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/bindless_images.hpp>
 
+// Uncomment to print additional test information
+// #define VERBOSE_PRINT
+
 class kernel_sampled_fetch;
 
 int test() {
@@ -29,7 +32,7 @@ int test() {
 
   try {
     syclexp::bindless_image_sampler samp(
-        sycl::addressing_mode::repeat,
+        sycl::addressing_mode::clamp,
         sycl::coordinate_normalization_mode::unnormalized,
         sycl::filtering_mode::nearest);
 
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM_device.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM_device.cpp
index 037c18e8d91d6..d9cc5ce49f8a8 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM_device.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM_device.cpp
@@ -11,6 +11,9 @@
 #include <sycl/ext/oneapi/bindless_images.hpp>
 #include <sycl/usm.hpp>
 
+// Uncomment to print additional test information
+// #define VERBOSE_PRINT
+
 namespace {
 
 template <typename T, sycl::image_channel_type ChanType>
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
index 03cbe29944c0b..bd50fdcd6a260 100644
--- a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
+++ b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
@@ -10,6 +10,9 @@
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/bindless_images.hpp>
 
+// Uncomment to print additional test information
+// #define VERBOSE_PRINT
+
 class kernel_sampled_fetch;
 
 int main() {
@@ -44,7 +47,7 @@ int main() {
                                    sycl::image_channel_type::fp32);
 
     syclexp::bindless_image_sampler samp(
-        sycl::addressing_mode::repeat,
+        sycl::addressing_mode::clamp,
         sycl::coordinate_normalization_mode::unnormalized,
         sycl::filtering_mode::nearest);