diff --git a/network/interface.go b/network/interface.go
index 691323a..d3a6f9d 100644
--- a/network/interface.go
+++ b/network/interface.go
@@ -2,9 +2,9 @@ package network
 
 import (
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
-	"sort"
 )
 
 type InterfaceGenerator interface {
diff --git a/test b/test
index 65d2fb8..0d0a7a9 100755
--- a/test
+++ b/test
@@ -26,9 +26,9 @@ declare -a TESTPKGS=(initialize
                      network)
 
 if [ -z "$PKG" ]; then
-	GOFMTPATH="$TESTPKGS coreos-cloudinit.go"
+	GOFMTPATH="${TESTPKGS[*]} coreos-cloudinit.go"
 	# prepend repo path to each package
-	TESTPKGS="${TESTPKGS[@]/#/${REPO_PATH}/} ./"
+	TESTPKGS="${TESTPKGS[*]/#/${REPO_PATH}/} ./"
 else
 	GOFMTPATH="$TESTPKGS"
 	# strip out slashes and dots from PKG=./foo/
@@ -43,5 +43,9 @@ go test ${COVER} $@ ${TESTPKGS}
 
 echo "Checking gofmt..."
 fmtRes=$(gofmt -l $GOFMTPATH)
+if [ -n "$fmtRes" ]; then
+	echo "$fmtRes"
+	exit 1
+fi
 
 echo "Success"