diff --git a/Makefile b/Makefile
index d4b8996a..a1c728de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+NAME=gaia
+GO_LDFLAGS_STATIC=-ldflags "-s -w -extldflags -static"
+
 default: dev
 
 dev:
@@ -17,6 +20,9 @@ static_assets:
 	rice embed-go
 
 compile_backend:
-	env GOOS=linux GOARCH=amd64 go build -o gaia-linux-amd64 ./cmd/gaia/main.go
+	env GOOS=linux GOARCH=amd64 go build $(GO_LDFLAGS_STATIC) -o $(NAME)-linux-amd64 ./cmd/gaia/main.go
+
+test:
+	go test -v ./...
 
 release: compile_frontend static_assets compile_backend