diff --git a/sycl/source/detail/config.def b/sycl/source/detail/config.def
index 9a89de13ecd88..b23b6f57bd1d1 100644
--- a/sycl/source/detail/config.def
+++ b/sycl/source/detail/config.def
@@ -34,8 +34,4 @@ CONFIG(SYCL_CACHE_THRESHOLD, 16, __SYCL_CACHE_THRESHOLD)
 CONFIG(SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE, 16, __SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE)
 CONFIG(SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE, 16, __SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE)
 CONFIG(INTEL_ENABLE_OFFLOAD_ANNOTATIONS, 1, __SYCL_INTEL_ENABLE_OFFLOAD_ANNOTATIONS)
-CONFIG(SYCL_OVERRIDE_PI_OPENCL, 1024, __SYCL_OVERRIDE_PI_OPENCL)
-CONFIG(SYCL_OVERRIDE_PI_LEVEL_ZERO, 1024, __SYCL_OVERRIDE_PI_LEVEL_ZERO)
-CONFIG(SYCL_OVERRIDE_PI_CUDA, 1024, __SYCL_OVERRIDE_PI_CUDA)
-CONFIG(SYCL_OVERRIDE_PI_HIP, 1024, __SYCL_OVERRIDE_PI_HIP)
 CONFIG(SYCL_ENABLE_DEFAULT_CONTEXTS, 1, __SYCL_ENABLE_DEFAULT_CONTEXTS)
