diff --git a/Makefile b/Makefile
index 542bdbe..ece80d5 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ init:
 
 test:
 	coverage erase
-	PYTHONHASHSEED=0 nosetests --nologcapture --verbosity 1 --with-coverage --cover-package=steam tests
+	PYTHONHASHSEED=0 pytest --cov=steam tests
 
 webauth_gen:
 	rm -f vcr/webauth*
diff --git a/requirements.txt b/requirements.txt
index d5b17e2..88f8121 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,8 @@ protobuf>=3.0.0
 gevent-eventemitter>=2.0
 enum34==1.1.2; python_version < '3.4'
 coverage==4.0.3
+pytest==3.2.1
+pytest-cov==2.5.1
 mock==1.3.0
 nose==1.3.7
 PyYAML==3.11
diff --git a/tox.ini b/tox.ini
index b78b584..47b4fe7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
-envlist = py27, py34
+envlist = py27, py36
 
 [testenv]
 setenv =
     PYTHONHASHSEED = 0
 deps = -rrequirements.txt
 commands =
-	nosetests --verbosity 1 --with-coverage --cover-package=steam
+	pytest --cov=steam tests