diff --git a/.circleci/config.yml b/.circleci/config.yml
index c262c06f4..ae6692f99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   validate:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet
     steps:
       - checkout
@@ -21,7 +21,7 @@ jobs:
 
   test:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet
     steps:
       - checkout
@@ -102,6 +102,11 @@ jobs:
       - run:
           name: Run the end-to-end test suite
           command: |
+            mkdir $HOME/.go
+            export PATH=$HOME/.go/bin:${PATH}
+            curl -fsSL -o "/tmp/go.tar.gz" "https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz"
+            tar -C $HOME/.go --strip-components=1 -xzf "/tmp/go.tar.gz"
+            go version
             make e2e
       - run:
           name: Collect logs on failure from vkubelet-mock-0
diff --git a/Makefile b/Makefile
index 65f8cacc7..d97d2e3ad 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include Makefile.e2e
 # Also, we will want to lock our tool versions using go mod:
 # https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 gobin_tool ?= $(shell which gobin || echo $(GOPATH)/bin/gobin)
-goimports := golang.org/x/tools/cmd/goimports@release-branch.go1.10
+goimports := golang.org/x/tools/cmd/goimports@release-branch.go1.12
 gocovmerge := github.com/wadey/gocovmerge@b5bfa59ec0adc420475f97f89b58045c721d761c
 goreleaser := github.com/goreleaser/goreleaser@v0.82.2
 gox := github.com/mitchellh/gox@v1.0.1
diff --git a/cmd/virtual-kubelet/commands/root/tracing.go b/cmd/virtual-kubelet/commands/root/tracing.go
index 2851b1f37..9c99829e4 100644
--- a/cmd/virtual-kubelet/commands/root/tracing.go
+++ b/cmd/virtual-kubelet/commands/root/tracing.go
@@ -41,7 +41,7 @@ var (
 func setupTracing(ctx context.Context, c Opts) error {
 	for k := range c.TraceConfig.Tags {
 		if reservedTagNames[k] {
-			return strongerrors.InvalidArgument(errors.Errorf("invalid trace tag %q, must not use a reserved tag key"))
+			return strongerrors.InvalidArgument(errors.Errorf("invalid trace tag %q, must not use a reserved tag key", k))
 		}
 	}
 	if c.TraceConfig.Tags == nil {
diff --git a/manager/resource.go b/manager/resource.go
index e8d220afc..cfdbf6531 100644
--- a/manager/resource.go
+++ b/manager/resource.go
@@ -1,7 +1,7 @@
 package manager
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 
diff --git a/manager/resource_test.go b/manager/resource_test.go
index 216daf96b..fc740349b 100644
--- a/manager/resource_test.go
+++ b/manager/resource_test.go
@@ -3,7 +3,7 @@ package manager_test
 import (
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
diff --git a/providers/huawei/cciMock.go b/providers/huawei/cciMock.go
index 3e4415374..02d4ec5bd 100644
--- a/providers/huawei/cciMock.go
+++ b/providers/huawei/cciMock.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 
 	"github.com/gorilla/mux"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 )
 
 // CCIMock implements a CCI service mock server.
diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
index b0b0d1e47..eacacab51 100644
--- a/test/e2e/main_test.go
+++ b/test/e2e/main_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	"github.com/virtual-kubelet/virtual-kubelet/test/e2e/framework"
 )
diff --git a/test/e2e/node_test.go b/test/e2e/node_test.go
index ede1810c8..584f502d4 100644
--- a/test/e2e/node_test.go
+++ b/test/e2e/node_test.go
@@ -9,7 +9,7 @@ import (
 
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	watchapi "k8s.io/apimachinery/pkg/watch"