diff --git a/test/docker_tests/configurations/mount-tests/docker-compose.mount-test.active_config_unwritable.yml b/test/docker_tests/configurations/mount-tests/docker-compose.mount-test.active_config_unwritable.yml
index 9f5fb388..789b6ef0 100644
--- a/test/docker_tests/configurations/mount-tests/docker-compose.mount-test.active_config_unwritable.yml
+++ b/test/docker_tests/configurations/mount-tests/docker-compose.mount-test.active_config_unwritable.yml
@@ -33,24 +33,6 @@ services:
         source: test_netalertx_data
         target: /data
         read_only: false
-      - type: tmpfs
-        target: /tmp/log
-        tmpfs:
-          size: 64m
-          mode: 1777
-          options: noexec,nosuid,nodev,async,noatime,nodiratime
-      - type: tmpfs
-        target: /tmp/api
-        tmpfs:
-          size: 64m
-          mode: 1777
-          options: noexec,nosuid,nodev,async,noatime,nodiratime
-      - type: tmpfs
-        target: /tmp/run
-        tmpfs:
-          size: 64m
-          mode: 1777
-          options: noexec,nosuid,nodev,async,noatime,nodiratime
       - type: volume
         source: test_system_services_active_config
         target: /tmp/nginx/active-config
@@ -58,6 +40,9 @@ services:
     tmpfs:
       # Ensure /tmp is a writable tmpfs for the app user; mode 1777 to support su-exec drop.
       - /tmp:uid=20211,gid=20211,mode=1777,noexec,nosuid,nodev,size=64m
+      - /tmp/log:uid=20211,gid=20211,mode=1777,noexec,nosuid,nodev,size=64m
+      - /tmp/api:uid=20211,gid=20211,mode=1777,noexec,nosuid,nodev,size=64m
+      - /tmp/run:uid=20211,gid=20211,mode=1777,noexec,nosuid,nodev,size=64m
 volumes:
   test_netalertx_data:
   test_system_services_active_config:
\ No newline at end of file
diff --git a/test/docker_tests/test_container_environment.py b/test/docker_tests/test_container_environment.py
index 2bd95ee5..1ccc0f29 100644
--- a/test/docker_tests/test_container_environment.py
+++ b/test/docker_tests/test_container_environment.py
@@ -665,7 +665,7 @@ def _run_container(
         stdout=subprocess.PIPE,  # MUST capture stdout for test assertions and debugging
         stderr=subprocess.PIPE,  # MUST capture stderr for test assertions and debugging
         text=True,
-        timeout=max(SUBPROCESS_TIMEOUT_SECONDS, sleep_seconds + 30),
+        timeout=max(SUBPROCESS_TIMEOUT_SECONDS, sleep_seconds),
         check=False,
     )
 
diff --git a/test/docker_tests/test_docker_compose_scenarios.py b/test/docker_tests/test_docker_compose_scenarios.py
index 2161565b..f405f358 100644
--- a/test/docker_tests/test_docker_compose_scenarios.py
+++ b/test/docker_tests/test_docker_compose_scenarios.py
@@ -76,8 +76,8 @@ CONTAINER_PATHS = {
 TMPFS_ROOT = "/tmp:uid=20211,gid=20211,mode=1700,rw,noexec,nosuid,nodev,async,noatime,nodiratime"
 
 DEFAULT_HTTP_PORT = int(os.environ.get("NETALERTX_DEFAULT_HTTP_PORT", "20211"))
-COMPOSE_PORT_WAIT_TIMEOUT = int(os.environ.get("NETALERTX_COMPOSE_PORT_WAIT_TIMEOUT", "180"))
-COMPOSE_SETTLE_WAIT_SECONDS = int(os.environ.get("NETALERTX_COMPOSE_SETTLE_WAIT", "15"))
+COMPOSE_PORT_WAIT_TIMEOUT = "30"
+COMPOSE_SETTLE_WAIT_SECONDS = "20"
 PREFERRED_CUSTOM_PORTS = (22111, 22112)
 HOST_ADDR_ENV = os.environ.get("NETALERTX_HOST_ADDRS", "")
 
diff --git a/test/docker_tests/test_mount_diagnostics_pytest.py b/test/docker_tests/test_mount_diagnostics_pytest.py
index 0bef6995..8a81c022 100644
--- a/test/docker_tests/test_mount_diagnostics_pytest.py
+++ b/test/docker_tests/test_mount_diagnostics_pytest.py
@@ -360,7 +360,7 @@ def create_test_scenarios() -> List[TestScenario]:
                 container_path="/data",
                 is_persistent=True,
                 docker_compose="docker-compose.mount-test.data_noread.yml",
-                expected_issues=[""],
+                expected_issues=[],
                 expected_exit_code=0,
             ),
             TestScenario(  # Will no longer fail due to the root-entrypoint fix