diff --git a/Makefile b/Makefile
index ae57219e3..7e0ec754e 100644
--- a/Makefile
+++ b/Makefile
@@ -76,10 +76,8 @@ format: dependencies
 	find . -iname '*.go' | egrep -v "^\./(\.build|Godeps)/" | xargs -n1 $(GOFMT) -w -s=true
 
 race_condition_binary: build
-	$(GO) build -race -o prometheus.race $(BUILDFLAGS) .
-
-race_condition_run: race_condition_binary
-	./prometheus.race $(ARGUMENTS)
+	$(GO) build -race -o prometheus.race $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/prometheus
+	$(GO) build -race -o promtool.race $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/promtool
 
 search_index:
 	godoc -index -write_index -index_files='search_index'