diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py
index 062693ef..0d6d9f96 100644
--- a/tests/integration/api_container_test.py
+++ b/tests/integration/api_container_test.py
@@ -1217,12 +1217,14 @@ class AttachContainerTest(BaseAPIIntegrationTest):
         data = read_exactly(pty_stdout, next_size)
         assert data.decode('utf-8') == line
 
+    @pytest.mark.timeout(10)
     def test_attach_no_stream(self):
         container = self.client.create_container(
             TEST_IMG, 'echo hello'
         )
         self.tmp_containers.append(container)
         self.client.start(container)
+        self.client.wait(container, condition='not-running')
         output = self.client.attach(container, stream=False, logs=True)
         assert output == 'hello\n'.encode(encoding='ascii')
 
diff --git a/tests/integration/regression_test.py b/tests/integration/regression_test.py
index deb9aff1..10313a63 100644
--- a/tests/integration/regression_test.py
+++ b/tests/integration/regression_test.py
@@ -8,6 +8,7 @@ import pytest
 
 
 class TestRegressions(BaseAPIIntegrationTest):
+    @pytest.mark.xfail(True, reason='Docker API always returns chunked resp')
     def test_443_handle_nonchunked_response_in_stream(self):
         dfile = io.BytesIO()
         with pytest.raises(docker.errors.APIError) as exc: