diff --git a/sycl/test-e2e/FilterSelector/select_device_acc.cpp b/sycl/test-e2e/FilterSelector/select_device_acc.cpp
index 0b2250a2cf3bb..4b3db255b0853 100644
--- a/sycl/test-e2e/FilterSelector/select_device_acc.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_acc.cpp
@@ -22,16 +22,14 @@ int main() {
     forcedPIs = envVal;
   }
   {
-    default_selector ds;
-    device d = ds.select_device();
+    device d(default_selector_v);
     string name = d.get_platform().get_info<info::platform::name>();
     assert(name.find("OpenCL") != string::npos &&
            "default selector failed to find acc device");
   }
   {
-    gpu_selector gs;
     try {
-      device d = gs.select_device();
+      device d(gpu_selector_v);
       std::cerr << "GPU Device is found in error: " << std::boolalpha
                 << d.is_gpu() << std::endl;
       return -1;
@@ -39,9 +37,8 @@ int main() {
     }
   }
   {
-    cpu_selector cs;
     try {
-      device d = cs.select_device();
+      device d(cpu_selector_v);
       std::cerr << "CPU Device is found in error: " << std::boolalpha
                 << d.is_cpu() << std::endl;
       return -1;
@@ -49,8 +46,7 @@ int main() {
     }
   }
   {
-    accelerator_selector as;
-    device d = as.select_device();
+    device d(accelerator_selector_v);
     string name = d.get_platform().get_info<info::platform::name>();
     assert(name.find("OpenCL") != string::npos &&
            "accelerator_selector failed to find acc device");
diff --git a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp
index d20002edb3090..5d0294c55d547 100644
--- a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp
@@ -22,30 +22,24 @@ int main() {
     forcedPIs = envVal;
   }
   {
-    default_selector ds;
-    device d = ds.select_device();
+    device d(default_selector_v);
     string name = d.get_platform().get_info<info::platform::name>();
     assert(name.find("OpenCL") != string::npos &&
            "default_selector failed to find cpu device");
   }
   {
-    gpu_selector gs;
     try {
-      device d = gs.select_device();
+      device d(gpu_selector_v);
       std::cerr << "GPU Device is found: " << std::boolalpha << d.is_gpu()
                 << std::endl;
       return -1;
     } catch (...) {
     }
   }
+  { device d(cpu_selector_v); }
   {
-    cpu_selector cs;
-    device d = cs.select_device();
-  }
-  {
-    accelerator_selector as;
     try {
-      device d = as.select_device();
+      device d(accelerator_selector_v);
       std::cerr << "ACC device is found in error: " << d.is_accelerator()
                 << std::endl;
       return -1;
diff --git a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp
index 8a5662c198096..372c1771bcba8 100644
--- a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp
@@ -23,30 +23,26 @@ int main() {
   }
 
   {
-    default_selector ds;
-    device d = ds.select_device();
+    device d(default_selector_v);
     string name = d.get_platform().get_info<info::platform::name>();
     assert(name.find("CUDA") != string::npos);
   }
   {
-    gpu_selector gs;
-    device d = gs.select_device();
+    device d(gpu_selector_v);
     string name = d.get_platform().get_info<info::platform::name>();
     assert(name.find("CUDA") != string::npos);
   }
   {
-    cpu_selector cs;
     try {
-      device d = cs.select_device();
+      device d(cpu_selector_v);
       cerr << "CPU device is found in error: " << d.is_cpu() << std::endl;
       return -1;
     } catch (...) {
     }
   }
   {
-    accelerator_selector as;
     try {
-      device d = as.select_device();
+      device d(accelerator_selector_v);
       cerr << "ACC device is found in error: " << d.is_accelerator()
            << std::endl;
     } catch (...) {