diff --git a/Dockerfile b/Dockerfile
index a97f69df..45c42c6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN \
     apt-get update && \
     apt-get install -y -qq libexpat1-dev gcc libssl-dev libffi-dev && \
     make clean && \
-    pip install -r pypy-requirements.txt && \
+    pip install -r requirements.txt && \
     pypy setup.py develop
 
 CMD ["autopush"]
diff --git a/Makefile b/Makefile
index e465694b..2381da74 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,10 @@ APPNAME = autopush
 DEPS =
 HERE = $(shell pwd)
 PTYPE=pypy
+REQS=requirements.txt
 ifneq ($(PTYPE), python)
-    REQS=$(PTYPE)-requirements.txt
     # avoids pycrypto build issues w/ pypy + libgmp-dev or libmpir-dev
     export with_gmp=no
-else
-    REQS=requirements.txt
 endif
 BIN = $(HERE)/$(PTYPE)/bin
 VIRTUALENV = virtualenv
diff --git a/base-requirements.txt b/base-requirements.txt
deleted file mode 100644
index 8a96b1cd..00000000
--- a/base-requirements.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-ConfigArgParse==0.10.0
-Twisted==16.4.0
-apns==2.0.1
-attrs==16.1.0
-autobahn[twisted]==0.16.0
-boto==2.42.0
-boto3==1.4.0
-botocore==1.4.50
-cffi==1.7.0
-click==6.6
-contextlib2==0.5.4
-cryptography==1.7.2
-cyclone==1.1
-datadog==0.13.0
-decorator==4.0.10
-ecdsa==0.13
-enum34==1.1.6
-future==0.15.2
-futures==3.0.5
-gcm-client==0.1.4
-hyper==0.6.2
-idna==2.1
-ipaddress==1.0.16
-jmespath==0.9.0
-marshmallow==2.10.2
-marshmallow_polyfield==3.1
-objgraph==3.1.0
-pyOpenSSL==16.1.0
-pyasn1==0.1.9
-pyasn1-modules==0.0.8
-pycparser==2.17
-pycrypto==2.6.1
-pyfcm==1.0.4
-python-dateutil==2.5.3
-python-jose==1.3.2
-raven==5.25.0
-requests==2.11.0
-service-identity==16.0.0
-simplejson==3.8.2
-six==1.10.0
-typing==3.5.2.2
--e git+https://github.com/habnabit/txstatsd.git@157ef85fbdeafe23865c7c4e176237ffcb3c3f1f#egg=txStatsD-master
-txaio==2.5.1
-ua_parser==0.7.1
-zope.interface==4.3.1
diff --git a/base-test-requirements.txt b/base-test-requirements.txt
deleted file mode 100644
index 9e8a5ef6..00000000
--- a/base-test-requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-nose
-coverage
-mock>=1.0.1
-funcsigs==1.0.2
-pbr==1.10.0
--e git+https://github.com/habnabit/txstatsd.git@master#egg=txStatsD
--e git+https://github.com/bbangert/moto.git@3bdb75a961148ea5aa526f0e88d9e7835a30df3a#egg=moto
-flake8==3.2.0
-psutil
-websocket-client
-Pympler==0.4.3
diff --git a/doc-requirements.txt b/doc-requirements.txt
index 36de3d70..338a9002 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -1,3 +1,3 @@
--r base-requirements.txt
+-r requirements.txt
 sphinx>=1.3.1
 sphinxcontrib-httpdomain>=1.3.0
diff --git a/pypy-requirements.txt b/pypy-requirements.txt
deleted file mode 100644
index d96295ca..00000000
--- a/pypy-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
--r base-requirements.txt
diff --git a/pypy-test-requirements.txt b/pypy-test-requirements.txt
deleted file mode 100644
index c4df4bae..00000000
--- a/pypy-test-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r pypy-requirements.txt
--r base-test-requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 703a8ac6..77c90a21 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,46 @@
--r base-requirements.txt
-wsaccel==0.6.2
+ConfigArgParse==0.10.0
+Twisted==16.4.0
+apns==2.0.1
+attrs==16.1.0
+autobahn[twisted]==0.16.0
+boto==2.42.0
+boto3==1.4.0
+botocore==1.4.50
+cffi==1.7.0
+click==6.6
+contextlib2==0.5.4
+cryptography==1.7.2
+cyclone==1.1
+datadog==0.13.0
+decorator==4.0.10
+ecdsa==0.13
+enum34==1.1.6
+future==0.15.2
+futures==3.0.5
+gcm-client==0.1.4
+hyper==0.6.2
+idna==2.1
+ipaddress==1.0.16
+jmespath==0.9.0
+marshmallow==2.10.2
+marshmallow_polyfield==3.1
+objgraph==3.1.0
+pyOpenSSL==16.1.0
+pyasn1==0.1.9
+pyasn1-modules==0.0.8
+pycparser==2.17
+pycrypto==2.6.1
+pyfcm==1.0.4
+python-dateutil==2.5.3
+python-jose==1.3.2
+raven==5.25.0
+requests==2.11.0
+service-identity==16.0.0
+simplejson==3.8.2
+six==1.10.0
+typing==3.5.2.2
+-e git+https://github.com/habnabit/txstatsd.git@157ef85fbdeafe23865c7c4e176237ffcb3c3f1f#egg=txStatsD-master
+txaio==2.5.1
+ua_parser==0.7.1
+zope.interface==4.3.1
+wsaccel==0.6.2 ; platform_python_implementation == 'CPython'
diff --git a/test-requirements.txt b/test-requirements.txt
index 2fbac03f..c546e86a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,12 @@
 -r requirements.txt
--r base-test-requirements.txt
+nose
+coverage
+mock>=1.0.1
+funcsigs==1.0.2
+pbr==1.10.0
+-e git+https://github.com/habnabit/txstatsd.git@master#egg=txStatsD
+-e git+https://github.com/bbangert/moto.git@3bdb75a961148ea5aa526f0e88d9e7835a30df3a#egg=moto
+flake8==3.2.0
+psutil
+websocket-client
+Pympler==0.4.3
diff --git a/tox.ini b/tox.ini
index ea7cad13..629eaf6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,13 +11,12 @@ install_command = pip install --pre {opts} {packages}
 
 [testenv:pypy]
 basepython = pypy
-deps = -rpypy-test-requirements.txt
 # avoids pycrypto build issues w/ pypy + libgmp-dev or libmpir-dev
 setenv = with_gmp=no
 
 [testenv:flake8]
 commands = flake8 autopush
-deps = -rbase-test-requirements.txt
+deps = flake8
 
 [testenv:py36-mypy]
 commands = mypy autopush