diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 343de18d..00000000
--- a/.coveragerc
+++ /dev/null
@@ -1,7 +0,0 @@
-[run]
-omit = */packages/*
-
-[report]
-show_missing = true
-precision = 2
-exclude_lines = pytest.fail
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 61da8789..9fcc6c3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ nosetests.xml
 junit-report.xml
 pylint.txt
 toy.py
+tox.ini
 violations.pyflakes.txt
 cover/
 build/
diff --git a/Makefile b/Makefile
index cdc99e95..dea33a3f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,10 @@ init:
 test:
 	# This runs all of the tests. To run an individual test, run py.test with
 	# the -k flag, like "py.test -k test_path_is_not_double_encoded"
-	python setup.py test -a "test_requests.py"
+	py.test test_requests.py
 
 coverage:
-	python setup.py test -a "--verbose --cov-report term --cov=requests test_requests.py"
+	py.test --verbose --cov-report term --cov=requests test_requests.py
 
 ci: init
 	py.test --junitxml=junit.xml
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index a45f298c..00000000
--- a/tox.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-envlist = py26, py27, py33, py34, py35, pypy
-
-[testenv]
-setenv =
-    PYTHONPATH = {toxinidir}:{toxinidir}/requests
-whitelist_externals = make
-commands = make test
\ No newline at end of file