diff --git a/testutil/testutil.go b/testutil/testutil.go
index 71c3ce0c2aaec..749b0df151a7a 100644
--- a/testutil/testutil.go
+++ b/testutil/testutil.go
@@ -1,12 +1,27 @@
 package testutil
 
-import "os"
+import (
+    "os"
+    "net"
+    "net/url"
+)
 
 var localhost = "localhost"
 
 func GetLocalHost() string {
 	if dockerHostVar := os.Getenv("DOCKER_HOST"); dockerHostVar != "" {
-		return dockerHostVar
+		u, err := url.Parse(dockerHostVar)
+        if err != nil {
+            return dockerHostVar
+        }
+
+        // split out the ip addr from the port
+        host, _, err := net.SplitHostPort(u.Host)
+        if err != nil {
+            return dockerHostVar
+        }
+
+        return host
 	}
 	return localhost
 }
diff --git a/testutil/testutil_test.go b/testutil/testutil_test.go
index 39f548c0f645a..52a807514c94d 100644
--- a/testutil/testutil_test.go
+++ b/testutil/testutil_test.go
@@ -23,4 +23,12 @@ func TestDockerHost(t *testing.T) {
 		t.Fatalf("Host should take DOCKER_HOST value when set. Current value is [%s] and DOCKER_HOST is [%s]", host, os.Getenv("DOCKER_HOST"))
 	}
 
+	os.Setenv("DOCKER_HOST", "tcp://1.1.1.1:8080")
+
+	host = GetLocalHost()
+
+	if host != "1.1.1.1" {
+		t.Fatalf("Host should take DOCKER_HOST value when set. Current value is [%s] and DOCKER_HOST is [%s]", host, os.Getenv("DOCKER_HOST"))
+	}
+
 }