diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..15dc8e4
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,2 @@
+Ask Solem <ask@celeryproject.org>
+Tony Narlock <tony@git-pull.com>
diff --git a/PKG-INFO b/PKG-INFO
index c340919..de242df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,4 +1,4 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: case
 Version: 1.5.3
 Summary: Python unittest Utilities
@@ -6,92 +6,6 @@ Home-page: http://github.com/celery/case
 Author: Ask Solem
 Author-email: ask@celeryproject.org
 License: BSD
-Description: =====================================================================
-         Python unittest utilities
-        =====================================================================
-        
-        |build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
-        
-        :Version: 1.5.3
-        :Web: http://case.readthedocs.org/
-        :Download: http://pypi.python.org/pypi/case/
-        :Source: http://github.com/celery/case/
-        :Keywords: testing utilities, python, unittest, mock
-        
-        About
-        =====
-        
-        .. _case-installation:
-        
-        Installation
-        ============
-        
-        You can install case either via the Python Package Index (PyPI)
-        or from source.
-        
-        To install using `pip`,::
-        
-            $ pip install -U case
-        
-        To install using `easy_install`,::
-        
-            $ easy_install -U case
-        
-        .. _case-installing-from-source:
-        
-        Downloading and installing from source
-        --------------------------------------
-        
-        Download the latest version of case from
-        http://pypi.python.org/pypi/case/
-        
-        You can install it by doing the following,::
-        
-            $ tar xvfz case-0.0.0.tar.gz
-            $ cd case-0.0.0
-            $ python setup.py build
-            # python setup.py install
-        
-        The last command must be executed as a privileged user if
-        you are not currently using a virtualenv.
-        
-        .. _case-installing-from-git:
-        
-        Using the development version
-        -----------------------------
-        
-        With pip
-        ~~~~~~~~
-        
-        You can install the latest snapshot of case using the following
-        pip command::
-        
-            $ pip install https://github.com/celery/case/zipball/master#egg=case
-        
-        .. |build-status| image:: https://secure.travis-ci.org/celery/case.png?branch=master
-            :alt: Build status
-            :target: https://travis-ci.org/celery/case
-        
-        .. |coverage| image:: https://codecov.io/github/celery/case/coverage.svg?branch=master
-            :target: https://codecov.io/github/celery/case?branch=master
-        
-        .. |license| image:: https://img.shields.io/pypi/l/case.svg
-            :alt: BSD License
-            :target: https://opensource.org/licenses/BSD-3-Clause
-        
-        .. |wheel| image:: https://img.shields.io/pypi/wheel/case.svg
-            :alt: Case can be installed via wheel
-            :target: http://pypi.python.org/pypi/case/
-        
-        .. |pyversion| image:: https://img.shields.io/pypi/pyversions/case.svg
-            :alt: Supported Python versions.
-            :target: http://pypi.python.org/pypi/case/
-        
-        .. |pyimp| image:: https://img.shields.io/pypi/implementation/case.svg
-            :alt: Support Python implementations.
-            :target: http://pypi.python.org/pypi/case/
-        
-        
 Keywords: test unit testing pytest unittest mock patch
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
@@ -106,3 +20,93 @@ Classifier: Programming Language :: Python :: 3.5
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
+License-File: LICENSE
+License-File: AUTHORS
+
+=====================================================================
+ Python unittest utilities
+=====================================================================
+
+|build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
+
+:Version: 1.5.3
+:Web: http://case.readthedocs.org/
+:Download: http://pypi.python.org/pypi/case/
+:Source: http://github.com/celery/case/
+:Keywords: testing utilities, python, unittest, mock
+
+About
+=====
+
+.. _case-installation:
+
+Installation
+============
+
+You can install case either via the Python Package Index (PyPI)
+or from source.
+
+To install using `pip`,::
+
+    $ pip install -U case
+
+To install using `easy_install`,::
+
+    $ easy_install -U case
+
+.. _case-installing-from-source:
+
+Downloading and installing from source
+--------------------------------------
+
+Download the latest version of case from
+http://pypi.python.org/pypi/case/
+
+You can install it by doing the following,::
+
+    $ tar xvfz case-0.0.0.tar.gz
+    $ cd case-0.0.0
+    $ python setup.py build
+    # python setup.py install
+
+The last command must be executed as a privileged user if
+you are not currently using a virtualenv.
+
+.. _case-installing-from-git:
+
+Using the development version
+-----------------------------
+
+With pip
+~~~~~~~~
+
+You can install the latest snapshot of case using the following
+pip command::
+
+    $ pip install https://github.com/celery/case/zipball/master#egg=case
+
+.. |build-status| image:: https://secure.travis-ci.org/celery/case.png?branch=master
+    :alt: Build status
+    :target: https://travis-ci.org/celery/case
+
+.. |coverage| image:: https://codecov.io/github/celery/case/coverage.svg?branch=master
+    :target: https://codecov.io/github/celery/case?branch=master
+
+.. |license| image:: https://img.shields.io/pypi/l/case.svg
+    :alt: BSD License
+    :target: https://opensource.org/licenses/BSD-3-Clause
+
+.. |wheel| image:: https://img.shields.io/pypi/wheel/case.svg
+    :alt: Case can be installed via wheel
+    :target: http://pypi.python.org/pypi/case/
+
+.. |pyversion| image:: https://img.shields.io/pypi/pyversions/case.svg
+    :alt: Supported Python versions.
+    :target: http://pypi.python.org/pypi/case/
+
+.. |pyimp| image:: https://img.shields.io/pypi/implementation/case.svg
+    :alt: Support Python implementations.
+    :target: http://pypi.python.org/pypi/case/
+
+
+
diff --git a/case.egg-info/PKG-INFO b/case.egg-info/PKG-INFO
new file mode 100644
index 0000000..de242df
--- /dev/null
+++ b/case.egg-info/PKG-INFO
@@ -0,0 +1,112 @@
+Metadata-Version: 2.1
+Name: case
+Version: 1.5.3
+Summary: Python unittest Utilities
+Home-page: http://github.com/celery/case
+Author: Ask Solem
+Author-email: ask@celeryproject.org
+License: BSD
+Keywords: test unit testing pytest unittest mock patch
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+License-File: LICENSE
+License-File: AUTHORS
+
+=====================================================================
+ Python unittest utilities
+=====================================================================
+
+|build-status| |coverage| |license| |wheel| |pyversion| |pyimp|
+
+:Version: 1.5.3
+:Web: http://case.readthedocs.org/
+:Download: http://pypi.python.org/pypi/case/
+:Source: http://github.com/celery/case/
+:Keywords: testing utilities, python, unittest, mock
+
+About
+=====
+
+.. _case-installation:
+
+Installation
+============
+
+You can install case either via the Python Package Index (PyPI)
+or from source.
+
+To install using `pip`,::
+
+    $ pip install -U case
+
+To install using `easy_install`,::
+
+    $ easy_install -U case
+
+.. _case-installing-from-source:
+
+Downloading and installing from source
+--------------------------------------
+
+Download the latest version of case from
+http://pypi.python.org/pypi/case/
+
+You can install it by doing the following,::
+
+    $ tar xvfz case-0.0.0.tar.gz
+    $ cd case-0.0.0
+    $ python setup.py build
+    # python setup.py install
+
+The last command must be executed as a privileged user if
+you are not currently using a virtualenv.
+
+.. _case-installing-from-git:
+
+Using the development version
+-----------------------------
+
+With pip
+~~~~~~~~
+
+You can install the latest snapshot of case using the following
+pip command::
+
+    $ pip install https://github.com/celery/case/zipball/master#egg=case
+
+.. |build-status| image:: https://secure.travis-ci.org/celery/case.png?branch=master
+    :alt: Build status
+    :target: https://travis-ci.org/celery/case
+
+.. |coverage| image:: https://codecov.io/github/celery/case/coverage.svg?branch=master
+    :target: https://codecov.io/github/celery/case?branch=master
+
+.. |license| image:: https://img.shields.io/pypi/l/case.svg
+    :alt: BSD License
+    :target: https://opensource.org/licenses/BSD-3-Clause
+
+.. |wheel| image:: https://img.shields.io/pypi/wheel/case.svg
+    :alt: Case can be installed via wheel
+    :target: http://pypi.python.org/pypi/case/
+
+.. |pyversion| image:: https://img.shields.io/pypi/pyversions/case.svg
+    :alt: Supported Python versions.
+    :target: http://pypi.python.org/pypi/case/
+
+.. |pyimp| image:: https://img.shields.io/pypi/implementation/case.svg
+    :alt: Support Python implementations.
+    :target: http://pypi.python.org/pypi/case/
+
+
+
diff --git a/case.egg-info/SOURCES.txt b/case.egg-info/SOURCES.txt
new file mode 100644
index 0000000..7a9f90b
--- /dev/null
+++ b/case.egg-info/SOURCES.txt
@@ -0,0 +1,50 @@
+AUTHORS
+Changelog
+LICENSE
+MANIFEST.in
+README.rst
+setup.cfg
+setup.py
+case/__init__.py
+case/case.py
+case/mock.py
+case/pytest.py
+case/skip.py
+case/utils.py
+case.egg-info/PKG-INFO
+case.egg-info/SOURCES.txt
+case.egg-info/dependency_links.txt
+case.egg-info/entry_points.txt
+case.egg-info/not-zip-safe
+case.egg-info/requires.txt
+case.egg-info/top_level.txt
+case/tests/__init__.py
+docs/Makefile
+docs/changelog.rst
+docs/conf.py
+docs/index.rst
+docs/make.bat
+docs/_static/.keep
+docs/_templates/sidebardonations.html
+docs/images/celery_128.png
+docs/images/favicon.ico
+docs/includes/installation.txt
+docs/includes/introduction.txt
+docs/reference/case.case.rst
+docs/reference/case.mock.rst
+docs/reference/case.pytest.rst
+docs/reference/case.rst
+docs/reference/case.skip.rst
+docs/reference/case.utils.rst
+docs/reference/index.rst
+docs/templates/readme.txt
+requirements/default.txt
+requirements/docs.txt
+requirements/pkgutils.txt
+requirements/py2.txt
+requirements/py26.txt
+requirements/pypy3.txt
+requirements/test-ci.txt
+requirements/test.txt
+requirements/deps/mock.txt
+requirements/deps/nose.txt
\ No newline at end of file
diff --git a/case.egg-info/dependency_links.txt b/case.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/case.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/case.egg-info/entry_points.txt b/case.egg-info/entry_points.txt
new file mode 100644
index 0000000..f4fcd6a
--- /dev/null
+++ b/case.egg-info/entry_points.txt
@@ -0,0 +1,3 @@
+[pytest11]
+case = case.pytest
+
diff --git a/case.egg-info/not-zip-safe b/case.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/case.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/case.egg-info/requires.txt b/case.egg-info/requires.txt
new file mode 100644
index 0000000..e0341ff
--- /dev/null
+++ b/case.egg-info/requires.txt
@@ -0,0 +1,3 @@
+nose>=1.3.7
+setuptools>=0.7
+six
diff --git a/case.egg-info/top_level.txt b/case.egg-info/top_level.txt
new file mode 100644
index 0000000..9a33383
--- /dev/null
+++ b/case.egg-info/top_level.txt
@@ -0,0 +1 @@
+case
diff --git a/requirements/py2.txt b/requirements/py2.txt
index 1ab72ba..dc9901d 100644
--- a/requirements/py2.txt
+++ b/requirements/py2.txt
@@ -1,2 +1 @@
 -r deps/mock.txt
-unittest2>=0.5.1
diff --git a/requirements/py26.txt b/requirements/py26.txt
index ed3fe37..a56bc45 100644
--- a/requirements/py26.txt
+++ b/requirements/py26.txt
@@ -1 +1,2 @@
 importlib
+unittest2>=0.5.1
diff --git a/setup.cfg b/setup.cfg
index a619b5f..4690950 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,5 +13,4 @@ universal = 1
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0