diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index 898258f3e3cd0..0d5a9c95c1d95 100644
--- a/offload/test/lit.cfg
+++ b/offload/test/lit.cfg
@@ -166,8 +166,7 @@ elif config.operating_system == 'Darwin':
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
 else: # Unices
-    if config.libomptarget_current_target != "nvptx64-nvidia-cuda" and \
-       not config.libomptarget_current_target.startswith('spirv'):
+    if config.libomptarget_current_target != "nvptx64-nvidia-cuda":
         config.test_flags += " -nogpulib"
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
@@ -215,7 +214,7 @@ def add_libraries(source):
     if "gpu" not in config.available_features:
         return source
     if "intelgpu" in config.available_features:
-        # SPIR-V uses an out-of-tree linker and libc doesn't work.
+        # There is no DeviceRTL for Intel yet and libc doesn't work.
         return source
     if config.libomptarget_has_libc:
         return source + " -Xoffload-linker -lc " + \
diff --git a/offload/test/mapping/firstprivate_aligned.cpp b/offload/test/mapping/firstprivate_aligned.cpp
index ae6be0f0c07f4..bf09eb0b0f589 100644
--- a/offload/test/mapping/firstprivate_aligned.cpp
+++ b/offload/test/mapping/firstprivate_aligned.cpp
@@ -1,4 +1,5 @@
 // RUN: %libomptarget-compilexx-generic -O3 && %libomptarget-run-generic
+// XFAIL: intelgpu
 
 #include <stdio.h>