diff --git a/.circleci/config.yml b/.circleci/config.yml
index 25c0f9f2..cf3a193d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,18 @@
 version: 2
 jobs:
   build:
+    working_directory: /go/src/github.com/Mongey/terraform-provider-kafka
+    docker:
+      - image: circleci/golang:1.11
+        environment:
+          TEST_RESULTS: /tmp/test-results
+    steps:
+      - checkout
+      - run: go build
+      - store_artifacts:
+          path: /go/src/github.com/Mongey/terraform-provider-kafka/terraform-provider-kafka
+          destination: terraform-provider-kafka
+  test:
     working_directory: /go/src/github.com/Mongey/terraform-provider-kafka
     docker:
       - image: circleci/golang:1.11
@@ -18,11 +30,6 @@ jobs:
           KAFKA_LOG_SEGMENT_BYTES: 1234
     steps:
       - checkout
-      - run: go build
-      - store_artifacts:
-          path: /go/src/github.com/Mongey/terraform-provider-kafka/terraform-provider-kafka
-          destination: terraform-provider-kafka
-      - run: make test
       - run: go get github.com/jstemmer/go-junit-report
       - run: mkdir -p $TEST_RESULTS
       - run:
@@ -35,6 +42,7 @@ jobs:
 
 workflows:
   version: 2
-  build:
+  build-and-test:
     jobs:
       - build
+      - test
diff --git a/GNUmakefile b/GNUmakefile
index 35d264b9..180d2395 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -17,6 +17,7 @@ testacc:
 	KAFKA_CLIENT_KEY=../secrets/kafkacat-raw-private-key.pem \
 	KAFKA_SKIP_VERIFY=true \
 	KAFKA_ENABLE_TLS=true \
-	TG_LOG=debug TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
+	TF_LOG=DEBUG \
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
 
 .PHONY: build test testacc