diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index de22101..d3f1c9a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,13 +5,13 @@
 The third digit is only for regressions.
 
 
-15.2.0 (UNRELEASED)
+16.0.0 (UNRELEASED)
 -------------------
 
 This is the first release under full stewardship of PyCA.
 We have made *many* changes to make local development more pleasing.
 The test suite now passes both on Linux and OS X with OpenSSL 0.9.8, 1.0.1, and 1.0.2.
-It has been moved to `py.test <http://pytest.org/latest/>`_, all CI test runs are part of `tox <https://testrun.org/tox/>`_ and the source code has been made fully `flake8 <https://flake8.readthedocs.org/en/>`_ compliant.
+It has been moved to `py.test <http://pytest.org/>`_, all CI test runs are part of `tox <https://testrun.org/tox/>`_ and the source code has been made fully `flake8 <https://flake8.readthedocs.org/>`_ compliant.
 
 We hope to have lowered the barrier for contributions significantly but are open to hear about any remaining frustrations.
 
@@ -34,7 +34,7 @@
   Please note that you should `use urandom <http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/>`_ for all your secure random number needs.
 
 
-In accordance with our backward compatibility policy :func:`OpenSSL.rand.egd` will be *removed* no sooner than a year from the release of 15.2.0
+In accordance with our backward compatibility policy :func:`OpenSSL.rand.egd` will be *removed* no sooner than a year from the release of 16.0.0.
 
 
 Changes:
@@ -64,4 +64,4 @@
 Older Changelog Entries
 -----------------------
 
-The changes from before release 15.2.0 are preserved in the `repository <https://github.com/pyca/pyopenssl/blob/master/doc/ChangeLog_old.txt>`_.
+The changes from before release 16.0.0 are preserved in the `repository <https://github.com/pyca/pyopenssl/blob/master/doc/ChangeLog_old.txt>`_.
diff --git a/setup.cfg b/setup.cfg
index 2035a2e..e68206f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [pytest]
 minversion = 2.8.2
 strict = true
-norecursedirs = build dist .* *.egg doc _trial_temp
+testpaths = tests
 
 [sdist]
 force_manifest=1
diff --git a/src/OpenSSL/rand.py b/src/OpenSSL/rand.py
index c12638f..087b243 100644
--- a/src/OpenSSL/rand.py
+++ b/src/OpenSSL/rand.py
@@ -118,7 +118,7 @@
 
     Does *not* actually query the EGD.
 
-    .. deprecated:: 15.2.0
+    .. deprecated:: 16.0.0
         EGD was only necessary for some commercial UNIX systems that all
         reached their ends of life more than a decade ago.  See
         `pyca/cryptography#1636
@@ -129,7 +129,7 @@
 
     :returns: ``len(bytes)`` or 255 if not specified.
     """
-    warnings.warn("OpenSSL.rand.egd() is deprecated as of 15.2.0.",
+    warnings.warn("OpenSSL.rand.egd() is deprecated as of 16.0.0.",
                   DeprecationWarning)
 
     if not isinstance(path, _builtin_bytes):
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 02c5fc3..71c1fb4 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -11,7 +11,7 @@
     "__title__", "__uri__", "__version__",
 ]
 
-__version__ = "15.2.0.dev0"
+__version__ = "16.0.0.dev0"
 
 __title__ = "pyOpenSSL"
 __uri__ = "https://github.com/pyca/pyopenssl"
@@ -19,4 +19,4 @@
 __author__ = "The pyOpenSSL developers"
 __email__ = "cryptography-dev@python.org"
 __license__ = "Apache License, Version 2.0"
-__copyright__ = "Copyright 2001-2015 {0}".format(__author__)
+__copyright__ = "Copyright 2001-2016 {0}".format(__author__)