diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
index db61b6a65f643..2b9dff977029d 100755
--- a/sycl/plugins/level_zero/CMakeLists.txt
+++ b/sycl/plugins/level_zero/CMakeLists.txt
@@ -140,18 +140,6 @@ add_sycl_plugin(level_zero
     ${XPTI_LIBS}
 )
 
-#FIXME: We should stop shipping level zero headers as part of the
-#       toolchain installation. Instead these should be avaialble in the system.
-#       We keep shipping it until all environments are updated.
-if (TARGET ze_loader)
-  file(GLOB LEVEL_ZERO_API_HEADERS "${LEVEL_ZERO_INCLUDE_DIR}/*.h")
-  install(FILES ${LEVEL_ZERO_API_HEADERS}
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/include/sycl/level_zero/
-      COMPONENT level-zero-sycl-dev
-  )
-endif()
-# end of FIXME
-
 add_dependencies(pi_level_zero ze-api)
 
 if (SYCL_ENABLE_XPTI_TRACING)
diff --git a/sycl/test-e2e/Plugin/level_zero_events_caching.cpp b/sycl/test-e2e/Plugin/level_zero_events_caching.cpp
index e92f8f3957321..48baf1eff6ba1 100644
--- a/sycl/test-e2e/Plugin/level_zero_events_caching.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_events_caching.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: gpu, level_zero
 
-// RUN: %{build} %level_zero_options -o %t.out
+// RUN: %{build}  -o %t.out
 // RUN: env ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s
 // RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=0 ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s
 // RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CACHING-DISABLED %s
diff --git a/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp b/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp
index 28b926df98cc4..72335434f0deb 100644
--- a/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: gpu, level_zero
 
-// RUN: %{build} %level_zero_options -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: env ZE_MAX_NUMBER_OF_EVENTS_PER_EVENT_POOL=4 ZE_DEBUG=4 %{run} %t.out
 // RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_MAX_NUMBER_OF_EVENTS_PER_EVENT_POOL=4 ZE_DEBUG=4 %{run} %t.out
 
diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp
index ed0dc0b9389be..f21ec47e6d74c 100644
--- a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp
@@ -1,6 +1,7 @@
 // REQUIRES: level_zero
 // REQUIRES: aspect-ext_intel_device_id
-// RUN: %{build} %level_zero_options -o %t.out
+
+// RUN: %{build} -o %t.out
 
 // RUN: env ZEX_NUMBER_OF_CCS=0:4 env ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-PVC
 
diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp
index 080c39498a301..cae762452d0f0 100644
--- a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: aspect-ext_intel_device_id
 // REQUIRES: level_zero
-// RUN: %{build} %level_zero_options -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: env ZEX_NUMBER_OF_CCS=0:4 env ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-PVC
 //
 // Same with Immediate CommandLists
diff --git a/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp b/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp
index b977f3605b205..7cbff78fecfb9 100644
--- a/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: gpu, level_zero
 
-// RUN: %{build} %level_zero_options -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s
 
 // Test that "device_read_only" shared USM allocations are pooled.