diff --git a/Makefile b/Makefile
index d3dae053..f6d2adf8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
 .PHONY: docs
 
 init:
-	pip install -r requirements.txt
+	pip install pipenv>=0.1.6
+	pipenv install --dev
 
 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"
-	py.test tests
+	pipenv run py.test tests
 
 coverage:
-	py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests
+	pipenv run py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests
 
 certs:
 	curl http://ci.kennethreitz.org/job/ca-bundle/lastSuccessfulBuild/artifact/cacerts.pem -o requests/cacert.pem
diff --git a/Pipfile b/Pipfile
new file mode 100644
index 00000000..0bb849e7
--- /dev/null
+++ b/Pipfile
@@ -0,0 +1,12 @@
+[[source]]
+url = "https://pypi.org/"
+verify_ssl = true
+
+[dev-packages]
+sphinx = "*"
+pytest-mock = "*"
+pytest-cov = "*"
+pytest = "*"
+codecov = "*"
+pytest-httpbin = "*"
+PySocks = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
new file mode 100644
index 00000000..b545c108
--- /dev/null
+++ b/Pipfile.lock
@@ -0,0 +1,45 @@
+{
+    "default": {},
+    "develop": {
+        "Werkzeug": "==0.11.15",
+        "six": "==1.10.0",
+        "httpbin": "==0.5.0",
+        "codecov": "==2.0.5",
+        "Flask": "==0.12",
+        "Babel": "==2.3.4",
+        "alabaster": "==0.7.9",
+        "pytest-mock": "==1.5.0",
+        "MarkupSafe": "==0.23",
+        "pytz": "==2016.10",
+        "coverage": "==4.3.4",
+        "pytest-httpbin": "==0.2.3",
+        "funcsigs": "==1.0.2",
+        "click": "==6.7",
+        "decorator": "==4.0.11",
+        "imagesize": "==0.7.1",
+        "Pygments": "==2.1.3",
+        "sphinx": "*",
+        "pbr": "==1.10.0",
+        "snowballstemmer": "==1.2.1",
+        "py": "==1.4.32",
+        "pytest-cov": "==2.4.0",
+        "docutils": "==0.13.1",
+        "pytest": "==3.0.5",
+        "Jinja2": "==2.9.4",
+        "Sphinx": "==1.5.1",
+        "requests": "==2.12.5",
+        "itsdangerous": "==0.24",
+        "PySocks": "==1.6.5",
+        "mock": "==2.0.0"
+    },
+    "_meta": {
+        "sources": [
+            {
+                "url": "https://pypi.org/",
+                "verify_ssl": true
+            }
+        ],
+        "requires": {},
+        "Pipfile-sha256": "f306fe105cc76e259ab1e5d2933ad2d0fe7a8b2d28686f64f7a94f767c0ce5d4"
+    }
+}
\ No newline at end of file
diff --git a/requirements-to-freeze.txt b/requirements-to-freeze.txt
deleted file mode 100644
index 9a6a4384..00000000
--- a/requirements-to-freeze.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-pytest
-pytest-cov
-pytest-httpbin
-pytest-mock
-PySocks
-sphinx
-codecov
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 82af21cc..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-alabaster==0.7.9
-Babel==2.3.4
-click==6.7
-codecov==2.0.5
-coverage==4.3.4
-decorator==4.0.11
-docutils==0.13.1
-Flask==0.12
-funcsigs==1.0.2
-httpbin==0.5.0
-imagesize==0.7.1
-itsdangerous==0.24
-Jinja2==2.9.4
-MarkupSafe==0.23
-mock==2.0.0
-pbr==1.10.0
-py==1.4.32
-Pygments==2.1.3
-PySocks==1.6.5
-pytest==3.0.5
-pytest-cov==2.4.0
-pytest-httpbin==0.2.3
-pytest-mock==1.5.0
-pytz==2016.10
-requests==2.12.4
-six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==1.5.1
-Werkzeug==0.11.15