diff --git a/requirements.txt b/requirements.txt
index 4bee21ef4..898df3732 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
+docker-py==1.8.0rc3
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@ac3d4aae2c525b052e661f42307223676ca1b313#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index f4476ad3b..5334a9440 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -104,28 +104,6 @@ class TLSConfigTestCase(unittest.TestCase):
         with pytest.raises(docker.errors.TLSParameterError):
             tls_config_from_options(options)
 
-    def test_assert_hostname_explicit_host(self):
-        options = {
-            '--tlscacert': self.ca_cert, '--host': 'tcp://foobar.co.uk:1254'
-        }
-        result = tls_config_from_options(options)
-        assert isinstance(result, docker.tls.TLSConfig)
-        assert result.assert_hostname == 'foobar.co.uk'
-
-    def test_assert_hostname_explicit_host_no_proto(self):
-        options = {
-            '--tlscacert': self.ca_cert, '--host': 'foobar.co.uk:1254'
-        }
-        result = tls_config_from_options(options)
-        assert isinstance(result, docker.tls.TLSConfig)
-        assert result.assert_hostname == 'foobar.co.uk'
-
-    def test_assert_hostname_implicit_host(self):
-        options = {'--tlscacert': self.ca_cert}
-        result = tls_config_from_options(options)
-        assert isinstance(result, docker.tls.TLSConfig)
-        assert result.assert_hostname is None
-
     def test_assert_hostname_explicit_skip(self):
         options = {'--tlscacert': self.ca_cert, '--skip-hostname-check': True}
         result = tls_config_from_options(options)