diff --git a/Makefile b/Makefile
index 5cdc151..1ae1c95 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ vet: fmt
 	go vet ./...
 
 test: build
-	go test -v -count=1 ./...
+	go test -count=1 ./...
 
 build: generate vet
 	mkdir -p bin
diff --git a/pkg/server/admin/admin.go b/pkg/server/admin/admin.go
index 0a3931d..1a91f92 100644
--- a/pkg/server/admin/admin.go
+++ b/pkg/server/admin/admin.go
@@ -87,6 +87,9 @@ func NewAdmin() *Admin {
 }
 
 func (admin *Admin) Close() {
+	admin.mutex.Lock()
+	defer admin.mutex.Unlock()
+
 	for _, client := range admin.clients {
 		client.clientConnection.Close()
 		client.agentConnection.Close()