diff --git a/.circleci/config.yml b/.circleci/config.yml
index e14c1cdc8..075bd0741 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,20 +5,8 @@ version: 2
 jobs:
   build:
     docker:
-      # specify the version
       - image: circleci/golang:1.11
-
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-
-    #### TEMPLATE_NOTE: go expects specific checkout path representing url
-    #### expecting it in the form of
-    ####   /go/src/github.com/circleci/go-tool
-    ####   /go/src/bitbucket.org/circleci/go-tool
     working_directory: /go/src/github.com/hashicorp/packer
     steps:
       - checkout
-
-      # specify any bash command here prefixed with `run: `
-      - run: pwd
       - run: make ci
\ No newline at end of file
diff --git a/Makefile b/Makefile
index aa2f1a104..b65b6f500 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ export GOLDFLAGS
 
 .PHONY: bin checkversion ci default deps fmt fmt-docs fmt-examples generate releasebin test testacc testrace updatedeps
 
-default: deps generate testrace dev releasebin package dev fmt fmt-check mode-check fmt-docs fmt-examples 
+default: deps generate testrace dev releasebin package dev fmt fmt-check mode-check fmt-docs fmt-examples
 
 ci: testrace
 
@@ -110,7 +110,7 @@ testacc: deps generate ## Run acceptance tests
 	PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m
 
 testrace: fmt-check mode-check vet ## Test with race detection enabled
-	@go test -race $(TEST) $(TESTARGS) -timeout=2m
+	@go test -race $(TEST) $(TESTARGS) -timeout=2m -p=8
 
 updatedeps:
 	@echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md"