diff --git a/script/cibuild b/script/cibuild
index e15c2ce..7e757b5 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -4,9 +4,14 @@ set -e
 
 . script/bootstrap
 
+echo "Verifying code is formatted via 'gofmt -s -w  go/'"
+gofmt -s -w  go/
+git diff --exit-code --quiet
+
+echo "Building"
 script/build
 
-export GITBACKUPS_ENV=test
-
 cd .gopath/src/github.com/github/gh-ost
+
+echo "Running unit tests"
 go test ./go/...