diff --git a/Makefile b/Makefile
index e46cc27..319710f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,13 +31,16 @@
 dep: # @HELP Download the dependencies to the vendor folder
 	GO111MODULE=on go mod vendor
 
-build: dep protos build-bbsim build-bbsimctl# @HELP Build the binary
+build: fmt dep protos build-bbsim build-bbsimctl# @HELP Build the binary
 
-test: dep protos # @HELP Execute unit tests
+test: fmt dep protos # @HELP Execute unit tests
 	GO111MODULE=on go test -v -mod vendor ./... -covermode count -coverprofile ./tests/results/go-test-coverage.out 2>&1 | tee ./tests/results/go-test-results.out
 	go-junit-report < ./tests/results/go-test-results.out > ./tests/results/go-test-results.xml
 	gocover-cobertura < ./tests/results/go-test-coverage.out > ./tests/results/go-test-coverage.xml
 
+fmt:
+	go fmt ./...
+
 docker-build: # @HELP Build a docker container
 	docker build -t ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim:${DOCKER_TAG} -f build/package/Dockerfile .