diff --git a/sycl/test/check_device_code/id_queries_fit_int.cpp b/sycl/test/check_device_code/id_queries_fit_int.cpp
index 6736ff6c24c7d..266219d0cb7bd 100644
--- a/sycl/test/check_device_code/id_queries_fit_int.cpp
+++ b/sycl/test/check_device_code/id_queries_fit_int.cpp
@@ -1,25 +1,22 @@
-// RUN: %clangxx -fsycl -fsycl-id-queries-fit-in-int -O0 -c -S -emit-llvm -o %t.ll %s
+// RUN: %clangxx -fsycl-device-only -fsycl-id-queries-fit-in-int -fno-sycl-early-optimizations -S -o %t.ll %s
 // RUN: FileCheck %s --input-file %t.ll
 
 #include <CL/sycl.hpp>
 
 using namespace sycl;
 
-// CHECK: define dso_local i32 @main() {{.*}} {
-int main() {
-  item<1, true> TestItem = detail::Builder::createItem<1, true>({3}, {2}, {1});
+// CHECK: define {{.*}}dso_local spir_func void @{{.*}}testItem{{.*}}(%"class.{{.*}}item"*{{.*}}%TestItem)
+SYCL_EXTERNAL void testItem(item<1> TestItem) {
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int Id = TestItem.get_id(0);
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int Range = TestItem.get_range(0);
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int LinearId = TestItem.get_linear_id();
+}
 
-  cl::sycl::nd_item<1> TestNDItem =
-      detail::Builder::createNDItem<1>(detail::Builder::createItem<1, false>({4}, {2}),
-                                       detail::Builder::createItem<1, false>({2}, {0}),
-                                       detail::Builder::createGroup<1>({4}, {2}, {1}));
-
+// CHECK: define {{.*}}dso_local spir_func void @{{.*}}testNDItem{{.*}}(%"class.{{.*}}nd_item"*{{.*}}%TestNDItem)
+SYCL_EXTERNAL void testNDItem(nd_item<1> TestNDItem) {
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int GlobalId = TestNDItem.get_global_id(0);
   // CHECK: call void @llvm.assume(i1 {{.*}})
@@ -39,13 +36,10 @@ int main() {
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int LocalRange = TestNDItem.get_local_range(0);
 
+  // CHECK: call void @llvm.assume(i1 {{.*}})
   int GlobalIdConverted = TestNDItem.get_global_id();
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int LocalIdConverted = TestNDItem.get_local_id();
   // CHECK: call void @llvm.assume(i1 {{.*}})
   int OffsetConferted = TestNDItem.get_offset();
-  // CHECK: call void @llvm.assume(i1 {{.*}})
-
-  return 0;
 }
-// CHECK: }