diff --git a/.travis.yml b/.travis.yml
index 9a1a8a8c..fca32b39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
 
 
 install:
-    - pip install hg+https://bitbucket.org/hpk42/tox
+    - pip install tox>=1.8
 
 script:
     - tox -e \
diff --git a/Makefile b/Makefile
index e1835e8c..a04efd6f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 all: clean-pyc test
 
 test:
-	py.test
+	py.test tests examples
 
 tox-test:
 	tox