diff --git a/.circleci/config.yml b/.circleci/config.yml
index 075bd0741..17ad2f3f7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,8 +5,8 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/hashicorp/packer
     steps:
       - checkout
-      - run: make ci
\ No newline at end of file
+      - run: make ci
diff --git a/.travis.yml b/.travis.yml
index 1be948a43..d2def5ca5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ sudo: false
 language: go
 
 go:
-  - 1.11.x
+  - 1.12.x
   - master
 
 before_install:
diff --git a/Makefile b/Makefile
index c0c86a307..4c72465cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-TEST?=$(shell go list ./... | grep -v vendor)
-VET?=$(shell ls -d */ | grep -v vendor | grep -v website)
+TEST?=$(shell go list ./...)
+VET?=$(shell go list ./...)
 # Get the current full sha from git
 GITSHA:=$(shell git rev-parse HEAD)
 # Get the current local branch name from git (if we can, this may be blank)
@@ -101,7 +101,7 @@ generate: deps ## Generate dynamically generated code
 	goimports -w common/bootcommand/boot_command.go
 	gofmt -w command/plugin.go
 
-test: fmt-check mode-check ## Run unit tests
+test: fmt-check mode-check vet ## Run unit tests
 	@go test $(TEST) $(TESTARGS) -timeout=2m
 
 # testacc runs acceptance tests
@@ -116,7 +116,7 @@ updatedeps:
 	@echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md"
 
 vet: ## Vet Go code
-	@go tool vet $(VET)  ; if [ $$? -eq 1 ]; then \
+	@go vet $(VET)  ; if [ $$? -eq 1 ]; then \
 		echo "ERROR: Vet found problems in the code."; \
 		exit 1; \
 	fi
diff --git a/appveyor.yml b/appveyor.yml
index 46c99bcc8..90e08ad71 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,6 @@ environment:
 clone_folder: c:\gopath\src\github.com\hashicorp\packer
 
 install:
-  - set GO15VENDOREXPERIMENT=1
   - echo %Path%
   - go version
   - go env