diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py
index 4f77f9aa402b..79656375db32 100644
--- a/sycl/test-e2e/format.py
+++ b/sycl/test-e2e/format.py
@@ -98,14 +98,6 @@ def getMatchedFromList(self, features, alist):
         except ValueError as e:
             raise ValueError("Error in UNSUPPORTED list:\n%s" % str(e))
 
-    def check_environment_supported(self, test):
-        missing_features = test.getMissingRequiredFeaturesFromList(test.config.available_features)
-        if any(feature in test.config.device_agnostic_features for feature in missing_features):
-            return False
-        if self.getMatchedFromList(test.config.available_features.union(missing_features), test.unsupported):
-            return False
-        return True
-
     def select_devices_for_test(self, test):
         devices = []
         for d in test.config.sycl_devices:
@@ -165,7 +157,7 @@ def execute(self, test, litConfig):
         devices_for_test = []
         triples = set()
         if "run-mode" not in test.config.available_features:
-            if not self.check_environment_supported(test):
+            if "unsplit-mode" in test.requires:
                 return lit.Test.Result(
                     lit.Test.UNSUPPORTED, "Test unsupported for this environment"
                 )
diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py
index 53202e0e893c..a441e8c1bbdf 100644
--- a/sycl/test-e2e/lit.cfg.py
+++ b/sycl/test-e2e/lit.cfg.py
@@ -48,19 +48,6 @@
         config.available_features.add("run-mode")
         config.available_features.add("build-mode")
         config.available_features.add("unsplit-mode")
-# Device-agnostic features, these are not ignored when in build-only mode
-config.device_agnostic_features = {
-    "linux",
-    "windows",
-    "system-windows",
-    "cl_options",
-    "TEMPORARY_DISABLED",
-    "vulkan",
-    "zstd",
-    "unsplit-mode",
-    "run-mode",
-    "build-mode",
-}
 
 # Cleanup environment variables which may affect tests
 possibly_dangerous_env_vars = [