diff --git a/Makefile b/Makefile
index bf3a7ce9f6..15ec4f7ff8 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,14 @@ check_license:
 	@echo ">> checking license header"
 	@./scripts/check_license.sh
 
-test:
+test-short:
 	@echo ">> running short tests"
 	@$(GO) test -short $(pkgs)
 
+test:
+	@echo ">> running all tests"
+	@$(GO) test $(pkgs)
+
 format:
 	@echo ">> formatting code"
 	@$(GO) fmt $(pkgs)
diff --git a/README.md b/README.md
index d0afa6e4cc..98c469f5c1 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ The Makefile provides several targets:
 
   * *build*: build the `prometheus` and `promtool` binaries
   * *test*: run the tests
+  * *test-short*: run the short tests
   * *format*: format the source code
   * *vet*: check the source code for common errors
   * *assets*: rebuild the static assets