diff --git a/requirements.txt b/requirements.txt
index 80b494562..4c4113ab9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==0.7.1
+docker-py==1.0.0
 dockerpty==0.3.2
 docopt==0.6.1
 requests==2.2.1
diff --git a/setup.py b/setup.py
index 9dfe93212..0e25abd48 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ install_requires = [
     'requests >= 2.2.1, < 2.5.0',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.11.0, < 1.0',
-    'docker-py >= 0.6.0, < 0.8',
+    'docker-py >= 1.0.0, < 1.1.0',
     'dockerpty >= 0.3.2, < 0.4',
     'six >= 1.3.0, < 2',
 ]
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index abd40ef08..184aff4de 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -19,4 +19,4 @@ class DockerClientTestCase(unittest.TestCase):
         with mock.patch.dict(os.environ):
             os.environ['DOCKER_CLIENT_TIMEOUT'] = timeout = "300"
             client = docker_client.docker_client()
-        self.assertEqual(client._timeout, int(timeout))
+        self.assertEqual(client.timeout, int(timeout))