diff --git a/pyproject.toml b/pyproject.toml
index 8d6dbd69..290d4715 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -137,19 +137,23 @@ asyncio_default_fixture_loop_scope = "function"
 
 # --8<-- [start:test-markers-definition]
 markers = [
-    "skip_global_cleanup",
-    "e2e: Tests using end-to-end engine spin-up",
     "basic: Basic correctness tests",
     "cb: Continuous batching tests",
-    "cpu: Tests using CPU (i.e. eager) backend",
     "compat: backward compatibility tests",
-    "spyre: Tests using Spyre hardware backend",
+    "compiler_support_32k: Tests for 32k compiler support",
+    "cpu: Tests using CPU (i.e. eager) backend",
     "decoder: Tests for decoder models",
+    "e2e: Tests using end-to-end engine spin-up",
     "embedding: Tests for embedding models",
-    "quantized: Tests for quantized models",
+    "full_model: Tests that use full-sized granite models",
     "multi: Tests that require >1 cards",
+    "other_e2e: ??? Tests for sampling params that take a long time",
+    "precompilation: Tests the handling of precompiled model catalogs",
+    "quantized: Tests for quantized models",
+    "scoring: Tests for scoring and reranking models",
+    "spyre: Tests using Spyre hardware backend",
     "utils: Tests for utility functions",
-    "worker: Tests for worker logic",
+    "worker: Tests for worker logic"
 ]
 # --8<-- [end:test-markers-definition]
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 97308163..726a2fb3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,7 +10,6 @@
 from spyre_util import (get_spyre_backend_list, get_spyre_model_list,
                         skip_unsupported_tp_size)
 from vllm.connections import global_http_connection
-from vllm.distributed import cleanup_dist_env_and_memory
 
 from vllm_spyre import envs
 
@@ -176,23 +175,6 @@ def init_test_http_connection():
     global_http_connection.reuse_client = False
 
 
-@pytest.fixture()
-def should_do_global_cleanup_after_test(request) -> bool:
-    """Allow subdirectories to skip global cleanup by overriding this fixture.
-    This can provide a ~10x speedup for non-GPU unit tests since they don't need
-    to initialize torch.
-    """
-
-    return not request.node.get_closest_marker("skip_global_cleanup")
-
-
-@pytest.fixture(autouse=True)
-def cleanup_fixture(should_do_global_cleanup_after_test: bool):
-    yield
-    if should_do_global_cleanup_after_test:
-        cleanup_dist_env_and_memory()
-
-
 @pytest.fixture(autouse=True)
 def dynamo_reset():
     yield