diff --git a/tests/conftest.py b/tests/conftest.py
index a57974a..59c1b9b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -118,7 +118,6 @@ def splunk(request):
         request.fixturenames.append('splunk_external')
         splunk = request.getfixturevalue("splunk_external")
     elif request.config.getoption('splunk_type') == 'docker':
-        os.environ['splunk_version'] = request.config.getoption('splunk_version')
         request.fixturenames.append('splunk_docker')
         splunk = request.getfixturevalue("splunk_docker")
     else:
@@ -153,7 +152,7 @@ def splunk_docker(request, docker_services, docker_ip):
     }
 
     docker_services.wait_until_responsive(
-        timeout=300.0, pause=1.0, check=lambda: is_responsive_splunk(splunk)
+        timeout=180.0, pause=1.0, check=lambda: is_responsive_splunk(splunk)
     )
 
     return splunk
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 8dc536e..ca06853 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     build:
       context: ../package
     image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-${CIRCLE_SHA1}
+    hostname: sc4s
     #When this is enabled test_common will fail
     #    command: -det
     ports:
@@ -47,7 +48,7 @@ services:
     build:
       context: ../splunk
     image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SPLUNK}-${CIRCLE_SHA1}
-
+    hostname: splunk
     ports:
       - "8000"
       - "8088"