diff --git a/api/datastore/internal/datastoretest/test.go b/api/datastore/internal/datastoretest/test.go
index 799098da4..570df4ba6 100644
--- a/api/datastore/internal/datastoretest/test.go
+++ b/api/datastore/internal/datastoretest/test.go
@@ -14,7 +14,6 @@ import (
 	"net/http"
 	"os"
 	"net/url"
-	"strings"
 )
 
 func setLogBuffer() *bytes.Buffer {
@@ -27,26 +26,13 @@ func setLogBuffer() *bytes.Buffer {
 	return &buf
 }
 
-// workaround for parts.Hostname() that doesn't work on Go1.7.1
-// TODO(denismakogon): remove this after switching to Go 1.8
-func stripPort(hostport string) string {
-	colon := strings.IndexByte(hostport, ':')
-	if colon == -1 {
-		return hostport
-	}
-	if i := strings.IndexByte(hostport, ']'); i != -1 {
-		return strings.TrimPrefix(hostport[:i], "[")
-	}
-	return hostport[:colon]
-}
-
 func GetContainerHostIP() string {
 	dockerHost := os.Getenv("DOCKER_HOST")
 	if dockerHost == "" {
 		return "127.0.0.1"
 	}
 	parts, _ := url.Parse(dockerHost)
-	return stripPort(parts.Host)
+	return parts.Hostname()
 }
 
 func Test(t *testing.T, ds models.Datastore) {
diff --git a/circle.yml b/circle.yml
index 418b63c6e..89e65335b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -16,9 +16,9 @@ checkout:
 
 dependencies:
   pre:
-    - wget https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz
+    - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
     - mkdir -p $HOME/golang
-    - tar -C $HOME/golang -xvzf go1.7.1.linux-amd64.tar.gz
+    - tar -C $HOME/golang -xvzf go1.8.linux-amd64.tar.gz
     - wget https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-linux-amd64.tar.gz
     - tar -C $HOME/bin -xvzf glide-v0.12.3-linux-amd64.tar.gz --strip=1
   override: