diff --git a/AUTHORS.rst b/AUTHORS.rst
index cc9e75f3..d29fa812 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -176,3 +176,4 @@ Patches and Suggestions
 - Casey Davidson (`@davidsoncasey <https://github.com/davidsoncasey>`_)
 - Andrii Soldatenko (`@a_soldatenko <https://github.com/andriisoldatenko>`_)
 - Moinuddin Quadri <moin18@gmail.com> (`@moin18 <https://github.com/moin18>`_)
+- Matt Kohl (`@mattkohl <https://github.com/mattkohl>`_)
diff --git a/MANIFEST.in b/MANIFEST.in
index 439de496..46ef0b46 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem
+include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requests/cacert.pem
diff --git a/Makefile b/Makefile
index d3822803..ee737f9e 100644
--- a/Makefile
+++ b/Makefile
@@ -52,10 +52,6 @@ publish:
 	twine upload dist/*
 	rm -fr build dist .egg requests.egg-info
 
-
-docs-init:
-	pip install -r docs/requirements.txt
-
 docs:
 	cd docs && make html
 	@echo "\033[95m\n\nBuild successful! View the docs homepage at docs/_build/html/index.html.\n\033[0m"
diff --git a/Pipfile b/Pipfile
index 2e7ec08d..617c7ffa 100644
--- a/Pipfile
+++ b/Pipfile
@@ -3,10 +3,11 @@ url = "https://pypi.python.org/simple"
 verify_ssl = true
 
 [dev-packages]
-pytest = "*"
+pytest = ">=2.8.0"
 codecov = "*"
-pytest-httpbin = "*"
+pytest-httpbin = "==0.0.7"
 sphinx = "*"
 pytest-mock = "*"
 pytest-cov = "*"
 pysocks = "*"
+alabaster = "*"
diff --git a/docs/dev/todo.rst b/docs/dev/todo.rst
index 14dafed3..d4862fbb 100644
--- a/docs/dev/todo.rst
+++ b/docs/dev/todo.rst
@@ -23,13 +23,23 @@ Development Dependencies
 
 You'll need to install py.test in order to run the Requests' test suite::
 
-    $ pip install -r requirements.txt
-    $ py.test
-    platform darwin -- Python 2.7.3 -- pytest-2.3.4
-    collected 25 items
+    $ pip install pipenv
+    $ pipenv lock
+    $ pipenv install --dev
+    $ pipenv run py.test tests
+    ============================= test session starts ==============================
+    platform darwin -- Python 3.4.4, pytest-3.0.6, py-1.4.32, pluggy-0.4.0
+    ...
+    collected 445 items
 
-    test_requests.py .........................
-    25 passed in 3.50 seconds
+    tests/test_hooks.py ...
+    tests/test_lowlevel.py ............
+    tests/test_requests.py ...........................................................
+    tests/test_structures.py ....................
+    tests/test_testserver.py ...........
+    tests/test_utils.py ..s...........................................................
+
+    ============== 442 passed, 1 skipped, 2 xpassed in 46.48 seconds ===============
 
 Runtime Environments
 --------------------