diff --git a/cockroachdb/tests/conftest.py b/cockroachdb/tests/conftest.py
index c2d57d4be04d8..f8e32c622e35a 100644
--- a/cockroachdb/tests/conftest.py
+++ b/cockroachdb/tests/conftest.py
@@ -13,18 +13,16 @@
 
 
 @pytest.fixture(scope='session', autouse=True)
-def spin_up_cockroachdb(instance):
+def dd_environment(instance):
     with docker_run(
         os.path.join(DOCKER_DIR, 'docker-compose.yaml'),
         endpoints=instance['prometheus_url'],
     ):
-        yield
+        yield instance
 
 
 @pytest.fixture(scope='session')
 def instance():
     return {
         'prometheus_url': 'http://{}:{}/_status/vars'.format(HOST, PORT),
-        'disk_space_warning': '15',
-        'disk_space_critical': '5',
     }
diff --git a/envoy/tests/conftest.py b/envoy/tests/conftest.py
index 989dd16d08f1b..e1f1772d1a49f 100644
--- a/envoy/tests/conftest.py
+++ b/envoy/tests/conftest.py
@@ -10,12 +10,13 @@
 
 
 @pytest.fixture(scope='session', autouse=True)
-def spin_up_envoy():
+def dd_environment():
     flavor = os.getenv('FLAVOR', 'default')
+    instance = INSTANCES['main']
 
     with docker_run(
         os.path.join(DOCKER_DIR, flavor, 'docker-compose.yaml'),
         build=True,
-        endpoints=INSTANCES['main']['stats_url']
+        endpoints=instance['stats_url']
     ):
-        yield
+        yield instance
diff --git a/vault/tests/conftest.py b/vault/tests/conftest.py
index abf9eadbbd73e..85df8ecf036e7 100644
--- a/vault/tests/conftest.py
+++ b/vault/tests/conftest.py
@@ -13,9 +13,11 @@
 
 
 @pytest.fixture(scope='session', autouse=True)
-def spin_up_vault():
+def dd_environment():
+    instance = INSTANCES['main']
+
     with docker_run(
         os.path.join(DOCKER_DIR, 'docker-compose.yaml'),
-        endpoints='{}/sys/health'.format(INSTANCES['main']['api_url'])
+        endpoints='{}/sys/health'.format(instance['api_url'])
     ):
-        yield
+        yield instance