diff --git a/bindep.txt b/bindep.txt
index 7f205ffc8..104a48089 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -7,6 +7,3 @@ python-devel [platform:rpm]
 libffi-dev [platform:dpkg]
 libffi-devel [platform:rpm]
 openssl-devel [platform:rpm]
-pypy [pypy]
-pypy-dev [platform:dpkg pypy]
-pypy-devel [platform:rpm pypy]
diff --git a/doc/source/contributor/setup.rst b/doc/source/contributor/setup.rst
index 47e227420..7aee35416 100644
--- a/doc/source/contributor/setup.rst
+++ b/doc/source/contributor/setup.rst
@@ -42,7 +42,7 @@ the following::
 To create an environment for a different version, such as Python 3, run
 the following::
 
-   $ virtualenv -p python3.4 $HOME/envs/sdk3
+   $ virtualenv -p python3.5 $HOME/envs/sdk3
 
 When you want to enable your environment so that you can develop inside of it,
 you *activate* it. To activate an environment, run the /bin/activate
diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst
index 30e8d78a2..3d2d02713 100644
--- a/doc/source/contributor/testing.rst
+++ b/doc/source/contributor/testing.rst
@@ -14,16 +14,15 @@ Run
 
 In order to run the entire unit test suite, simply run the ``tox`` command
 inside of your source checkout. This will attempt to run every test command
-listed inside of ``tox.ini``, which includes Python 2.7, 3.4, PyPy,
+listed inside of ``tox.ini``, which includes Python 2.7, 3.5,
 and a PEP 8 check. You should run the full test suite on all versions before
 submitting changes for review in order to avoid unexpected failures in the
 continuous integration system.::
 
    (sdk3)$ tox
    ...
-   py34: commands succeeded
+   py35: commands succeeded
    py27: commands succeeded
-   pypy: commands succeeded
    pep8: commands succeeded
    congratulations :)
 
@@ -31,8 +30,8 @@ During development, it may be more convenient to run a subset of the tests
 to keep test time to a minimum. You can choose to run the tests only on one
 version. A step further is to run only the tests you are working on.::
 
-   (sdk3)$ tox -e py34                # Run run the tests on Python 3.4
-   (sdk3)$ tox -e py34 TestContainer  # Run only the TestContainer tests on 3.4
+   (sdk3)$ tox -e py35                # Run run the tests on Python 3.5
+   (sdk3)$ tox -e py35 TestContainer  # Run only the TestContainer tests on 3.5
 
 Functional Tests
 ----------------
diff --git a/openstack/tests/unit/cloud/test_task_manager.py b/openstack/tests/unit/cloud/test_task_manager.py
index 64e521487..a4c7d2694 100644
--- a/openstack/tests/unit/cloud/test_task_manager.py
+++ b/openstack/tests/unit/cloud/test_task_manager.py
@@ -78,7 +78,7 @@ class TestTaskManager(base.TestCase):
 
         This test is aimed to six.reraise(), called in Task::wait().
         Specifically, we test if we get the same behaviour with all the
-        configured interpreters (e.g. py27, p34, pypy, ...)
+        configured interpreters (e.g. py27, p35, ...)
         """
         self.assertRaises(TestException, self.manager.submit_task, TaskTest())
 
diff --git a/tox.ini b/tox.ini
index 7378c3a78..71da5cacf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py27,pypy,pep8
+envlist = py35,py27,pep8
 skipsdist = True
 
 [testenv]