diff --git a/cert_test.go b/cert_test.go
index a5648c90e40..f25b76897f0 100644
--- a/cert_test.go
+++ b/cert_test.go
@@ -657,7 +657,6 @@ func TestCipherSuites(t *testing.T) {
 }
 
 func TestHTTP2(t *testing.T) {
-	mockHandle.PushDomains(map[string][]string{"http2.golang.org.": {"130.211.116.44"}}, nil)
 
 	// Certificates
 	serverCertPem, serverPrivPem, _, _ := genServerCertificate()
diff --git a/dnscache/storage.go b/dnscache/storage.go
index c67f6d4dbac..ac8053490c8 100644
--- a/dnscache/storage.go
+++ b/dnscache/storage.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/pmylund/go-cache"
+	cache "github.com/pmylund/go-cache"
 )
 
 // DnsCacheItem represents single record in cache
diff --git a/handler_success.go b/handler_success.go
index ccf5f4cffb2..4d3008bfd15 100644
--- a/handler_success.go
+++ b/handler_success.go
@@ -10,9 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pmylund/go-cache"
-
 	"github.com/TykTechnologies/tyk/request"
+	cache "github.com/pmylund/go-cache"
 
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/user"
diff --git a/helpers_test.go b/helpers_test.go
index 25f08f80539..7a98b57d185 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dgrijalva/jwt-go"
+	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
 
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
diff --git a/host_checker.go b/host_checker.go
index 8af72611ced..40ae81e6008 100644
--- a/host_checker.go
+++ b/host_checker.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/jeffail/tunny"
-	"github.com/pmylund/go-cache"
+	cache "github.com/pmylund/go-cache"
 
 	"github.com/TykTechnologies/tyk/config"
 )
diff --git a/main.go b/main.go
index c7d4f3d128a..babd2962a92 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ import (
 	"github.com/TykTechnologies/tyk/checkup"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/Sirupsen/logrus/hooks/syslog"
+	logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
 	logstashHook "github.com/bshuster-repo/logrus-logstash-hook"
 	"github.com/evalphobia/logrus_sentry"
 	"github.com/facebookgo/pidfile"
diff --git a/middleware.go b/middleware.go
index 9d7c19f0b92..08bb24b7253 100644
--- a/middleware.go
+++ b/middleware.go
@@ -9,9 +9,9 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/gocraft/health"
 	"github.com/justinas/alice"
-	"github.com/newrelic/go-agent"
+	newrelic "github.com/newrelic/go-agent"
 	"github.com/paulbellamy/ratecounter"
-	"github.com/pmylund/go-cache"
+	cache "github.com/pmylund/go-cache"
 
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
diff --git a/mw_js_plugin_test.go b/mw_js_plugin_test.go
index 9b2cdc35a85..722261b74aa 100644
--- a/mw_js_plugin_test.go
+++ b/mw_js_plugin_test.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/x-cray/logrus-prefixed-formatter"
+	prefixed "github.com/x-cray/logrus-prefixed-formatter"
 
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
diff --git a/reverse_proxy.go b/reverse_proxy.go
index 1c01f331096..7a6615507ca 100644
--- a/reverse_proxy.go
+++ b/reverse_proxy.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/pmylund/go-cache"
+	cache "github.com/pmylund/go-cache"
 
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
diff --git a/test/dns.go b/test/dns.go
index 8e6aefced82..13d9e7ece0d 100644
--- a/test/dns.go
+++ b/test/dns.go
@@ -17,9 +17,10 @@ import (
 var (
 	muDefaultResolver  sync.RWMutex
 	DomainsToAddresses = map[string][]string{
-		"host1.local.": {"127.0.0.1"},
-		"host2.local.": {"127.0.0.1"},
-		"host3.local.": {"127.0.0.1"},
+		"host1.local.":      {"127.0.0.1"},
+		"host2.local.":      {"127.0.0.1"},
+		"host3.local.":      {"127.0.0.1"},
+		"http2.golang.org.": {"130.211.116.44"}, // HTTP/2 server
 	}
 )