diff --git a/Makefile b/Makefile
index 8f17f19b..99b60a6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,13 @@
 build:
 	virtualenv --no-site-packages .
 	bin/python setup.py develop
-	bin/pip install coverage
-	bin/pip install nose
+	bin/pip install -r requirements_dev.txt 
 
 test:
-	bin/nosetests
+	./bin/py.test tests/
 
 coverage:
-	bin/nosetests --with-coverage --cover-html --cover-html-dir=html \
-		--cover-package=gunicorn
+	./bin/py.test --cov gunicorn tests/
 
 clean:
 	@rm -rf .Python bin lib include man build html
diff --git a/requirements_dev.txt b/requirements_dev.txt
index e079f8a6..9955decc 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1 +1,2 @@
 pytest
+pytest-cov
diff --git a/tox.ini b/tox.ini
index b92db304..8f28d7c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,8 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, pypy
+envlist = py26, py27, py33, pypy
 
 [testenv]
-commands = nosetests
-deps = nose
+commands = py.test tests/ 
+deps = pytest