diff --git a/Makefile b/Makefile
index 9fb50c4..35491dc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,15 +15,15 @@ clean: ## Removes temporary and build files
 	rm -v $(COVEROUT) $(COVERHTML) $(OUT) || true
 
 .PHONY: fmt ## Runs go fmt
-fmt: ## Runs go fmt
+fmt: $(SOURCES) ## Runs go fmt
 	go fmt ./...
 
 .PHONY: test
 test: ## Test application and generate coverage report
-	rm $(COVEROUT) 2>/dev/null || true
+	$(MAKE) clean
 	$(MAKE) $(COVEROUT)
 
-$(COVEROUT): $(SOURCES)
+$(COVEROUT): $(SOURCES) fmt
 	go test ./... -race -cover -coverprofile $@
 
 $(COVERHTML): $(COVEROUT)
@@ -39,5 +39,5 @@ open-report: report ## Open the coverage report in the default browser
 .PHONY: build
 build: $(OUT) ## Builds the application
 
-$(OUT): $(SOURCES)
+$(OUT): $(SOURCES) fmt
 	go build -o $@