diff --git a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp
index 6cd72e1079..e69700338b 100644
--- a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp
+++ b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp
@@ -34,19 +34,19 @@ void checkException(TryBodyT TryBody, const std::string &ExpectedErrMsg) {
 }
 
 int main() {
-  sycl::queue Q;
-  sycl::queue Q2;
+  const sycl::device Dev{sycl::default_selector{}};
+  const sycl::device Dev2{sycl::default_selector{}};
+
+  const sycl::context Ctx{Dev};
+  const sycl::context Ctx2{Dev2};
+
+  sycl::queue Q{Ctx, Dev};
+  sycl::queue Q2{Ctx2, Dev2};
 
   // No support for host device so far.
   if (Q.is_host() || Q2.is_host())
     return 0;
 
-  const sycl::context Ctx = Q.get_context();
-  const sycl::device Dev = Q.get_device();
-
-  const sycl::context Ctx2 = Q2.get_context();
-  const sycl::device Dev2 = Q2.get_device();
-
   // The code is needed to just have device images in the executable
   if (0) {
     Q.submit([](sycl::handler &CGH) { CGH.single_task<Kernel1Name>([]() {}); });