diff --git a/plugins/nginx/nginx_test.go b/plugins/nginx/nginx_test.go
index 4031baf59..74dd37d31 100644
--- a/plugins/nginx/nginx_test.go
+++ b/plugins/nginx/nginx_test.go
@@ -71,17 +71,17 @@ func TestNginxGeneratesMetrics(t *testing.T) {
 		panic(err)
 	}
 
-        host, port, err := net.SplitHostPort(addr.Host)
-        if err != nil {
-            host = addr.Host
-            if addr.Scheme == "http" {
-                port = "80"
-            } else if addr.Scheme == "https" {
-                port = "443"
-            } else {
-                port = ""
-            }
-        }
+	host, port, err := net.SplitHostPort(addr.Host)
+	if err != nil {
+		host = addr.Host
+		if addr.Scheme == "http" {
+			port = "80"
+		} else if addr.Scheme == "https" {
+			port = "443"
+		} else {
+			port = ""
+		}
+	}
 
 	tags := map[string]string{"server": host, "port": port}
 
diff --git a/plugins/postgresql/postgresql_test.go b/plugins/postgresql/postgresql_test.go
index e9ff99e4e..4a53a2e8f 100644
--- a/plugins/postgresql/postgresql_test.go
+++ b/plugins/postgresql/postgresql_test.go
@@ -75,7 +75,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	}
 
 	assert.True(t, metricsCounted > 0)
-	assert.Equal(t, len(availableColumns) - len(p.IgnoredColumns()), metricsCounted)
+	assert.Equal(t, len(availableColumns)-len(p.IgnoredColumns()), metricsCounted)
 }
 
 func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 5badaccde..64d721054 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -22,6 +22,15 @@ function exit_if_fail {
     fi
 }
 
+# Check that go fmt has been run.
+function check_go_fmt {
+    fmtcount=`git ls-files | grep '.go$' | grep -v Godep | xargs gofmt -l 2>&1 | wc -l`
+    if [ $fmtcount -gt 0 ]; then
+        echo "run 'go fmt ./...' to format your source code."
+        exit 1
+    fi
+}
+
 # build takes three arguments: GOOS & GOARCH & VERSION
 function build {
   echo -n "=> $1-$2: "
@@ -53,6 +62,9 @@ echo "\$CIRCLE_BRANCH: $CIRCLE_BRANCH"
 exit_if_fail mv $HOME/telegraf $GOPATH/src/github.com/influxdb
 exit_if_fail cd $GOPATH/src/github.com/influxdb/telegraf
 
+# Verify that go fmt has been run
+check_go_fmt
+
 # Install the code
 exit_if_fail godep go build -v ./...
 exit_if_fail godep go install -v ./...
diff --git a/testutil/accumulator.go b/testutil/accumulator.go
index e83eb58bb..01d9393b4 100644
--- a/testutil/accumulator.go
+++ b/testutil/accumulator.go
@@ -3,8 +3,8 @@ package testutil
 import (
 	"fmt"
 	"reflect"
-	"time"
 	"sync"
+	"time"
 )
 
 // Point defines a single point measurement