diff --git a/Makefile b/Makefile
index 8676014ad4..ee85221175 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ else ifneq ($(DOCKER_DIR), $(realpath $(DOCKER_DIR)))
 endif
 
 test: all
-	@(cd $(DOCKER_DIR); sudo -E go test $(GO_OPTIONS))
+	@(cd $(DOCKER_DIR); sudo -E go test ./... $(GO_OPTIONS))
 
 fmt:
 	@gofmt -s -l -w .
diff --git a/auth/auth.go b/auth/auth.go
index b7ad73b9ed..159c80f73a 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -82,7 +82,7 @@ func decodeAuth(authStr string) (*AuthConfig, error) {
 func LoadConfig(rootPath string) (*AuthConfig, error) {
 	confFile := path.Join(rootPath, CONFIGFILE)
 	if _, err := os.Stat(confFile); err != nil {
-		return &AuthConfig{rootPath:rootPath}, ErrConfigFileMissing
+		return &AuthConfig{rootPath: rootPath}, ErrConfigFileMissing
 	}
 	b, err := ioutil.ReadFile(confFile)
 	if err != nil {
diff --git a/registry/registry.go b/registry/registry.go
index 131b02708e..23aef432c7 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -481,7 +481,7 @@ type Registry struct {
 func NewRegistry(root string, authConfig *auth.AuthConfig) *Registry {
 	httpTransport := &http.Transport{
 		DisableKeepAlives: true,
-		Proxy: http.ProxyFromEnvironment,
+		Proxy:             http.ProxyFromEnvironment,
 	}
 
 	r := &Registry{
diff --git a/term/termios_darwin.go b/term/termios_darwin.go
index ac18aab692..24e79de4b2 100644
--- a/term/termios_darwin.go
+++ b/term/termios_darwin.go
@@ -9,16 +9,16 @@ const (
 	getTermios = syscall.TIOCGETA
 	setTermios = syscall.TIOCSETA
 
-	ECHO    = 0x00000008
-	ONLCR   = 0x2
-	ISTRIP  = 0x20
-	INLCR   = 0x40
-	ISIG    = 0x80
-	IGNCR   = 0x80
-	ICANON  = 0x100
-	ICRNL   = 0x100
-	IXOFF   = 0x400
-	IXON    = 0x200
+	ECHO   = 0x00000008
+	ONLCR  = 0x2
+	ISTRIP = 0x20
+	INLCR  = 0x40
+	ISIG   = 0x80
+	IGNCR  = 0x80
+	ICANON = 0x100
+	ICRNL  = 0x100
+	IXOFF  = 0x400
+	IXON   = 0x200
 )
 
 type Termios struct {