diff --git a/sycl/source/detail/pi.cpp b/sycl/source/detail/pi.cpp
index 4c43b3e31c058..a372f676b7016 100644
--- a/sycl/source/detail/pi.cpp
+++ b/sycl/source/detail/pi.cpp
@@ -278,26 +278,13 @@ std::vector<std::pair<std::string, backend>> findPlugins() {
   // search is done for libpi_opencl.so/pi_opencl.dll file in LD_LIBRARY_PATH
   // env only.
   //
-  const char *OpenCLPluginName =
-      SYCLConfig<SYCL_OVERRIDE_PI_OPENCL>::get()
-          ? SYCLConfig<SYCL_OVERRIDE_PI_OPENCL>::get()
-          : __SYCL_OPENCL_PLUGIN_NAME;
-  const char *L0PluginName =
-      SYCLConfig<SYCL_OVERRIDE_PI_LEVEL_ZERO>::get()
-          ? SYCLConfig<SYCL_OVERRIDE_PI_LEVEL_ZERO>::get()
-          : __SYCL_LEVEL_ZERO_PLUGIN_NAME;
-  const char *CUDAPluginName = SYCLConfig<SYCL_OVERRIDE_PI_CUDA>::get()
-                                   ? SYCLConfig<SYCL_OVERRIDE_PI_CUDA>::get()
-                                   : __SYCL_CUDA_PLUGIN_NAME;
-  const char *HIPPluginName = SYCLConfig<SYCL_OVERRIDE_PI_HIP>::get()
-                                  ? SYCLConfig<SYCL_OVERRIDE_PI_HIP>::get()
-                                  : __SYCL_HIP_PLUGIN_NAME;
   device_filter_list *FilterList = SYCLConfig<SYCL_DEVICE_FILTER>::get();
   if (!FilterList) {
-    PluginNames.emplace_back(OpenCLPluginName, backend::opencl);
-    PluginNames.emplace_back(L0PluginName, backend::level_zero);
-    PluginNames.emplace_back(CUDAPluginName, backend::cuda);
-    PluginNames.emplace_back(HIPPluginName, backend::hip);
+    PluginNames.emplace_back(__SYCL_OPENCL_PLUGIN_NAME, backend::opencl);
+    PluginNames.emplace_back(__SYCL_LEVEL_ZERO_PLUGIN_NAME,
+                             backend::level_zero);
+    PluginNames.emplace_back(__SYCL_CUDA_PLUGIN_NAME, backend::cuda);
+    PluginNames.emplace_back(__SYCL_HIP_PLUGIN_NAME, backend::hip);
   } else {
     std::vector<device_filter> Filters = FilterList->get();
     bool OpenCLFound = false;
@@ -308,20 +295,21 @@ std::vector<std::pair<std::string, backend>> findPlugins() {
       backend Backend = Filter.Backend;
       if (!OpenCLFound &&
           (Backend == backend::opencl || Backend == backend::all)) {
-        PluginNames.emplace_back(OpenCLPluginName, backend::opencl);
+        PluginNames.emplace_back(__SYCL_OPENCL_PLUGIN_NAME, backend::opencl);
         OpenCLFound = true;
       }
       if (!LevelZeroFound &&
           (Backend == backend::level_zero || Backend == backend::all)) {
-        PluginNames.emplace_back(L0PluginName, backend::level_zero);
+        PluginNames.emplace_back(__SYCL_LEVEL_ZERO_PLUGIN_NAME,
+                                 backend::level_zero);
         LevelZeroFound = true;
       }
       if (!CudaFound && (Backend == backend::cuda || Backend == backend::all)) {
-        PluginNames.emplace_back(CUDAPluginName, backend::cuda);
+        PluginNames.emplace_back(__SYCL_CUDA_PLUGIN_NAME, backend::cuda);
         CudaFound = true;
       }
       if (!HIPFound && (Backend == backend::hip || Backend == backend::all)) {
-        PluginNames.emplace_back(HIPPluginName, backend::hip);
+        PluginNames.emplace_back(__SYCL_HIP_PLUGIN_NAME, backend::hip);
         HIPFound = true;
       }
     }
diff --git a/sycl/test/basic_tests/plugin_overrides_negative.cpp b/sycl/test/basic_tests/plugin_overrides_negative.cpp
deleted file mode 100644
index 04dd2289c430e..0000000000000
--- a/sycl/test/basic_tests/plugin_overrides_negative.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: env SYCL_OVERRIDE_PI_OPENCL=opencl_test env SYCL_OVERRIDE_PI_LEVEL_ZERO=l0_test env SYCL_OVERRIDE_PI_CUDA=cuda_test env SYCL_OVERRIDE_PI_HIP=hip_test env SYCL_PI_TRACE=-1 %t.out > %t.log 2>&1
-// RUN: FileCheck %s --input-file %t.log
-
-#include <sycl/sycl.hpp>
-
-int main() {
-  sycl::queue Q;
-
-  return 0;
-}
-
-// CHECK: SYCL_PI_TRACE[all]: Check if plugin is present. Failed to load plugin: opencl_test
-// CHECK: SYCL_PI_TRACE[all]: Check if plugin is present. Failed to load plugin: l0_test
-// CHECK: SYCL_PI_TRACE[all]: Check if plugin is present. Failed to load plugin: cuda_test
-// CHECK: SYCL_PI_TRACE[all]: Check if plugin is present. Failed to load plugin: hip_test
diff --git a/sycl/test/basic_tests/plugin_overrides_positive.cpp b/sycl/test/basic_tests/plugin_overrides_positive.cpp
deleted file mode 100644
index fee1874431bbc..0000000000000
--- a/sycl/test/basic_tests/plugin_overrides_positive.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// RUN: %clangxx -fsycl -DFAKE_PLUGIN -shared %s -o %t_fake_plugin.so
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: env SYCL_OVERRIDE_PI_OPENCL=%t_fake_plugin.so env SYCL_OVERRIDE_PI_LEVEL_ZERO=%t_fake_plugin.so env SYCL_OVERRIDE_PI_CUDA=%t_fake_plugin.so env SYCL_OVERRIDE_PI_HIP=%t_fake_plugin.so env SYCL_PI_TRACE=-1 %t.out > %t.log 2>&1
-// RUN: FileCheck %s --input-file %t.log
-// REQUIRES: linux
-
-#ifdef FAKE_PLUGIN
-
-#include <CL/sycl/detail/pi.h>
-
-pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
-                         pi_uint32 *NumPlatforms) {
-  return PI_INVALID_OPERATION;
-}
-
-pi_result piTearDown(void *) { return PI_SUCCESS; }
-
-pi_result piPluginInit(pi_plugin *PluginInit) {
-  PluginInit->PiFunctionTable.piPlatformsGet = piPlatformsGet;
-  PluginInit->PiFunctionTable.piTearDown = piTearDown;
-  return PI_SUCCESS;
-}
-
-#else
-
-#include <sycl/sycl.hpp>
-
-int main() {
-  try {
-    sycl::platform P{sycl::default_selector{}};
-  } catch (...) {
-    // NOP
-  }
-
-  return 0;
-}
-
-#endif
-
-// CHECK: SYCL_PI_TRACE[basic]: Plugin found and successfully loaded: {{[0-9a-zA-Z_\/\.-]+}}_fake_plugin.so
-// CHECK: SYCL_PI_TRACE[basic]: Plugin found and successfully loaded: {{[0-9a-zA-Z_\/\.-]+}}_fake_plugin.so
-// CHECK: SYCL_PI_TRACE[basic]: Plugin found and successfully loaded: {{[0-9a-zA-Z_\/\.-]+}}_fake_plugin.so
-// CHECK: SYCL_PI_TRACE[basic]: Plugin found and successfully loaded: {{[0-9a-zA-Z_\/\.-]+}}_fake_plugin.so