diff --git a/tests/pypi/alembic/alembic-0.9.8.tar.gz b/tests/pypi2/alembic/alembic-0.9.8.tar.gz
similarity index 100%
rename from tests/pypi/alembic/alembic-0.9.8.tar.gz
rename to tests/pypi2/alembic/alembic-0.9.8.tar.gz
diff --git a/tests/pypi/certifi/certifi-2018.1.18-py2.py3-none-any.whl b/tests/pypi2/certifi/certifi-2018.1.18-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/certifi/certifi-2018.1.18-py2.py3-none-any.whl
rename to tests/pypi2/certifi/certifi-2018.1.18-py2.py3-none-any.whl
diff --git a/tests/pypi/certifi/certifi-2018.1.18.tar.gz b/tests/pypi2/certifi/certifi-2018.1.18.tar.gz
similarity index 100%
rename from tests/pypi/certifi/certifi-2018.1.18.tar.gz
rename to tests/pypi2/certifi/certifi-2018.1.18.tar.gz
diff --git a/tests/pypi/chardet/chardet-3.0.4-py2.py3-none-any.whl b/tests/pypi2/chardet/chardet-3.0.4-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/chardet/chardet-3.0.4-py2.py3-none-any.whl
rename to tests/pypi2/chardet/chardet-3.0.4-py2.py3-none-any.whl
diff --git a/tests/pypi/chardet/chardet-3.0.4.tar.gz b/tests/pypi2/chardet/chardet-3.0.4.tar.gz
similarity index 100%
rename from tests/pypi/chardet/chardet-3.0.4.tar.gz
rename to tests/pypi2/chardet/chardet-3.0.4.tar.gz
diff --git a/tests/pypi/django-classy-tags/django-classy-tags-0.8.0.tar.gz b/tests/pypi2/django-classy-tags/django-classy-tags-0.8.0.tar.gz
similarity index 100%
rename from tests/pypi/django-classy-tags/django-classy-tags-0.8.0.tar.gz
rename to tests/pypi2/django-classy-tags/django-classy-tags-0.8.0.tar.gz
diff --git a/tests/pypi/django-classy-tags/django_classy_tags-0.8.0-py2.py3-none-any.whl b/tests/pypi2/django-classy-tags/django_classy_tags-0.8.0-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/django-classy-tags/django_classy_tags-0.8.0-py2.py3-none-any.whl
rename to tests/pypi2/django-classy-tags/django_classy_tags-0.8.0-py2.py3-none-any.whl
diff --git a/tests/pypi/django-formtools/django-formtools-2.1.tar.gz b/tests/pypi2/django-formtools/django-formtools-2.1.tar.gz
similarity index 100%
rename from tests/pypi/django-formtools/django-formtools-2.1.tar.gz
rename to tests/pypi2/django-formtools/django-formtools-2.1.tar.gz
diff --git a/tests/pypi/django-formtools/django_formtools-2.1-py2.py3-none-any.whl b/tests/pypi2/django-formtools/django_formtools-2.1-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/django-formtools/django_formtools-2.1-py2.py3-none-any.whl
rename to tests/pypi2/django-formtools/django_formtools-2.1-py2.py3-none-any.whl
diff --git a/tests/pypi/django-treebeard/django-treebeard-4.2.0.tar.gz b/tests/pypi2/django-treebeard/django-treebeard-4.2.0.tar.gz
similarity index 100%
rename from tests/pypi/django-treebeard/django-treebeard-4.2.0.tar.gz
rename to tests/pypi2/django-treebeard/django-treebeard-4.2.0.tar.gz
diff --git a/tests/pypi/Django/Django-1.11.10-py2.py3-none-any.whl b/tests/pypi2/django/Django-1.11.10-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/Django/Django-1.11.10-py2.py3-none-any.whl
rename to tests/pypi2/django/Django-1.11.10-py2.py3-none-any.whl
diff --git a/tests/pypi/Django/Django-1.11.10.tar.gz b/tests/pypi2/django/Django-1.11.10.tar.gz
similarity index 100%
rename from tests/pypi/Django/Django-1.11.10.tar.gz
rename to tests/pypi2/django/Django-1.11.10.tar.gz
diff --git a/tests/pypi/docopt/docopt-0.6.2.tar.gz b/tests/pypi2/docopt/docopt-0.6.2.tar.gz
similarity index 100%
rename from tests/pypi/docopt/docopt-0.6.2.tar.gz
rename to tests/pypi2/docopt/docopt-0.6.2.tar.gz
diff --git a/tests/pypi/et-xmlfile/et_xmlfile-1.0.1.tar.gz b/tests/pypi2/et-xmlfile/et_xmlfile-1.0.1.tar.gz
similarity index 100%
rename from tests/pypi/et-xmlfile/et_xmlfile-1.0.1.tar.gz
rename to tests/pypi2/et-xmlfile/et_xmlfile-1.0.1.tar.gz
diff --git a/tests/pypi/gitdb2/gitdb2-2.0.3-py2.py3-none-any.whl b/tests/pypi2/gitdb2/gitdb2-2.0.3-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/gitdb2/gitdb2-2.0.3-py2.py3-none-any.whl
rename to tests/pypi2/gitdb2/gitdb2-2.0.3-py2.py3-none-any.whl
diff --git a/tests/pypi/gitdb2/gitdb2-2.0.3.tar.gz b/tests/pypi2/gitdb2/gitdb2-2.0.3.tar.gz
similarity index 100%
rename from tests/pypi/gitdb2/gitdb2-2.0.3.tar.gz
rename to tests/pypi2/gitdb2/gitdb2-2.0.3.tar.gz
diff --git a/tests/pypi/idna/idna-2.6-py2.py3-none-any.whl b/tests/pypi2/idna/idna-2.6-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/idna/idna-2.6-py2.py3-none-any.whl
rename to tests/pypi2/idna/idna-2.6-py2.py3-none-any.whl
diff --git a/tests/pypi/idna/idna-2.6.tar.gz b/tests/pypi2/idna/idna-2.6.tar.gz
similarity index 100%
rename from tests/pypi/idna/idna-2.6.tar.gz
rename to tests/pypi2/idna/idna-2.6.tar.gz
diff --git a/tests/pypi/jdcal/jdcal-1.3.tar.gz b/tests/pypi2/jdcal/jdcal-1.3.tar.gz
similarity index 100%
rename from tests/pypi/jdcal/jdcal-1.3.tar.gz
rename to tests/pypi2/jdcal/jdcal-1.3.tar.gz
diff --git a/tests/pypi/mako/Mako-1.0.7.tar.gz b/tests/pypi2/mako/Mako-1.0.7.tar.gz
similarity index 100%
rename from tests/pypi/mako/Mako-1.0.7.tar.gz
rename to tests/pypi2/mako/Mako-1.0.7.tar.gz
diff --git a/tests/pypi/markupsafe/MarkupSafe-1.0.tar.gz b/tests/pypi2/markupsafe/MarkupSafe-1.0.tar.gz
similarity index 100%
rename from tests/pypi/markupsafe/MarkupSafe-1.0.tar.gz
rename to tests/pypi2/markupsafe/MarkupSafe-1.0.tar.gz
diff --git a/tests/pypi/odfpy/odfpy-1.3.6-py2.7.egg b/tests/pypi2/odfpy/odfpy-1.3.6-py2.7.egg
similarity index 100%
rename from tests/pypi/odfpy/odfpy-1.3.6-py2.7.egg
rename to tests/pypi2/odfpy/odfpy-1.3.6-py2.7.egg
diff --git a/tests/pypi/odfpy/odfpy-1.3.6.tar.gz b/tests/pypi2/odfpy/odfpy-1.3.6.tar.gz
similarity index 100%
rename from tests/pypi/odfpy/odfpy-1.3.6.tar.gz
rename to tests/pypi2/odfpy/odfpy-1.3.6.tar.gz
diff --git a/tests/pypi/openpyxl/openpyxl-2.5.0.tar.gz b/tests/pypi2/openpyxl/openpyxl-2.5.0.tar.gz
similarity index 100%
rename from tests/pypi/openpyxl/openpyxl-2.5.0.tar.gz
rename to tests/pypi2/openpyxl/openpyxl-2.5.0.tar.gz
diff --git a/tests/pypi/PySocks/PySocks-1.6.8.tar.gz b/tests/pypi2/pysocks/PySocks-1.6.8.tar.gz
similarity index 100%
rename from tests/pypi/PySocks/PySocks-1.6.8.tar.gz
rename to tests/pypi2/pysocks/PySocks-1.6.8.tar.gz
diff --git a/tests/pypi/python-dateutil/python-dateutil-2.6.1.tar.gz b/tests/pypi2/python-dateutil/python-dateutil-2.6.1.tar.gz
similarity index 100%
rename from tests/pypi/python-dateutil/python-dateutil-2.6.1.tar.gz
rename to tests/pypi2/python-dateutil/python-dateutil-2.6.1.tar.gz
diff --git a/tests/pypi/python-dateutil/python_dateutil-2.6.1-py2.py3-none-any.whl b/tests/pypi2/python-dateutil/python_dateutil-2.6.1-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/python-dateutil/python_dateutil-2.6.1-py2.py3-none-any.whl
rename to tests/pypi2/python-dateutil/python_dateutil-2.6.1-py2.py3-none-any.whl
diff --git a/tests/pypi/python-editor/python-editor-1.0.3.tar.gz b/tests/pypi2/python-editor/python-editor-1.0.3.tar.gz
similarity index 100%
rename from tests/pypi/python-editor/python-editor-1.0.3.tar.gz
rename to tests/pypi2/python-editor/python-editor-1.0.3.tar.gz
diff --git a/tests/pypi/pyyaml/PyYAML-3.12.tar.gz b/tests/pypi2/pyyaml/PyYAML-3.12.tar.gz
similarity index 100%
rename from tests/pypi/pyyaml/PyYAML-3.12.tar.gz
rename to tests/pypi2/pyyaml/PyYAML-3.12.tar.gz
diff --git a/tests/pypi/records/records-0.5.2-py2.py3-none-any.whl b/tests/pypi2/records/records-0.5.2-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/records/records-0.5.2-py2.py3-none-any.whl
rename to tests/pypi2/records/records-0.5.2-py2.py3-none-any.whl
diff --git a/tests/pypi/records/records-0.5.2.tar.gz b/tests/pypi2/records/records-0.5.2.tar.gz
similarity index 100%
rename from tests/pypi/records/records-0.5.2.tar.gz
rename to tests/pypi2/records/records-0.5.2.tar.gz
diff --git a/tests/pypi/requests/requests-1.0.0.tar.gz b/tests/pypi2/requests/requests-1.0.0.tar.gz
similarity index 100%
rename from tests/pypi/requests/requests-1.0.0.tar.gz
rename to tests/pypi2/requests/requests-1.0.0.tar.gz
diff --git a/tests/pypi/requests/requests-2.18.4-py2.py3-none-any.whl b/tests/pypi2/requests/requests-2.18.4-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/requests/requests-2.18.4-py2.py3-none-any.whl
rename to tests/pypi2/requests/requests-2.18.4-py2.py3-none-any.whl
diff --git a/tests/pypi/requests/requests-2.18.4.tar.gz b/tests/pypi2/requests/requests-2.18.4.tar.gz
similarity index 100%
rename from tests/pypi/requests/requests-2.18.4.tar.gz
rename to tests/pypi2/requests/requests-2.18.4.tar.gz
diff --git a/tests/pypi/six/six-1.11.0-py2.py3-none-any.whl b/tests/pypi2/six/six-1.11.0-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/six/six-1.11.0-py2.py3-none-any.whl
rename to tests/pypi2/six/six-1.11.0-py2.py3-none-any.whl
diff --git a/tests/pypi/six/six-1.11.0.tar.gz b/tests/pypi2/six/six-1.11.0.tar.gz
similarity index 100%
rename from tests/pypi/six/six-1.11.0.tar.gz
rename to tests/pypi2/six/six-1.11.0.tar.gz
diff --git a/tests/pypi/smmap2/smmap2-2.0.3-py2.py3-none-any.whl b/tests/pypi2/smmap2/smmap2-2.0.3-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/smmap2/smmap2-2.0.3-py2.py3-none-any.whl
rename to tests/pypi2/smmap2/smmap2-2.0.3-py2.py3-none-any.whl
diff --git a/tests/pypi/smmap2/smmap2-2.0.3.tar.gz b/tests/pypi2/smmap2/smmap2-2.0.3.tar.gz
similarity index 100%
rename from tests/pypi/smmap2/smmap2-2.0.3.tar.gz
rename to tests/pypi2/smmap2/smmap2-2.0.3.tar.gz
diff --git a/tests/pypi/SQLAlchemy/SQLAlchemy-1.2.4.tar.gz b/tests/pypi2/sqlalchemy/SQLAlchemy-1.2.4.tar.gz
similarity index 100%
rename from tests/pypi/SQLAlchemy/SQLAlchemy-1.2.4.tar.gz
rename to tests/pypi2/sqlalchemy/SQLAlchemy-1.2.4.tar.gz
diff --git a/tests/pypi/tablib/tablib-0.12.1.tar.gz b/tests/pypi2/tablib/tablib-0.12.1.tar.gz
similarity index 100%
rename from tests/pypi/tablib/tablib-0.12.1.tar.gz
rename to tests/pypi2/tablib/tablib-0.12.1.tar.gz
diff --git a/tests/pypi/unicodecsv/unicodecsv-0.14.1.tar.gz b/tests/pypi2/unicodecsv/unicodecsv-0.14.1.tar.gz
similarity index 100%
rename from tests/pypi/unicodecsv/unicodecsv-0.14.1.tar.gz
rename to tests/pypi2/unicodecsv/unicodecsv-0.14.1.tar.gz
diff --git a/tests/pypi/urllib3/urllib3-1.22-py2.py3-none-any.whl b/tests/pypi2/urllib3/urllib3-1.22-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/urllib3/urllib3-1.22-py2.py3-none-any.whl
rename to tests/pypi2/urllib3/urllib3-1.22-py2.py3-none-any.whl
diff --git a/tests/pypi/urllib3/urllib3-1.22.tar.gz b/tests/pypi2/urllib3/urllib3-1.22.tar.gz
similarity index 100%
rename from tests/pypi/urllib3/urllib3-1.22.tar.gz
rename to tests/pypi2/urllib3/urllib3-1.22.tar.gz
diff --git a/tests/pypi/xlrd/xlrd-1.1.0-py2.py3-none-any.whl b/tests/pypi2/xlrd/xlrd-1.1.0-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/xlrd/xlrd-1.1.0-py2.py3-none-any.whl
rename to tests/pypi2/xlrd/xlrd-1.1.0-py2.py3-none-any.whl
diff --git a/tests/pypi/xlrd/xlrd-1.1.0.tar.gz b/tests/pypi2/xlrd/xlrd-1.1.0.tar.gz
similarity index 100%
rename from tests/pypi/xlrd/xlrd-1.1.0.tar.gz
rename to tests/pypi2/xlrd/xlrd-1.1.0.tar.gz
diff --git a/tests/pypi/xlwt/xlwt-1.3.0-py2.py3-none-any.whl b/tests/pypi2/xlwt/xlwt-1.3.0-py2.py3-none-any.whl
similarity index 100%
rename from tests/pypi/xlwt/xlwt-1.3.0-py2.py3-none-any.whl
rename to tests/pypi2/xlwt/xlwt-1.3.0-py2.py3-none-any.whl
diff --git a/tests/pypi/xlwt/xlwt-1.3.0.tar.gz b/tests/pypi2/xlwt/xlwt-1.3.0.tar.gz
similarity index 100%
rename from tests/pypi/xlwt/xlwt-1.3.0.tar.gz
rename to tests/pypi2/xlwt/xlwt-1.3.0.tar.gz