diff --git a/Makefile b/Makefile
index 4536542b..39f0961a 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,10 @@ release: REMOTE_DIR ?= $(error "can't release, REMOTE_DIR not set")
 release: $(ARCHIVE)
 	scp $< $(REMOTE):$(REMOTE_DIR)/$(ARCHIVE)
 
+test: $(GOCC) dependencies
+	$(GO) test ./...
+
 clean:
 	rm -rf node_exporter .deps
 
-.PHONY: dependencies clean release
+.PHONY: clean default dependencies release test
diff --git a/README.md b/README.md
index 0e17164e..d46a8f65 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,15 @@
 Prometheus exporter for machine metrics, written in Go with pluggable metric
 collectors.
 
+## Building and running
+
+    make
+    ./node_exporter <flags>
+
+## Running tests
+
+    make test
+
 ## Available collectors
 
 By default the build will include the native collectors that expose information