diff --git a/Makefile b/Makefile
index 30dbc17..48507bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,22 @@
-CXX=g++
+CXX=g++-4.7
 # CPPFLAGS=-Wall -g
 # CPPFLAGS=-Wall -g -std=c++0x
 CPPFLAGS=-Wall -g -std=c++0x -pthread
 
-all:
-	@echo "build things individually (make loops, etc.)"
+all: auto constexpr ilists init init_new lambda loops thread thread2 tuple
+
+test: all
+	./auto
+	./constexpr
+	./ilists
+	./init
+	./init_new
+	./lambda
+	./loops
+	./thread
+	./thread2
+	./tuple
+
 
 clean:
-	@rm -vf auto constexpr ilists2 ilists init init_new lambda loops thread thread2 tuple
+	@rm -vf auto constexpr ilists init init_new lambda loops thread thread2 tuple
diff --git a/README.rst b/README.rst
index ac6c9dc..d9360dc 100644
--- a/README.rst
+++ b/README.rst
@@ -22,4 +22,14 @@ asdf.cc file, run::
 
     make asdf
 
+or to build it all::
+
+    make
+
+Also, you can run it all with the test target:
+
+    make test
+
+if it returns 0, then everything went fine.
+
 Enjoy!