diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee44a69db..aec27f06c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Not yet released
 - Add Event types: plugin, node, service, and secret ([825][])
 - Add Event filters: plugin and scope ([825][])
 - Small fixes to code and tests for docker 17.06.0 ([825][])
+- Upgrade Google Guava to 20.0 ([792][])
 
 [825]: https://github.com/spotify/docker-client/pull/825
 
diff --git a/pom.xml b/pom.xml
index 358c4cd65..7a0c562c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>18.0</version>
+      <version>20.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
diff --git a/src/main/java/com/spotify/docker/client/DefaultDockerClient.java b/src/main/java/com/spotify/docker/client/DefaultDockerClient.java
index 8dcab7b1b..c76c39c39 100644
--- a/src/main/java/com/spotify/docker/client/DefaultDockerClient.java
+++ b/src/main/java/com/spotify/docker/client/DefaultDockerClient.java
@@ -2613,7 +2613,7 @@ public static Builder fromEnv() throws DockerCertificateException {
     } else {
       final String stripped = endpoint.replaceAll(".*://", "");
       final HostAndPort hostAndPort = HostAndPort.fromString(stripped);
-      final String hostText = hostAndPort.getHostText();
+      final String hostText = hostAndPort.getHost();
       final String scheme = certs.isPresent() ? "https" : "http";
 
       final int port = hostAndPort.getPortOrDefault(DockerHost.defaultPort());
diff --git a/src/main/java/com/spotify/docker/client/DockerHost.java b/src/main/java/com/spotify/docker/client/DockerHost.java
index e0b682e8e..01374cbd7 100644
--- a/src/main/java/com/spotify/docker/client/DockerHost.java
+++ b/src/main/java/com/spotify/docker/client/DockerHost.java
@@ -81,7 +81,7 @@ private DockerHost(final String endpoint, final String certPath) {
     } else {
       final String stripped = endpoint.replaceAll(".*://", "");
       final HostAndPort hostAndPort = HostAndPort.fromString(stripped);
-      final String hostText = hostAndPort.getHostText();
+      final String hostText = hostAndPort.getHost();
       final String scheme = isNullOrEmpty(certPath) ? "http" : "https";
 
       this.port = hostAndPort.getPortOrDefault(defaultPort());