diff --git a/Makefile.am b/Makefile.am
index 9140f24f9..019f7a1d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,3 +57,12 @@ MAINTAINERCLEANDIRS = \
 	autom4te.cache \
 	build \
 	dist
+
+
+test:
+	python test/runtests.py
+.PHONY: test
+
+doc:
+	epydoc --config=doc/epydoc.conf
+.PHONY: doc