diff --git a/Makefile b/Makefile
index d8a82050a..5dd0f5171 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
 GOFILES ?= $(shell git ls-files '*.go')
 GOFMT ?= $(shell gofmt -l $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))
-BUILDFLAGS ?= 
+BUILDFLAGS ?=
 
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
@@ -44,7 +44,7 @@ fmt:
 
 fmtcheck:
 	@echo '[INFO] running gofmt to identify incorrectly formatted code...'
-	@if [ ! -z $(GOFMT) ]; then \
+	@if [ ! -z "$(GOFMT)" ]; then \
 		echo "[ERROR] gofmt has found errors in the following files:"  ; \
 		echo "$(GOFMT)" ; \
 		echo "" ;\
@@ -64,7 +64,7 @@ test-windows:
 # any common errors.
 vet:
 	@echo 'go vet $$(go list ./... | grep -v ./plugins/parsers/influx)'
-	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -eq 1 ]; then \
+	@go vet $$(go list ./... | grep -v ./plugins/parsers/influx) ; if [ $$? -ne 0 ]; then \
 		echo ""; \
 		echo "go vet has found suspicious constructs. Please remediate any reported errors"; \
 		echo "to fix them before submitting code for review."; \
@@ -72,7 +72,7 @@ vet:
 	fi
 
 test-ci: fmtcheck vet
-	go test -short./...
+	go test -short ./...
 
 test-all: fmtcheck vet
 	go test ./...
diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go
index c0a46995c..eeef97618 100644
--- a/plugins/outputs/influxdb/influxdb_test.go
+++ b/plugins/outputs/influxdb/influxdb_test.go
@@ -137,15 +137,12 @@ func TestConnectHTTPConfig(t *testing.T) {
 }
 
 func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) {
-	var createDatabaseCalled bool
-
 	output := influxdb.InfluxDB{
 		URLs: []string{"http://localhost:8086"},
 
 		CreateHTTPClientF: func(config *influxdb.HTTPConfig) (influxdb.Client, error) {
 			return &MockClient{
 				CreateDatabaseF: func(ctx context.Context) error {
-					createDatabaseCalled = true
 					return nil
 				},
 				WriteF: func(ctx context.Context, metrics []telegraf.Metric) error {
@@ -178,7 +175,6 @@ func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) {
 	require.NoError(t, err)
 	metrics := []telegraf.Metric{m}
 
-	createDatabaseCalled = false
 	err = output.Write(metrics)
 	// We only have one URL, so we expect an error
 	require.Error(t, err)