diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py
index 60f346bd3..bacbac47e 100755
--- a/certbot-ci/certbot_integration_tests/utils/acme_server.py
+++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py
@@ -94,7 +94,7 @@ class ACMEServer:
                     if e.errno != errno.ESRCH:
                         raise
             for process in self._processes:
-                process.wait()
+                process.wait(300)
 
             if os.path.exists(os.path.join(self._workspace, 'boulder')):
                 # Boulder docker generates build artifacts owned by root with 0o744 permissions.
@@ -103,14 +103,15 @@ class ACMEServer:
                 # We need to do it through a docker.
                 process = self._launch_process(['docker', 'run', '--rm', '-v',
                                                 '{0}:/workspace'.format(self._workspace),
-                                                'alpine', 'rm', '-rf', '/workspace/boulder'])
-                process.wait()
+                                                'alpine', 'rm', '-rf', '/workspace/boulder'],
+                                               force_stderr=True)
+                process.wait(300)
         finally:
             if os.path.exists(self._workspace):
                 shutil.rmtree(self._workspace)
         if self._stdout != sys.stdout:
             self._stdout.close()
-        print('=> Test infrastructure stopped and cleaned up.')
+        print('=> Test infrastructure stopped and cleaned up.', flush=True)
 
     def __enter__(self) -> Dict[str, Any]:
         self.start()