diff --git a/Makefile b/Makefile
index 9bcdebc2..f76c2099 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,8 @@
 all: clean-pyc test
 
 test:
-	pip install -r test-requirements.txt -q
-	FLASK_DEBUG= py.test tests examples
-
-tox-test:
-	tox
+	pip install -r test-requirements.txt
+	tox -e py-release
 
 audit:
 	python setup.py audit
diff --git a/setup.cfg b/setup.cfg
index 0e97b0ba..cd282e48 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,4 +8,4 @@ universal = 1
 license_file = LICENSE
 
 [tool:pytest]
-norecursedirs = .* *.egg *.egg-info env* artwork docs examples
+norecursedirs = .* *.egg *.egg-info env* artwork docs
diff --git a/test-requirements.txt b/test-requirements.txt
index e079f8a6..053148f8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-pytest
+tox
diff --git a/tox.ini b/tox.ini
index 57725d0a..406de5dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,13 @@ envlist = {py26,py27,pypy}-{lowest,release,devel}{,-simplejson}, {py33,py34,py35
 
 
 [testenv]
+passenv = LANG
 usedevelop=true
 commands =
-    py.test [] --cov=flask --cov-report html
+    # We need to install those after Flask is installed.
+    pip install -e examples/flaskr
+    pip install -e examples/minitwit
+    py.test --cov=flask --cov-report html []
 deps=
     pytest
     pytest-cov