diff --git a/pandas/api/tests/__init__.py b/pandas/tests/api/__init__.py
similarity index 100%
rename from pandas/api/tests/__init__.py
rename to pandas/tests/api/__init__.py
diff --git a/pandas/api/tests/test_api.py b/pandas/tests/api/test_api.py
similarity index 99%
rename from pandas/api/tests/test_api.py
rename to pandas/tests/api/test_api.py
index 05cf5dc4b7e7b..90a0c1d5c9347 100644
--- a/pandas/api/tests/test_api.py
+++ b/pandas/tests/api/test_api.py
@@ -133,7 +133,7 @@ def test_api(self):
class TestApi(Base, tm.TestCase):
- allowed = ['tests', 'types']
+ allowed = ['types']
def test_api(self):
diff --git a/pandas/computation/tests/__init__.py b/pandas/tests/computation/__init__.py
similarity index 100%
rename from pandas/computation/tests/__init__.py
rename to pandas/tests/computation/__init__.py
diff --git a/pandas/computation/tests/test_compat.py b/pandas/tests/computation/test_compat.py
similarity index 100%
rename from pandas/computation/tests/test_compat.py
rename to pandas/tests/computation/test_compat.py
diff --git a/pandas/computation/tests/test_eval.py b/pandas/tests/computation/test_eval.py
similarity index 100%
rename from pandas/computation/tests/test_eval.py
rename to pandas/tests/computation/test_eval.py
diff --git a/pandas/tests/indexes/datetimes/test_ops.py b/pandas/tests/indexes/datetimes/test_ops.py
index 63bf07ec041d3..9a968a42c4247 100644
--- a/pandas/tests/indexes/datetimes/test_ops.py
+++ b/pandas/tests/indexes/datetimes/test_ops.py
@@ -1245,7 +1245,8 @@ def test_shift(self):
self.assertEqual(shifted[0], self.rng[0])
self.assertEqual(shifted.offset, self.rng.offset)
- with tm.assert_produces_warning(PerformanceWarning):
+ # PerformanceWarning
+ with warnings.catch_warnings(record=True):
rng = date_range(START, END, freq=BMonthEnd())
shifted = rng.shift(1, freq=CDay())
self.assertEqual(shifted[0], rng[0] + CDay())
diff --git a/pandas/io/tests/__init__.py b/pandas/tests/io/__init__.py
similarity index 100%
rename from pandas/io/tests/__init__.py
rename to pandas/tests/io/__init__.py
diff --git a/pandas/io/tests/data/S4_EDUC1.dta b/pandas/tests/io/data/S4_EDUC1.dta
similarity index 100%
rename from pandas/io/tests/data/S4_EDUC1.dta
rename to pandas/tests/io/data/S4_EDUC1.dta
diff --git a/pandas/io/tests/data/banklist.csv b/pandas/tests/io/data/banklist.csv
similarity index 100%
rename from pandas/io/tests/data/banklist.csv
rename to pandas/tests/io/data/banklist.csv
diff --git a/pandas/io/tests/data/banklist.html b/pandas/tests/io/data/banklist.html
similarity index 100%
rename from pandas/io/tests/data/banklist.html
rename to pandas/tests/io/data/banklist.html
diff --git a/pandas/io/tests/data/blank.xls b/pandas/tests/io/data/blank.xls
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/blank.xls
rename to pandas/tests/io/data/blank.xls
diff --git a/pandas/io/tests/data/blank.xlsm b/pandas/tests/io/data/blank.xlsm
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/blank.xlsm
rename to pandas/tests/io/data/blank.xlsm
diff --git a/pandas/io/tests/data/blank.xlsx b/pandas/tests/io/data/blank.xlsx
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/blank.xlsx
rename to pandas/tests/io/data/blank.xlsx
diff --git a/pandas/io/tests/data/blank_with_header.xls b/pandas/tests/io/data/blank_with_header.xls
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/blank_with_header.xls
rename to pandas/tests/io/data/blank_with_header.xls
diff --git a/pandas/io/tests/data/blank_with_header.xlsm b/pandas/tests/io/data/blank_with_header.xlsm
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/blank_with_header.xlsm
rename to pandas/tests/io/data/blank_with_header.xlsm
diff --git a/pandas/io/tests/data/blank_with_header.xlsx b/pandas/tests/io/data/blank_with_header.xlsx
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/blank_with_header.xlsx
rename to pandas/tests/io/data/blank_with_header.xlsx
diff --git a/pandas/io/tests/data/categorical_0_14_1.pickle b/pandas/tests/io/data/categorical_0_14_1.pickle
similarity index 100%
rename from pandas/io/tests/data/categorical_0_14_1.pickle
rename to pandas/tests/io/data/categorical_0_14_1.pickle
diff --git a/pandas/io/tests/data/categorical_0_15_2.pickle b/pandas/tests/io/data/categorical_0_15_2.pickle
similarity index 100%
rename from pandas/io/tests/data/categorical_0_15_2.pickle
rename to pandas/tests/io/data/categorical_0_15_2.pickle
diff --git a/pandas/io/tests/data/computer_sales_page.html b/pandas/tests/io/data/computer_sales_page.html
similarity index 100%
rename from pandas/io/tests/data/computer_sales_page.html
rename to pandas/tests/io/data/computer_sales_page.html
diff --git a/pandas/io/tests/data/gbq_fake_job.txt b/pandas/tests/io/data/gbq_fake_job.txt
similarity index 100%
rename from pandas/io/tests/data/gbq_fake_job.txt
rename to pandas/tests/io/data/gbq_fake_job.txt
diff --git a/pandas/io/tests/data/html_encoding/chinese_utf-16.html b/pandas/tests/io/data/html_encoding/chinese_utf-16.html
similarity index 100%
rename from pandas/io/tests/data/html_encoding/chinese_utf-16.html
rename to pandas/tests/io/data/html_encoding/chinese_utf-16.html
diff --git a/pandas/io/tests/data/html_encoding/chinese_utf-32.html b/pandas/tests/io/data/html_encoding/chinese_utf-32.html
similarity index 100%
rename from pandas/io/tests/data/html_encoding/chinese_utf-32.html
rename to pandas/tests/io/data/html_encoding/chinese_utf-32.html
diff --git a/pandas/io/tests/data/html_encoding/chinese_utf-8.html b/pandas/tests/io/data/html_encoding/chinese_utf-8.html
similarity index 100%
rename from pandas/io/tests/data/html_encoding/chinese_utf-8.html
rename to pandas/tests/io/data/html_encoding/chinese_utf-8.html
diff --git a/pandas/io/tests/data/html_encoding/letz_latin1.html b/pandas/tests/io/data/html_encoding/letz_latin1.html
similarity index 100%
rename from pandas/io/tests/data/html_encoding/letz_latin1.html
rename to pandas/tests/io/data/html_encoding/letz_latin1.html
diff --git a/pandas/io/tests/data/iris.csv b/pandas/tests/io/data/iris.csv
similarity index 100%
rename from pandas/io/tests/data/iris.csv
rename to pandas/tests/io/data/iris.csv
diff --git a/pandas/io/tests/data/legacy_hdf/datetimetz_object.h5 b/pandas/tests/io/data/legacy_hdf/datetimetz_object.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/datetimetz_object.h5
rename to pandas/tests/io/data/legacy_hdf/datetimetz_object.h5
diff --git a/pandas/io/tests/data/legacy_hdf/legacy.h5 b/pandas/tests/io/data/legacy_hdf/legacy.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/legacy.h5
rename to pandas/tests/io/data/legacy_hdf/legacy.h5
diff --git a/pandas/io/tests/data/legacy_hdf/legacy_0.10.h5 b/pandas/tests/io/data/legacy_hdf/legacy_0.10.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/legacy_0.10.h5
rename to pandas/tests/io/data/legacy_hdf/legacy_0.10.h5
diff --git a/pandas/io/tests/data/legacy_hdf/legacy_table.h5 b/pandas/tests/io/data/legacy_hdf/legacy_table.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/legacy_table.h5
rename to pandas/tests/io/data/legacy_hdf/legacy_table.h5
diff --git a/pandas/io/tests/data/legacy_hdf/legacy_table_0.11.h5 b/pandas/tests/io/data/legacy_hdf/legacy_table_0.11.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/legacy_table_0.11.h5
rename to pandas/tests/io/data/legacy_hdf/legacy_table_0.11.h5
diff --git a/pandas/io/tests/data/legacy_hdf/pytables_native.h5 b/pandas/tests/io/data/legacy_hdf/pytables_native.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/pytables_native.h5
rename to pandas/tests/io/data/legacy_hdf/pytables_native.h5
diff --git a/pandas/io/tests/data/legacy_hdf/pytables_native2.h5 b/pandas/tests/io/data/legacy_hdf/pytables_native2.h5
similarity index 100%
rename from pandas/io/tests/data/legacy_hdf/pytables_native2.h5
rename to pandas/tests/io/data/legacy_hdf/pytables_native2.h5
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.0/0.16.0_x86_64_darwin_2.7.9.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.0/0.16.0_x86_64_darwin_2.7.9.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.0/0.16.0_x86_64_darwin_2.7.9.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.0/0.16.0_x86_64_darwin_2.7.9.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_2.7.10.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_2.7.10.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_2.7.10.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_2.7.10.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_3.4.3.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_3.4.3.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_3.4.3.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_AMD64_windows_3.4.3.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.10.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.10.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.10.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.10.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.9.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.9.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.9.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_2.7.9.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_3.4.3.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_3.4.3.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_3.4.3.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_darwin_3.4.3.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_2.7.10.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_2.7.10.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_2.7.10.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_2.7.10.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_3.4.3.msgpack b/pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_3.4.3.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_3.4.3.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.16.2/0.16.2_x86_64_linux_3.4.3.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_3.4.4.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_3.4.4.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_3.4.4.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_AMD64_windows_3.4.4.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_3.4.4.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_3.4.4.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_3.4.4.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_darwin_3.4.4.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_3.4.4.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_3.4.4.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_3.4.4.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.0_x86_64_linux_3.4.4.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_3.5.1.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_3.5.1.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_3.5.1.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.0/0.17.1_AMD64_windows_3.5.1.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_3.5.1.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_3.5.1.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_3.5.1.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_AMD64_windows_3.5.1.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_3.5.1.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_3.5.1.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_3.5.1.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_darwin_3.5.1.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_3.4.4.msgpack b/pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_3.4.4.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_3.4.4.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.17.1/0.17.1_x86_64_linux_3.4.4.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_3.5.1.msgpack b/pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_3.5.1.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_3.5.1.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_AMD64_windows_3.5.1.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_2.7.11.msgpack b/pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_2.7.11.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_2.7.11.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_2.7.11.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_3.5.1.msgpack b/pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_3.5.1.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_3.5.1.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.18.0/0.18.0_x86_64_darwin_3.5.1.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_2.7.12.msgpack b/pandas/tests/io/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_2.7.12.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_2.7.12.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_2.7.12.msgpack
diff --git a/pandas/io/tests/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_3.5.2.msgpack b/pandas/tests/io/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_3.5.2.msgpack
similarity index 100%
rename from pandas/io/tests/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_3.5.2.msgpack
rename to pandas/tests/io/data/legacy_msgpack/0.18.1/0.18.1_x86_64_darwin_3.5.2.msgpack
diff --git a/pandas/io/tests/data/legacy_pickle/0.10.1/AMD64_windows_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.10.1/AMD64_windows_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.10.1/AMD64_windows_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.10.1/AMD64_windows_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.10.1/x86_64_linux_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.10.1/x86_64_linux_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.10.1/x86_64_linux_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.10.1/x86_64_linux_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.11.0/0.11.0_x86_64_linux_3.3.0.pickle b/pandas/tests/io/data/legacy_pickle/0.11.0/0.11.0_x86_64_linux_3.3.0.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.11.0/0.11.0_x86_64_linux_3.3.0.pickle
rename to pandas/tests/io/data/legacy_pickle/0.11.0/0.11.0_x86_64_linux_3.3.0.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.11.0/x86_64_linux_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.11.0/x86_64_linux_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.11.0/x86_64_linux_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.11.0/x86_64_linux_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.11.0/x86_64_linux_3.3.0.pickle b/pandas/tests/io/data/legacy_pickle/0.11.0/x86_64_linux_3.3.0.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.11.0/x86_64_linux_3.3.0.pickle
rename to pandas/tests/io/data/legacy_pickle/0.11.0/x86_64_linux_3.3.0.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.12.0/0.12.0_AMD64_windows_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.12.0/0.12.0_AMD64_windows_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.12.0/0.12.0_AMD64_windows_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.12.0/0.12.0_AMD64_windows_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.12.0/0.12.0_x86_64_linux_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.12.0/0.12.0_x86_64_linux_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.12.0/0.12.0_x86_64_linux_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.12.0/0.12.0_x86_64_linux_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_AMD64_windows_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_AMD64_windows_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_AMD64_windows_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_AMD64_windows_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.6.5.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.6.5.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.6.5.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.6.5.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_i686_linux_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_i686_linux_3.2.3.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_i686_linux_3.2.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_i686_linux_3.2.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_i686_linux_3.2.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.5.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.5.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.5.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.5.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.6.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.6.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.6.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_darwin_2.7.6.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.3.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.8.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.8.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.8.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_2.7.8.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_3.3.0.pickle b/pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_3.3.0.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_3.3.0.pickle
rename to pandas/tests/io/data/legacy_pickle/0.13.0/0.13.0_x86_64_linux_3.3.0.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.14.0/0.14.0_x86_64_darwin_2.7.6.pickle b/pandas/tests/io/data/legacy_pickle/0.14.0/0.14.0_x86_64_darwin_2.7.6.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.14.0/0.14.0_x86_64_darwin_2.7.6.pickle
rename to pandas/tests/io/data/legacy_pickle/0.14.0/0.14.0_x86_64_darwin_2.7.6.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.14.0/0.14.0_x86_64_linux_2.7.8.pickle b/pandas/tests/io/data/legacy_pickle/0.14.0/0.14.0_x86_64_linux_2.7.8.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.14.0/0.14.0_x86_64_linux_2.7.8.pickle
rename to pandas/tests/io/data/legacy_pickle/0.14.0/0.14.0_x86_64_linux_2.7.8.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.14.1/0.14.1_x86_64_darwin_2.7.12.pickle b/pandas/tests/io/data/legacy_pickle/0.14.1/0.14.1_x86_64_darwin_2.7.12.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.14.1/0.14.1_x86_64_darwin_2.7.12.pickle
rename to pandas/tests/io/data/legacy_pickle/0.14.1/0.14.1_x86_64_darwin_2.7.12.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.14.1/0.14.1_x86_64_linux_2.7.8.pickle b/pandas/tests/io/data/legacy_pickle/0.14.1/0.14.1_x86_64_linux_2.7.8.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.14.1/0.14.1_x86_64_linux_2.7.8.pickle
rename to pandas/tests/io/data/legacy_pickle/0.14.1/0.14.1_x86_64_linux_2.7.8.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.15.0/0.15.0_x86_64_darwin_2.7.12.pickle b/pandas/tests/io/data/legacy_pickle/0.15.0/0.15.0_x86_64_darwin_2.7.12.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.15.0/0.15.0_x86_64_darwin_2.7.12.pickle
rename to pandas/tests/io/data/legacy_pickle/0.15.0/0.15.0_x86_64_darwin_2.7.12.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.15.0/0.15.0_x86_64_linux_2.7.8.pickle b/pandas/tests/io/data/legacy_pickle/0.15.0/0.15.0_x86_64_linux_2.7.8.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.15.0/0.15.0_x86_64_linux_2.7.8.pickle
rename to pandas/tests/io/data/legacy_pickle/0.15.0/0.15.0_x86_64_linux_2.7.8.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.15.2/0.15.2_x86_64_darwin_2.7.9.pickle b/pandas/tests/io/data/legacy_pickle/0.15.2/0.15.2_x86_64_darwin_2.7.9.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.15.2/0.15.2_x86_64_darwin_2.7.9.pickle
rename to pandas/tests/io/data/legacy_pickle/0.15.2/0.15.2_x86_64_darwin_2.7.9.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.0/0.16.0_x86_64_darwin_2.7.9.pickle b/pandas/tests/io/data/legacy_pickle/0.16.0/0.16.0_x86_64_darwin_2.7.9.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.0/0.16.0_x86_64_darwin_2.7.9.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.0/0.16.0_x86_64_darwin_2.7.9.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_2.7.10.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_2.7.10.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_2.7.10.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_2.7.10.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_3.4.3.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_3.4.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_3.4.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_AMD64_windows_3.4.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.10.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.10.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.10.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.10.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.9.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.9.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.9.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_2.7.9.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_3.4.3.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_3.4.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_3.4.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_darwin_3.4.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_2.7.10.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_2.7.10.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_2.7.10.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_2.7.10.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_3.4.3.pickle b/pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_3.4.3.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_3.4.3.pickle
rename to pandas/tests/io/data/legacy_pickle/0.16.2/0.16.2_x86_64_linux_3.4.3.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_3.4.4.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_3.4.4.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_3.4.4.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_AMD64_windows_3.4.4.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_3.4.4.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_3.4.4.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_3.4.4.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_darwin_3.4.4.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_3.4.4.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_3.4.4.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_3.4.4.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.0_x86_64_linux_3.4.4.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.0/0.17.1_AMD64_windows_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.17.0/0.17.1_AMD64_windows_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.0/0.17.1_AMD64_windows_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.0/0.17.1_AMD64_windows_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.1/0.17.1_AMD64_windows_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.17.1/0.17.1_AMD64_windows_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.1/0.17.1_AMD64_windows_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.1/0.17.1_AMD64_windows_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.17.1/0.17.1_x86_64_darwin_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.17.1/0.17.1_x86_64_darwin_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.17.1/0.17.1_x86_64_darwin_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.17.1/0.17.1_x86_64_darwin_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_3.5.1.pickle b/pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_3.5.1.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_3.5.1.pickle
rename to pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_AMD64_windows_3.5.1.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_2.7.11.pickle b/pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_2.7.11.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_2.7.11.pickle
rename to pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_2.7.11.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_3.5.1.pickle b/pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_3.5.1.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_3.5.1.pickle
rename to pandas/tests/io/data/legacy_pickle/0.18.0/0.18.0_x86_64_darwin_3.5.1.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_2.7.12.pickle b/pandas/tests/io/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_2.7.12.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_2.7.12.pickle
rename to pandas/tests/io/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_2.7.12.pickle
diff --git a/pandas/io/tests/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_3.5.2.pickle b/pandas/tests/io/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_3.5.2.pickle
similarity index 100%
rename from pandas/io/tests/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_3.5.2.pickle
rename to pandas/tests/io/data/legacy_pickle/0.18.1/0.18.1_x86_64_darwin_3.5.2.pickle
diff --git a/pandas/io/tests/data/macau.html b/pandas/tests/io/data/macau.html
similarity index 100%
rename from pandas/io/tests/data/macau.html
rename to pandas/tests/io/data/macau.html
diff --git a/pandas/io/tests/data/nyse_wsj.html b/pandas/tests/io/data/nyse_wsj.html
similarity index 100%
rename from pandas/io/tests/data/nyse_wsj.html
rename to pandas/tests/io/data/nyse_wsj.html
diff --git a/pandas/io/tests/data/spam.html b/pandas/tests/io/data/spam.html
similarity index 100%
rename from pandas/io/tests/data/spam.html
rename to pandas/tests/io/data/spam.html
diff --git a/pandas/io/tests/data/stata10_115.dta b/pandas/tests/io/data/stata10_115.dta
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/stata10_115.dta
rename to pandas/tests/io/data/stata10_115.dta
diff --git a/pandas/io/tests/data/stata10_117.dta b/pandas/tests/io/data/stata10_117.dta
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/stata10_117.dta
rename to pandas/tests/io/data/stata10_117.dta
diff --git a/pandas/io/tests/data/stata11_115.dta b/pandas/tests/io/data/stata11_115.dta
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/stata11_115.dta
rename to pandas/tests/io/data/stata11_115.dta
diff --git a/pandas/io/tests/data/stata11_117.dta b/pandas/tests/io/data/stata11_117.dta
old mode 100755
new mode 100644
similarity index 100%
rename from pandas/io/tests/data/stata11_117.dta
rename to pandas/tests/io/data/stata11_117.dta
diff --git a/pandas/io/tests/data/stata12_117.dta b/pandas/tests/io/data/stata12_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata12_117.dta
rename to pandas/tests/io/data/stata12_117.dta
diff --git a/pandas/io/tests/data/stata14_118.dta b/pandas/tests/io/data/stata14_118.dta
similarity index 100%
rename from pandas/io/tests/data/stata14_118.dta
rename to pandas/tests/io/data/stata14_118.dta
diff --git a/pandas/io/tests/data/stata15.dta b/pandas/tests/io/data/stata15.dta
similarity index 100%
rename from pandas/io/tests/data/stata15.dta
rename to pandas/tests/io/data/stata15.dta
diff --git a/pandas/io/tests/data/stata1_114.dta b/pandas/tests/io/data/stata1_114.dta
similarity index 100%
rename from pandas/io/tests/data/stata1_114.dta
rename to pandas/tests/io/data/stata1_114.dta
diff --git a/pandas/io/tests/data/stata1_117.dta b/pandas/tests/io/data/stata1_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata1_117.dta
rename to pandas/tests/io/data/stata1_117.dta
diff --git a/pandas/io/tests/data/stata1_encoding.dta b/pandas/tests/io/data/stata1_encoding.dta
similarity index 100%
rename from pandas/io/tests/data/stata1_encoding.dta
rename to pandas/tests/io/data/stata1_encoding.dta
diff --git a/pandas/io/tests/data/stata2_113.dta b/pandas/tests/io/data/stata2_113.dta
similarity index 100%
rename from pandas/io/tests/data/stata2_113.dta
rename to pandas/tests/io/data/stata2_113.dta
diff --git a/pandas/io/tests/data/stata2_114.dta b/pandas/tests/io/data/stata2_114.dta
similarity index 100%
rename from pandas/io/tests/data/stata2_114.dta
rename to pandas/tests/io/data/stata2_114.dta
diff --git a/pandas/io/tests/data/stata2_115.dta b/pandas/tests/io/data/stata2_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata2_115.dta
rename to pandas/tests/io/data/stata2_115.dta
diff --git a/pandas/io/tests/data/stata2_117.dta b/pandas/tests/io/data/stata2_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata2_117.dta
rename to pandas/tests/io/data/stata2_117.dta
diff --git a/pandas/io/tests/data/stata3.csv b/pandas/tests/io/data/stata3.csv
similarity index 100%
rename from pandas/io/tests/data/stata3.csv
rename to pandas/tests/io/data/stata3.csv
diff --git a/pandas/io/tests/data/stata3_113.dta b/pandas/tests/io/data/stata3_113.dta
similarity index 100%
rename from pandas/io/tests/data/stata3_113.dta
rename to pandas/tests/io/data/stata3_113.dta
diff --git a/pandas/io/tests/data/stata3_114.dta b/pandas/tests/io/data/stata3_114.dta
similarity index 100%
rename from pandas/io/tests/data/stata3_114.dta
rename to pandas/tests/io/data/stata3_114.dta
diff --git a/pandas/io/tests/data/stata3_115.dta b/pandas/tests/io/data/stata3_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata3_115.dta
rename to pandas/tests/io/data/stata3_115.dta
diff --git a/pandas/io/tests/data/stata3_117.dta b/pandas/tests/io/data/stata3_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata3_117.dta
rename to pandas/tests/io/data/stata3_117.dta
diff --git a/pandas/io/tests/data/stata4_113.dta b/pandas/tests/io/data/stata4_113.dta
similarity index 100%
rename from pandas/io/tests/data/stata4_113.dta
rename to pandas/tests/io/data/stata4_113.dta
diff --git a/pandas/io/tests/data/stata4_114.dta b/pandas/tests/io/data/stata4_114.dta
similarity index 100%
rename from pandas/io/tests/data/stata4_114.dta
rename to pandas/tests/io/data/stata4_114.dta
diff --git a/pandas/io/tests/data/stata4_115.dta b/pandas/tests/io/data/stata4_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata4_115.dta
rename to pandas/tests/io/data/stata4_115.dta
diff --git a/pandas/io/tests/data/stata4_117.dta b/pandas/tests/io/data/stata4_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata4_117.dta
rename to pandas/tests/io/data/stata4_117.dta
diff --git a/pandas/io/tests/data/stata5.csv b/pandas/tests/io/data/stata5.csv
similarity index 100%
rename from pandas/io/tests/data/stata5.csv
rename to pandas/tests/io/data/stata5.csv
diff --git a/pandas/io/tests/data/stata5_113.dta b/pandas/tests/io/data/stata5_113.dta
similarity index 100%
rename from pandas/io/tests/data/stata5_113.dta
rename to pandas/tests/io/data/stata5_113.dta
diff --git a/pandas/io/tests/data/stata5_114.dta b/pandas/tests/io/data/stata5_114.dta
similarity index 100%
rename from pandas/io/tests/data/stata5_114.dta
rename to pandas/tests/io/data/stata5_114.dta
diff --git a/pandas/io/tests/data/stata5_115.dta b/pandas/tests/io/data/stata5_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata5_115.dta
rename to pandas/tests/io/data/stata5_115.dta
diff --git a/pandas/io/tests/data/stata5_117.dta b/pandas/tests/io/data/stata5_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata5_117.dta
rename to pandas/tests/io/data/stata5_117.dta
diff --git a/pandas/io/tests/data/stata6.csv b/pandas/tests/io/data/stata6.csv
similarity index 100%
rename from pandas/io/tests/data/stata6.csv
rename to pandas/tests/io/data/stata6.csv
diff --git a/pandas/io/tests/data/stata6_113.dta b/pandas/tests/io/data/stata6_113.dta
similarity index 100%
rename from pandas/io/tests/data/stata6_113.dta
rename to pandas/tests/io/data/stata6_113.dta
diff --git a/pandas/io/tests/data/stata6_114.dta b/pandas/tests/io/data/stata6_114.dta
similarity index 100%
rename from pandas/io/tests/data/stata6_114.dta
rename to pandas/tests/io/data/stata6_114.dta
diff --git a/pandas/io/tests/data/stata6_115.dta b/pandas/tests/io/data/stata6_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata6_115.dta
rename to pandas/tests/io/data/stata6_115.dta
diff --git a/pandas/io/tests/data/stata6_117.dta b/pandas/tests/io/data/stata6_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata6_117.dta
rename to pandas/tests/io/data/stata6_117.dta
diff --git a/pandas/io/tests/data/stata7_111.dta b/pandas/tests/io/data/stata7_111.dta
similarity index 100%
rename from pandas/io/tests/data/stata7_111.dta
rename to pandas/tests/io/data/stata7_111.dta
diff --git a/pandas/io/tests/data/stata7_115.dta b/pandas/tests/io/data/stata7_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata7_115.dta
rename to pandas/tests/io/data/stata7_115.dta
diff --git a/pandas/io/tests/data/stata7_117.dta b/pandas/tests/io/data/stata7_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata7_117.dta
rename to pandas/tests/io/data/stata7_117.dta
diff --git a/pandas/io/tests/data/stata8_113.dta b/pandas/tests/io/data/stata8_113.dta
similarity index 100%
rename from pandas/io/tests/data/stata8_113.dta
rename to pandas/tests/io/data/stata8_113.dta
diff --git a/pandas/io/tests/data/stata8_115.dta b/pandas/tests/io/data/stata8_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata8_115.dta
rename to pandas/tests/io/data/stata8_115.dta
diff --git a/pandas/io/tests/data/stata8_117.dta b/pandas/tests/io/data/stata8_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata8_117.dta
rename to pandas/tests/io/data/stata8_117.dta
diff --git a/pandas/io/tests/data/stata9_115.dta b/pandas/tests/io/data/stata9_115.dta
similarity index 100%
rename from pandas/io/tests/data/stata9_115.dta
rename to pandas/tests/io/data/stata9_115.dta
diff --git a/pandas/io/tests/data/stata9_117.dta b/pandas/tests/io/data/stata9_117.dta
similarity index 100%
rename from pandas/io/tests/data/stata9_117.dta
rename to pandas/tests/io/data/stata9_117.dta
diff --git a/pandas/io/tests/data/test1.csv b/pandas/tests/io/data/test1.csv
similarity index 100%
rename from pandas/io/tests/data/test1.csv
rename to pandas/tests/io/data/test1.csv
diff --git a/pandas/io/tests/data/test1.xls b/pandas/tests/io/data/test1.xls
similarity index 100%
rename from pandas/io/tests/data/test1.xls
rename to pandas/tests/io/data/test1.xls
diff --git a/pandas/io/tests/data/test1.xlsm b/pandas/tests/io/data/test1.xlsm
similarity index 100%
rename from pandas/io/tests/data/test1.xlsm
rename to pandas/tests/io/data/test1.xlsm
diff --git a/pandas/io/tests/data/test1.xlsx b/pandas/tests/io/data/test1.xlsx
similarity index 100%
rename from pandas/io/tests/data/test1.xlsx
rename to pandas/tests/io/data/test1.xlsx
diff --git a/pandas/io/tests/data/test2.xls b/pandas/tests/io/data/test2.xls
similarity index 100%
rename from pandas/io/tests/data/test2.xls
rename to pandas/tests/io/data/test2.xls
diff --git a/pandas/io/tests/data/test2.xlsm b/pandas/tests/io/data/test2.xlsm
similarity index 100%
rename from pandas/io/tests/data/test2.xlsm
rename to pandas/tests/io/data/test2.xlsm
diff --git a/pandas/io/tests/data/test2.xlsx b/pandas/tests/io/data/test2.xlsx
similarity index 100%
rename from pandas/io/tests/data/test2.xlsx
rename to pandas/tests/io/data/test2.xlsx
diff --git a/pandas/io/tests/data/test3.xls b/pandas/tests/io/data/test3.xls
similarity index 100%
rename from pandas/io/tests/data/test3.xls
rename to pandas/tests/io/data/test3.xls
diff --git a/pandas/io/tests/data/test3.xlsm b/pandas/tests/io/data/test3.xlsm
similarity index 100%
rename from pandas/io/tests/data/test3.xlsm
rename to pandas/tests/io/data/test3.xlsm
diff --git a/pandas/io/tests/data/test3.xlsx b/pandas/tests/io/data/test3.xlsx
similarity index 100%
rename from pandas/io/tests/data/test3.xlsx
rename to pandas/tests/io/data/test3.xlsx
diff --git a/pandas/io/tests/data/test4.xls b/pandas/tests/io/data/test4.xls
similarity index 100%
rename from pandas/io/tests/data/test4.xls
rename to pandas/tests/io/data/test4.xls
diff --git a/pandas/io/tests/data/test4.xlsm b/pandas/tests/io/data/test4.xlsm
similarity index 100%
rename from pandas/io/tests/data/test4.xlsm
rename to pandas/tests/io/data/test4.xlsm
diff --git a/pandas/io/tests/data/test4.xlsx b/pandas/tests/io/data/test4.xlsx
similarity index 100%
rename from pandas/io/tests/data/test4.xlsx
rename to pandas/tests/io/data/test4.xlsx
diff --git a/pandas/io/tests/data/test5.xls b/pandas/tests/io/data/test5.xls
similarity index 100%
rename from pandas/io/tests/data/test5.xls
rename to pandas/tests/io/data/test5.xls
diff --git a/pandas/io/tests/data/test5.xlsm b/pandas/tests/io/data/test5.xlsm
similarity index 100%
rename from pandas/io/tests/data/test5.xlsm
rename to pandas/tests/io/data/test5.xlsm
diff --git a/pandas/io/tests/data/test5.xlsx b/pandas/tests/io/data/test5.xlsx
similarity index 100%
rename from pandas/io/tests/data/test5.xlsx
rename to pandas/tests/io/data/test5.xlsx
diff --git a/pandas/io/tests/data/test_converters.xls b/pandas/tests/io/data/test_converters.xls
similarity index 100%
rename from pandas/io/tests/data/test_converters.xls
rename to pandas/tests/io/data/test_converters.xls
diff --git a/pandas/io/tests/data/test_converters.xlsm b/pandas/tests/io/data/test_converters.xlsm
similarity index 100%
rename from pandas/io/tests/data/test_converters.xlsm
rename to pandas/tests/io/data/test_converters.xlsm
diff --git a/pandas/io/tests/data/test_converters.xlsx b/pandas/tests/io/data/test_converters.xlsx
similarity index 100%
rename from pandas/io/tests/data/test_converters.xlsx
rename to pandas/tests/io/data/test_converters.xlsx
diff --git a/pandas/io/tests/data/test_index_name_pre17.xls b/pandas/tests/io/data/test_index_name_pre17.xls
similarity index 100%
rename from pandas/io/tests/data/test_index_name_pre17.xls
rename to pandas/tests/io/data/test_index_name_pre17.xls
diff --git a/pandas/io/tests/data/test_index_name_pre17.xlsm b/pandas/tests/io/data/test_index_name_pre17.xlsm
similarity index 100%
rename from pandas/io/tests/data/test_index_name_pre17.xlsm
rename to pandas/tests/io/data/test_index_name_pre17.xlsm
diff --git a/pandas/io/tests/data/test_index_name_pre17.xlsx b/pandas/tests/io/data/test_index_name_pre17.xlsx
similarity index 100%
rename from pandas/io/tests/data/test_index_name_pre17.xlsx
rename to pandas/tests/io/data/test_index_name_pre17.xlsx
diff --git a/pandas/io/tests/data/test_mmap.csv b/pandas/tests/io/data/test_mmap.csv
similarity index 100%
rename from pandas/io/tests/data/test_mmap.csv
rename to pandas/tests/io/data/test_mmap.csv
diff --git a/pandas/io/tests/data/test_multisheet.xls b/pandas/tests/io/data/test_multisheet.xls
similarity index 100%
rename from pandas/io/tests/data/test_multisheet.xls
rename to pandas/tests/io/data/test_multisheet.xls
diff --git a/pandas/io/tests/data/test_multisheet.xlsm b/pandas/tests/io/data/test_multisheet.xlsm
similarity index 100%
rename from pandas/io/tests/data/test_multisheet.xlsm
rename to pandas/tests/io/data/test_multisheet.xlsm
diff --git a/pandas/io/tests/data/test_multisheet.xlsx b/pandas/tests/io/data/test_multisheet.xlsx
similarity index 100%
rename from pandas/io/tests/data/test_multisheet.xlsx
rename to pandas/tests/io/data/test_multisheet.xlsx
diff --git a/pandas/io/tests/data/test_squeeze.xls b/pandas/tests/io/data/test_squeeze.xls
similarity index 100%
rename from pandas/io/tests/data/test_squeeze.xls
rename to pandas/tests/io/data/test_squeeze.xls
diff --git a/pandas/io/tests/data/test_squeeze.xlsm b/pandas/tests/io/data/test_squeeze.xlsm
similarity index 100%
rename from pandas/io/tests/data/test_squeeze.xlsm
rename to pandas/tests/io/data/test_squeeze.xlsm
diff --git a/pandas/io/tests/data/test_squeeze.xlsx b/pandas/tests/io/data/test_squeeze.xlsx
similarity index 100%
rename from pandas/io/tests/data/test_squeeze.xlsx
rename to pandas/tests/io/data/test_squeeze.xlsx
diff --git a/pandas/io/tests/data/test_types.xls b/pandas/tests/io/data/test_types.xls
similarity index 100%
rename from pandas/io/tests/data/test_types.xls
rename to pandas/tests/io/data/test_types.xls
diff --git a/pandas/io/tests/data/test_types.xlsm b/pandas/tests/io/data/test_types.xlsm
similarity index 100%
rename from pandas/io/tests/data/test_types.xlsm
rename to pandas/tests/io/data/test_types.xlsm
diff --git a/pandas/io/tests/data/test_types.xlsx b/pandas/tests/io/data/test_types.xlsx
similarity index 100%
rename from pandas/io/tests/data/test_types.xlsx
rename to pandas/tests/io/data/test_types.xlsx
diff --git a/pandas/io/tests/data/testdateoverflow.xls b/pandas/tests/io/data/testdateoverflow.xls
similarity index 100%
rename from pandas/io/tests/data/testdateoverflow.xls
rename to pandas/tests/io/data/testdateoverflow.xls
diff --git a/pandas/io/tests/data/testdateoverflow.xlsm b/pandas/tests/io/data/testdateoverflow.xlsm
similarity index 100%
rename from pandas/io/tests/data/testdateoverflow.xlsm
rename to pandas/tests/io/data/testdateoverflow.xlsm
diff --git a/pandas/io/tests/data/testdateoverflow.xlsx b/pandas/tests/io/data/testdateoverflow.xlsx
similarity index 100%
rename from pandas/io/tests/data/testdateoverflow.xlsx
rename to pandas/tests/io/data/testdateoverflow.xlsx
diff --git a/pandas/io/tests/data/testdtype.xls b/pandas/tests/io/data/testdtype.xls
similarity index 100%
rename from pandas/io/tests/data/testdtype.xls
rename to pandas/tests/io/data/testdtype.xls
diff --git a/pandas/io/tests/data/testdtype.xlsm b/pandas/tests/io/data/testdtype.xlsm
similarity index 100%
rename from pandas/io/tests/data/testdtype.xlsm
rename to pandas/tests/io/data/testdtype.xlsm
diff --git a/pandas/io/tests/data/testdtype.xlsx b/pandas/tests/io/data/testdtype.xlsx
similarity index 100%
rename from pandas/io/tests/data/testdtype.xlsx
rename to pandas/tests/io/data/testdtype.xlsx
diff --git a/pandas/io/tests/data/testmultiindex.xls b/pandas/tests/io/data/testmultiindex.xls
similarity index 100%
rename from pandas/io/tests/data/testmultiindex.xls
rename to pandas/tests/io/data/testmultiindex.xls
diff --git a/pandas/io/tests/data/testmultiindex.xlsm b/pandas/tests/io/data/testmultiindex.xlsm
similarity index 100%
rename from pandas/io/tests/data/testmultiindex.xlsm
rename to pandas/tests/io/data/testmultiindex.xlsm
diff --git a/pandas/io/tests/data/testmultiindex.xlsx b/pandas/tests/io/data/testmultiindex.xlsx
similarity index 100%
rename from pandas/io/tests/data/testmultiindex.xlsx
rename to pandas/tests/io/data/testmultiindex.xlsx
diff --git a/pandas/io/tests/data/testskiprows.xls b/pandas/tests/io/data/testskiprows.xls
similarity index 100%
rename from pandas/io/tests/data/testskiprows.xls
rename to pandas/tests/io/data/testskiprows.xls
diff --git a/pandas/io/tests/data/testskiprows.xlsm b/pandas/tests/io/data/testskiprows.xlsm
similarity index 100%
rename from pandas/io/tests/data/testskiprows.xlsm
rename to pandas/tests/io/data/testskiprows.xlsm
diff --git a/pandas/io/tests/data/testskiprows.xlsx b/pandas/tests/io/data/testskiprows.xlsx
similarity index 100%
rename from pandas/io/tests/data/testskiprows.xlsx
rename to pandas/tests/io/data/testskiprows.xlsx
diff --git a/pandas/io/tests/data/times_1900.xls b/pandas/tests/io/data/times_1900.xls
similarity index 100%
rename from pandas/io/tests/data/times_1900.xls
rename to pandas/tests/io/data/times_1900.xls
diff --git a/pandas/io/tests/data/times_1900.xlsm b/pandas/tests/io/data/times_1900.xlsm
similarity index 100%
rename from pandas/io/tests/data/times_1900.xlsm
rename to pandas/tests/io/data/times_1900.xlsm
diff --git a/pandas/io/tests/data/times_1900.xlsx b/pandas/tests/io/data/times_1900.xlsx
similarity index 100%
rename from pandas/io/tests/data/times_1900.xlsx
rename to pandas/tests/io/data/times_1900.xlsx
diff --git a/pandas/io/tests/data/times_1904.xls b/pandas/tests/io/data/times_1904.xls
similarity index 100%
rename from pandas/io/tests/data/times_1904.xls
rename to pandas/tests/io/data/times_1904.xls
diff --git a/pandas/io/tests/data/times_1904.xlsm b/pandas/tests/io/data/times_1904.xlsm
similarity index 100%
rename from pandas/io/tests/data/times_1904.xlsm
rename to pandas/tests/io/data/times_1904.xlsm
diff --git a/pandas/io/tests/data/times_1904.xlsx b/pandas/tests/io/data/times_1904.xlsx
similarity index 100%
rename from pandas/io/tests/data/times_1904.xlsx
rename to pandas/tests/io/data/times_1904.xlsx
diff --git a/pandas/io/tests/data/tips.csv b/pandas/tests/io/data/tips.csv
similarity index 100%
rename from pandas/io/tests/data/tips.csv
rename to pandas/tests/io/data/tips.csv
diff --git a/pandas/io/tests/data/valid_markup.html b/pandas/tests/io/data/valid_markup.html
similarity index 100%
rename from pandas/io/tests/data/valid_markup.html
rename to pandas/tests/io/data/valid_markup.html
diff --git a/pandas/io/tests/data/wikipedia_states.html b/pandas/tests/io/data/wikipedia_states.html
similarity index 100%
rename from pandas/io/tests/data/wikipedia_states.html
rename to pandas/tests/io/data/wikipedia_states.html
diff --git a/pandas/io/tests/generate_legacy_storage_files.py b/pandas/tests/io/generate_legacy_storage_files.py
similarity index 100%
rename from pandas/io/tests/generate_legacy_storage_files.py
rename to pandas/tests/io/generate_legacy_storage_files.py
diff --git a/pandas/io/tests/json/__init__.py b/pandas/tests/io/json/__init__.py
similarity index 100%
rename from pandas/io/tests/json/__init__.py
rename to pandas/tests/io/json/__init__.py
diff --git a/pandas/io/tests/json/data/tsframe_iso_v012.json b/pandas/tests/io/json/data/tsframe_iso_v012.json
similarity index 100%
rename from pandas/io/tests/json/data/tsframe_iso_v012.json
rename to pandas/tests/io/json/data/tsframe_iso_v012.json
diff --git a/pandas/io/tests/json/data/tsframe_v012.json b/pandas/tests/io/json/data/tsframe_v012.json
similarity index 100%
rename from pandas/io/tests/json/data/tsframe_v012.json
rename to pandas/tests/io/json/data/tsframe_v012.json
diff --git a/pandas/io/tests/json/test_normalize.py b/pandas/tests/io/json/test_normalize.py
similarity index 100%
rename from pandas/io/tests/json/test_normalize.py
rename to pandas/tests/io/json/test_normalize.py
diff --git a/pandas/io/tests/json/test_pandas.py b/pandas/tests/io/json/test_pandas.py
similarity index 100%
rename from pandas/io/tests/json/test_pandas.py
rename to pandas/tests/io/json/test_pandas.py
diff --git a/pandas/io/tests/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py
similarity index 100%
rename from pandas/io/tests/json/test_ujson.py
rename to pandas/tests/io/json/test_ujson.py
diff --git a/pandas/io/tests/parser/__init__.py b/pandas/tests/io/parser/__init__.py
similarity index 100%
rename from pandas/io/tests/parser/__init__.py
rename to pandas/tests/io/parser/__init__.py
diff --git a/pandas/io/tests/parser/c_parser_only.py b/pandas/tests/io/parser/c_parser_only.py
similarity index 100%
rename from pandas/io/tests/parser/c_parser_only.py
rename to pandas/tests/io/parser/c_parser_only.py
diff --git a/pandas/io/tests/parser/comment.py b/pandas/tests/io/parser/comment.py
similarity index 100%
rename from pandas/io/tests/parser/comment.py
rename to pandas/tests/io/parser/comment.py
diff --git a/pandas/io/tests/parser/common.py b/pandas/tests/io/parser/common.py
similarity index 100%
rename from pandas/io/tests/parser/common.py
rename to pandas/tests/io/parser/common.py
diff --git a/pandas/io/tests/parser/compression.py b/pandas/tests/io/parser/compression.py
similarity index 100%
rename from pandas/io/tests/parser/compression.py
rename to pandas/tests/io/parser/compression.py
diff --git a/pandas/io/tests/parser/converters.py b/pandas/tests/io/parser/converters.py
similarity index 100%
rename from pandas/io/tests/parser/converters.py
rename to pandas/tests/io/parser/converters.py
diff --git a/pandas/io/tests/parser/data/iris.csv b/pandas/tests/io/parser/data/iris.csv
similarity index 100%
rename from pandas/io/tests/parser/data/iris.csv
rename to pandas/tests/io/parser/data/iris.csv
diff --git a/pandas/io/tests/parser/data/salaries.csv b/pandas/tests/io/parser/data/salaries.csv
similarity index 100%
rename from pandas/io/tests/parser/data/salaries.csv
rename to pandas/tests/io/parser/data/salaries.csv
diff --git a/pandas/io/tests/parser/data/salaries.csv.bz2 b/pandas/tests/io/parser/data/salaries.csv.bz2
similarity index 100%
rename from pandas/io/tests/parser/data/salaries.csv.bz2
rename to pandas/tests/io/parser/data/salaries.csv.bz2
diff --git a/pandas/io/tests/parser/data/salaries.csv.gz b/pandas/tests/io/parser/data/salaries.csv.gz
similarity index 100%
rename from pandas/io/tests/parser/data/salaries.csv.gz
rename to pandas/tests/io/parser/data/salaries.csv.gz
diff --git a/pandas/io/tests/parser/data/salaries.csv.xz b/pandas/tests/io/parser/data/salaries.csv.xz
similarity index 100%
rename from pandas/io/tests/parser/data/salaries.csv.xz
rename to pandas/tests/io/parser/data/salaries.csv.xz
diff --git a/pandas/io/tests/parser/data/salaries.csv.zip b/pandas/tests/io/parser/data/salaries.csv.zip
similarity index 100%
rename from pandas/io/tests/parser/data/salaries.csv.zip
rename to pandas/tests/io/parser/data/salaries.csv.zip
diff --git a/pandas/io/tests/parser/data/sauron.SHIFT_JIS.csv b/pandas/tests/io/parser/data/sauron.SHIFT_JIS.csv
similarity index 100%
rename from pandas/io/tests/parser/data/sauron.SHIFT_JIS.csv
rename to pandas/tests/io/parser/data/sauron.SHIFT_JIS.csv
diff --git a/pandas/io/tests/parser/data/test1.csv b/pandas/tests/io/parser/data/test1.csv
similarity index 100%
rename from pandas/io/tests/parser/data/test1.csv
rename to pandas/tests/io/parser/data/test1.csv
diff --git a/pandas/io/tests/parser/data/test1.csv.bz2 b/pandas/tests/io/parser/data/test1.csv.bz2
similarity index 100%
rename from pandas/io/tests/parser/data/test1.csv.bz2
rename to pandas/tests/io/parser/data/test1.csv.bz2
diff --git a/pandas/io/tests/parser/data/test1.csv.gz b/pandas/tests/io/parser/data/test1.csv.gz
similarity index 100%
rename from pandas/io/tests/parser/data/test1.csv.gz
rename to pandas/tests/io/parser/data/test1.csv.gz
diff --git a/pandas/io/tests/parser/data/test2.csv b/pandas/tests/io/parser/data/test2.csv
similarity index 100%
rename from pandas/io/tests/parser/data/test2.csv
rename to pandas/tests/io/parser/data/test2.csv
diff --git a/pandas/io/tests/parser/data/test_mmap.csv b/pandas/tests/io/parser/data/test_mmap.csv
similarity index 100%
rename from pandas/io/tests/parser/data/test_mmap.csv
rename to pandas/tests/io/parser/data/test_mmap.csv
diff --git a/pandas/io/tests/parser/data/tips.csv b/pandas/tests/io/parser/data/tips.csv
similarity index 100%
rename from pandas/io/tests/parser/data/tips.csv
rename to pandas/tests/io/parser/data/tips.csv
diff --git a/pandas/io/tests/parser/data/unicode_series.csv b/pandas/tests/io/parser/data/unicode_series.csv
similarity index 100%
rename from pandas/io/tests/parser/data/unicode_series.csv
rename to pandas/tests/io/parser/data/unicode_series.csv
diff --git a/pandas/io/tests/parser/data/utf16_ex.txt b/pandas/tests/io/parser/data/utf16_ex.txt
similarity index 100%
rename from pandas/io/tests/parser/data/utf16_ex.txt
rename to pandas/tests/io/parser/data/utf16_ex.txt
diff --git a/pandas/io/tests/parser/dialect.py b/pandas/tests/io/parser/dialect.py
similarity index 100%
rename from pandas/io/tests/parser/dialect.py
rename to pandas/tests/io/parser/dialect.py
diff --git a/pandas/io/tests/parser/dtypes.py b/pandas/tests/io/parser/dtypes.py
similarity index 100%
rename from pandas/io/tests/parser/dtypes.py
rename to pandas/tests/io/parser/dtypes.py
diff --git a/pandas/io/tests/parser/header.py b/pandas/tests/io/parser/header.py
similarity index 100%
rename from pandas/io/tests/parser/header.py
rename to pandas/tests/io/parser/header.py
diff --git a/pandas/io/tests/parser/index_col.py b/pandas/tests/io/parser/index_col.py
similarity index 100%
rename from pandas/io/tests/parser/index_col.py
rename to pandas/tests/io/parser/index_col.py
diff --git a/pandas/io/tests/parser/multithread.py b/pandas/tests/io/parser/multithread.py
similarity index 100%
rename from pandas/io/tests/parser/multithread.py
rename to pandas/tests/io/parser/multithread.py
diff --git a/pandas/io/tests/parser/na_values.py b/pandas/tests/io/parser/na_values.py
similarity index 100%
rename from pandas/io/tests/parser/na_values.py
rename to pandas/tests/io/parser/na_values.py
diff --git a/pandas/io/tests/parser/parse_dates.py b/pandas/tests/io/parser/parse_dates.py
similarity index 100%
rename from pandas/io/tests/parser/parse_dates.py
rename to pandas/tests/io/parser/parse_dates.py
diff --git a/pandas/io/tests/parser/python_parser_only.py b/pandas/tests/io/parser/python_parser_only.py
similarity index 100%
rename from pandas/io/tests/parser/python_parser_only.py
rename to pandas/tests/io/parser/python_parser_only.py
diff --git a/pandas/io/tests/parser/quoting.py b/pandas/tests/io/parser/quoting.py
similarity index 100%
rename from pandas/io/tests/parser/quoting.py
rename to pandas/tests/io/parser/quoting.py
diff --git a/pandas/io/tests/parser/skiprows.py b/pandas/tests/io/parser/skiprows.py
similarity index 100%
rename from pandas/io/tests/parser/skiprows.py
rename to pandas/tests/io/parser/skiprows.py
diff --git a/pandas/io/tests/parser/test_network.py b/pandas/tests/io/parser/test_network.py
similarity index 100%
rename from pandas/io/tests/parser/test_network.py
rename to pandas/tests/io/parser/test_network.py
diff --git a/pandas/io/tests/parser/test_parsers.py b/pandas/tests/io/parser/test_parsers.py
similarity index 100%
rename from pandas/io/tests/parser/test_parsers.py
rename to pandas/tests/io/parser/test_parsers.py
diff --git a/pandas/io/tests/parser/test_read_fwf.py b/pandas/tests/io/parser/test_read_fwf.py
similarity index 100%
rename from pandas/io/tests/parser/test_read_fwf.py
rename to pandas/tests/io/parser/test_read_fwf.py
diff --git a/pandas/io/tests/parser/test_textreader.py b/pandas/tests/io/parser/test_textreader.py
similarity index 100%
rename from pandas/io/tests/parser/test_textreader.py
rename to pandas/tests/io/parser/test_textreader.py
diff --git a/pandas/io/tests/parser/test_unsupported.py b/pandas/tests/io/parser/test_unsupported.py
similarity index 100%
rename from pandas/io/tests/parser/test_unsupported.py
rename to pandas/tests/io/parser/test_unsupported.py
diff --git a/pandas/io/tests/parser/usecols.py b/pandas/tests/io/parser/usecols.py
similarity index 100%
rename from pandas/io/tests/parser/usecols.py
rename to pandas/tests/io/parser/usecols.py
diff --git a/pandas/io/tests/sas/data/DEMO_G.csv b/pandas/tests/io/sas/data/DEMO_G.csv
similarity index 100%
rename from pandas/io/tests/sas/data/DEMO_G.csv
rename to pandas/tests/io/sas/data/DEMO_G.csv
diff --git a/pandas/io/tests/sas/data/DEMO_G.xpt b/pandas/tests/io/sas/data/DEMO_G.xpt
similarity index 100%
rename from pandas/io/tests/sas/data/DEMO_G.xpt
rename to pandas/tests/io/sas/data/DEMO_G.xpt
diff --git a/pandas/io/tests/sas/data/DRXFCD_G.csv b/pandas/tests/io/sas/data/DRXFCD_G.csv
similarity index 100%
rename from pandas/io/tests/sas/data/DRXFCD_G.csv
rename to pandas/tests/io/sas/data/DRXFCD_G.csv
diff --git a/pandas/io/tests/sas/data/DRXFCD_G.xpt b/pandas/tests/io/sas/data/DRXFCD_G.xpt
similarity index 100%
rename from pandas/io/tests/sas/data/DRXFCD_G.xpt
rename to pandas/tests/io/sas/data/DRXFCD_G.xpt
diff --git a/pandas/io/tests/sas/data/SSHSV1_A.csv b/pandas/tests/io/sas/data/SSHSV1_A.csv
similarity index 100%
rename from pandas/io/tests/sas/data/SSHSV1_A.csv
rename to pandas/tests/io/sas/data/SSHSV1_A.csv
diff --git a/pandas/io/tests/sas/data/SSHSV1_A.xpt b/pandas/tests/io/sas/data/SSHSV1_A.xpt
similarity index 100%
rename from pandas/io/tests/sas/data/SSHSV1_A.xpt
rename to pandas/tests/io/sas/data/SSHSV1_A.xpt
diff --git a/pandas/io/tests/sas/data/airline.csv b/pandas/tests/io/sas/data/airline.csv
similarity index 100%
rename from pandas/io/tests/sas/data/airline.csv
rename to pandas/tests/io/sas/data/airline.csv
diff --git a/pandas/io/tests/sas/data/airline.sas7bdat b/pandas/tests/io/sas/data/airline.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/airline.sas7bdat
rename to pandas/tests/io/sas/data/airline.sas7bdat
diff --git a/pandas/io/tests/sas/data/paxraw_d_short.csv b/pandas/tests/io/sas/data/paxraw_d_short.csv
similarity index 100%
rename from pandas/io/tests/sas/data/paxraw_d_short.csv
rename to pandas/tests/io/sas/data/paxraw_d_short.csv
diff --git a/pandas/io/tests/sas/data/paxraw_d_short.xpt b/pandas/tests/io/sas/data/paxraw_d_short.xpt
similarity index 100%
rename from pandas/io/tests/sas/data/paxraw_d_short.xpt
rename to pandas/tests/io/sas/data/paxraw_d_short.xpt
diff --git a/pandas/io/tests/sas/data/productsales.csv b/pandas/tests/io/sas/data/productsales.csv
similarity index 100%
rename from pandas/io/tests/sas/data/productsales.csv
rename to pandas/tests/io/sas/data/productsales.csv
diff --git a/pandas/io/tests/sas/data/productsales.sas7bdat b/pandas/tests/io/sas/data/productsales.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/productsales.sas7bdat
rename to pandas/tests/io/sas/data/productsales.sas7bdat
diff --git a/pandas/io/tests/sas/data/test1.sas7bdat b/pandas/tests/io/sas/data/test1.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test1.sas7bdat
rename to pandas/tests/io/sas/data/test1.sas7bdat
diff --git a/pandas/io/tests/sas/data/test10.sas7bdat b/pandas/tests/io/sas/data/test10.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test10.sas7bdat
rename to pandas/tests/io/sas/data/test10.sas7bdat
diff --git a/pandas/io/tests/sas/data/test11.sas7bdat b/pandas/tests/io/sas/data/test11.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test11.sas7bdat
rename to pandas/tests/io/sas/data/test11.sas7bdat
diff --git a/pandas/io/tests/sas/data/test12.sas7bdat b/pandas/tests/io/sas/data/test12.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test12.sas7bdat
rename to pandas/tests/io/sas/data/test12.sas7bdat
diff --git a/pandas/io/tests/sas/data/test13.sas7bdat b/pandas/tests/io/sas/data/test13.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test13.sas7bdat
rename to pandas/tests/io/sas/data/test13.sas7bdat
diff --git a/pandas/io/tests/sas/data/test14.sas7bdat b/pandas/tests/io/sas/data/test14.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test14.sas7bdat
rename to pandas/tests/io/sas/data/test14.sas7bdat
diff --git a/pandas/io/tests/sas/data/test15.sas7bdat b/pandas/tests/io/sas/data/test15.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test15.sas7bdat
rename to pandas/tests/io/sas/data/test15.sas7bdat
diff --git a/pandas/io/tests/sas/data/test16.sas7bdat b/pandas/tests/io/sas/data/test16.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test16.sas7bdat
rename to pandas/tests/io/sas/data/test16.sas7bdat
diff --git a/pandas/io/tests/sas/data/test2.sas7bdat b/pandas/tests/io/sas/data/test2.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test2.sas7bdat
rename to pandas/tests/io/sas/data/test2.sas7bdat
diff --git a/pandas/io/tests/sas/data/test3.sas7bdat b/pandas/tests/io/sas/data/test3.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test3.sas7bdat
rename to pandas/tests/io/sas/data/test3.sas7bdat
diff --git a/pandas/io/tests/sas/data/test4.sas7bdat b/pandas/tests/io/sas/data/test4.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test4.sas7bdat
rename to pandas/tests/io/sas/data/test4.sas7bdat
diff --git a/pandas/io/tests/sas/data/test5.sas7bdat b/pandas/tests/io/sas/data/test5.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test5.sas7bdat
rename to pandas/tests/io/sas/data/test5.sas7bdat
diff --git a/pandas/io/tests/sas/data/test6.sas7bdat b/pandas/tests/io/sas/data/test6.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test6.sas7bdat
rename to pandas/tests/io/sas/data/test6.sas7bdat
diff --git a/pandas/io/tests/sas/data/test7.sas7bdat b/pandas/tests/io/sas/data/test7.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test7.sas7bdat
rename to pandas/tests/io/sas/data/test7.sas7bdat
diff --git a/pandas/io/tests/sas/data/test8.sas7bdat b/pandas/tests/io/sas/data/test8.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test8.sas7bdat
rename to pandas/tests/io/sas/data/test8.sas7bdat
diff --git a/pandas/io/tests/sas/data/test9.sas7bdat b/pandas/tests/io/sas/data/test9.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test9.sas7bdat
rename to pandas/tests/io/sas/data/test9.sas7bdat
diff --git a/pandas/io/tests/sas/data/test_12659.csv b/pandas/tests/io/sas/data/test_12659.csv
similarity index 100%
rename from pandas/io/tests/sas/data/test_12659.csv
rename to pandas/tests/io/sas/data/test_12659.csv
diff --git a/pandas/io/tests/sas/data/test_12659.sas7bdat b/pandas/tests/io/sas/data/test_12659.sas7bdat
similarity index 100%
rename from pandas/io/tests/sas/data/test_12659.sas7bdat
rename to pandas/tests/io/sas/data/test_12659.sas7bdat
diff --git a/pandas/io/tests/sas/data/test_sas7bdat_1.csv b/pandas/tests/io/sas/data/test_sas7bdat_1.csv
similarity index 100%
rename from pandas/io/tests/sas/data/test_sas7bdat_1.csv
rename to pandas/tests/io/sas/data/test_sas7bdat_1.csv
diff --git a/pandas/io/tests/sas/data/test_sas7bdat_2.csv b/pandas/tests/io/sas/data/test_sas7bdat_2.csv
similarity index 100%
rename from pandas/io/tests/sas/data/test_sas7bdat_2.csv
rename to pandas/tests/io/sas/data/test_sas7bdat_2.csv
diff --git a/pandas/io/tests/sas/test_sas.py b/pandas/tests/io/sas/test_sas.py
similarity index 100%
rename from pandas/io/tests/sas/test_sas.py
rename to pandas/tests/io/sas/test_sas.py
diff --git a/pandas/io/tests/sas/test_sas7bdat.py b/pandas/tests/io/sas/test_sas7bdat.py
similarity index 100%
rename from pandas/io/tests/sas/test_sas7bdat.py
rename to pandas/tests/io/sas/test_sas7bdat.py
diff --git a/pandas/io/tests/sas/test_xport.py b/pandas/tests/io/sas/test_xport.py
similarity index 100%
rename from pandas/io/tests/sas/test_xport.py
rename to pandas/tests/io/sas/test_xport.py
diff --git a/pandas/io/tests/test_clipboard.py b/pandas/tests/io/test_clipboard.py
similarity index 100%
rename from pandas/io/tests/test_clipboard.py
rename to pandas/tests/io/test_clipboard.py
diff --git a/pandas/io/tests/test_common.py b/pandas/tests/io/test_common.py
similarity index 100%
rename from pandas/io/tests/test_common.py
rename to pandas/tests/io/test_common.py
diff --git a/pandas/io/tests/test_date_converters.py b/pandas/tests/io/test_date_converters.py
similarity index 100%
rename from pandas/io/tests/test_date_converters.py
rename to pandas/tests/io/test_date_converters.py
diff --git a/pandas/io/tests/test_excel.py b/pandas/tests/io/test_excel.py
similarity index 100%
rename from pandas/io/tests/test_excel.py
rename to pandas/tests/io/test_excel.py
diff --git a/pandas/io/tests/test_feather.py b/pandas/tests/io/test_feather.py
similarity index 100%
rename from pandas/io/tests/test_feather.py
rename to pandas/tests/io/test_feather.py
diff --git a/pandas/io/tests/test_gbq.py b/pandas/tests/io/test_gbq.py
similarity index 100%
rename from pandas/io/tests/test_gbq.py
rename to pandas/tests/io/test_gbq.py
diff --git a/pandas/io/tests/test_html.py b/pandas/tests/io/test_html.py
similarity index 100%
rename from pandas/io/tests/test_html.py
rename to pandas/tests/io/test_html.py
diff --git a/pandas/io/tests/test_packers.py b/pandas/tests/io/test_packers.py
similarity index 99%
rename from pandas/io/tests/test_packers.py
rename to pandas/tests/io/test_packers.py
index 4bb6f4a69bab3..911cd8164571d 100644
--- a/pandas/io/tests/test_packers.py
+++ b/pandas/tests/io/test_packers.py
@@ -795,7 +795,7 @@ class TestMsgpack():
@classmethod
def setup_class(cls):
- from pandas.io.tests.generate_legacy_storage_files import (
+ from pandas.tests.io.generate_legacy_storage_files import (
create_msgpack_data, create_data)
cls.data = create_msgpack_data()
cls.all_data = create_data()
diff --git a/pandas/io/tests/test_pickle.py b/pandas/tests/io/test_pickle.py
similarity index 99%
rename from pandas/io/tests/test_pickle.py
rename to pandas/tests/io/test_pickle.py
index 588b2d5f04888..5445c506b050c 100644
--- a/pandas/io/tests/test_pickle.py
+++ b/pandas/tests/io/test_pickle.py
@@ -33,7 +33,7 @@ class TestPickle():
@classmethod
def setup_class(cls):
- from pandas.io.tests.generate_legacy_storage_files import (
+ from pandas.tests.io.generate_legacy_storage_files import (
create_pickle_data)
cls.data = create_pickle_data()
cls.path = u('__%s__.pickle' % tm.rands(10))
diff --git a/pandas/io/tests/test_pytables.py b/pandas/tests/io/test_pytables.py
similarity index 100%
rename from pandas/io/tests/test_pytables.py
rename to pandas/tests/io/test_pytables.py
diff --git a/pandas/io/tests/test_s3.py b/pandas/tests/io/test_s3.py
similarity index 100%
rename from pandas/io/tests/test_s3.py
rename to pandas/tests/io/test_s3.py
diff --git a/pandas/io/tests/test_sql.py b/pandas/tests/io/test_sql.py
similarity index 100%
rename from pandas/io/tests/test_sql.py
rename to pandas/tests/io/test_sql.py
diff --git a/pandas/io/tests/test_stata.py b/pandas/tests/io/test_stata.py
similarity index 100%
rename from pandas/io/tests/test_stata.py
rename to pandas/tests/io/test_stata.py
diff --git a/pandas/sparse/tests/__init__.py b/pandas/tests/msgpack/__init__.py
similarity index 100%
rename from pandas/sparse/tests/__init__.py
rename to pandas/tests/msgpack/__init__.py
diff --git a/pandas/tests/test_msgpack/test_buffer.py b/pandas/tests/msgpack/test_buffer.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_buffer.py
rename to pandas/tests/msgpack/test_buffer.py
diff --git a/pandas/tests/test_msgpack/test_case.py b/pandas/tests/msgpack/test_case.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_case.py
rename to pandas/tests/msgpack/test_case.py
diff --git a/pandas/tests/test_msgpack/test_except.py b/pandas/tests/msgpack/test_except.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_except.py
rename to pandas/tests/msgpack/test_except.py
diff --git a/pandas/tests/test_msgpack/test_extension.py b/pandas/tests/msgpack/test_extension.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_extension.py
rename to pandas/tests/msgpack/test_extension.py
diff --git a/pandas/tests/test_msgpack/test_format.py b/pandas/tests/msgpack/test_format.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_format.py
rename to pandas/tests/msgpack/test_format.py
diff --git a/pandas/tests/test_msgpack/test_limits.py b/pandas/tests/msgpack/test_limits.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_limits.py
rename to pandas/tests/msgpack/test_limits.py
diff --git a/pandas/tests/test_msgpack/test_newspec.py b/pandas/tests/msgpack/test_newspec.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_newspec.py
rename to pandas/tests/msgpack/test_newspec.py
diff --git a/pandas/tests/test_msgpack/test_obj.py b/pandas/tests/msgpack/test_obj.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_obj.py
rename to pandas/tests/msgpack/test_obj.py
diff --git a/pandas/tests/test_msgpack/test_pack.py b/pandas/tests/msgpack/test_pack.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_pack.py
rename to pandas/tests/msgpack/test_pack.py
diff --git a/pandas/tests/test_msgpack/test_read_size.py b/pandas/tests/msgpack/test_read_size.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_read_size.py
rename to pandas/tests/msgpack/test_read_size.py
diff --git a/pandas/tests/test_msgpack/test_seq.py b/pandas/tests/msgpack/test_seq.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_seq.py
rename to pandas/tests/msgpack/test_seq.py
diff --git a/pandas/tests/test_msgpack/test_sequnpack.py b/pandas/tests/msgpack/test_sequnpack.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_sequnpack.py
rename to pandas/tests/msgpack/test_sequnpack.py
diff --git a/pandas/tests/test_msgpack/test_subtype.py b/pandas/tests/msgpack/test_subtype.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_subtype.py
rename to pandas/tests/msgpack/test_subtype.py
diff --git a/pandas/tests/test_msgpack/test_unpack.py b/pandas/tests/msgpack/test_unpack.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_unpack.py
rename to pandas/tests/msgpack/test_unpack.py
diff --git a/pandas/tests/test_msgpack/test_unpack_raw.py b/pandas/tests/msgpack/test_unpack_raw.py
similarity index 100%
rename from pandas/tests/test_msgpack/test_unpack_raw.py
rename to pandas/tests/msgpack/test_unpack_raw.py
diff --git a/pandas/tests/test_msgpack/__init__.py b/pandas/tests/sparse/__init__.py
similarity index 100%
rename from pandas/tests/test_msgpack/__init__.py
rename to pandas/tests/sparse/__init__.py
diff --git a/pandas/sparse/tests/test_arithmetics.py b/pandas/tests/sparse/test_arithmetics.py
similarity index 100%
rename from pandas/sparse/tests/test_arithmetics.py
rename to pandas/tests/sparse/test_arithmetics.py
diff --git a/pandas/sparse/tests/test_array.py b/pandas/tests/sparse/test_array.py
similarity index 100%
rename from pandas/sparse/tests/test_array.py
rename to pandas/tests/sparse/test_array.py
diff --git a/pandas/sparse/tests/test_combine_concat.py b/pandas/tests/sparse/test_combine_concat.py
similarity index 100%
rename from pandas/sparse/tests/test_combine_concat.py
rename to pandas/tests/sparse/test_combine_concat.py
diff --git a/pandas/sparse/tests/test_format.py b/pandas/tests/sparse/test_format.py
similarity index 100%
rename from pandas/sparse/tests/test_format.py
rename to pandas/tests/sparse/test_format.py
diff --git a/pandas/sparse/tests/test_frame.py b/pandas/tests/sparse/test_frame.py
similarity index 100%
rename from pandas/sparse/tests/test_frame.py
rename to pandas/tests/sparse/test_frame.py
diff --git a/pandas/sparse/tests/test_groupby.py b/pandas/tests/sparse/test_groupby.py
similarity index 100%
rename from pandas/sparse/tests/test_groupby.py
rename to pandas/tests/sparse/test_groupby.py
diff --git a/pandas/sparse/tests/test_indexing.py b/pandas/tests/sparse/test_indexing.py
similarity index 100%
rename from pandas/sparse/tests/test_indexing.py
rename to pandas/tests/sparse/test_indexing.py
diff --git a/pandas/sparse/tests/test_libsparse.py b/pandas/tests/sparse/test_libsparse.py
similarity index 100%
rename from pandas/sparse/tests/test_libsparse.py
rename to pandas/tests/sparse/test_libsparse.py
diff --git a/pandas/sparse/tests/test_list.py b/pandas/tests/sparse/test_list.py
similarity index 100%
rename from pandas/sparse/tests/test_list.py
rename to pandas/tests/sparse/test_list.py
diff --git a/pandas/sparse/tests/test_pivot.py b/pandas/tests/sparse/test_pivot.py
similarity index 100%
rename from pandas/sparse/tests/test_pivot.py
rename to pandas/tests/sparse/test_pivot.py
diff --git a/pandas/sparse/tests/test_series.py b/pandas/tests/sparse/test_series.py
similarity index 100%
rename from pandas/sparse/tests/test_series.py
rename to pandas/tests/sparse/test_series.py
diff --git a/pandas/tools/tests/__init__.py b/pandas/tests/tools/__init__.py
similarity index 100%
rename from pandas/tools/tests/__init__.py
rename to pandas/tests/tools/__init__.py
diff --git a/pandas/tools/tests/data/allow_exact_matches.csv b/pandas/tests/tools/data/allow_exact_matches.csv
similarity index 100%
rename from pandas/tools/tests/data/allow_exact_matches.csv
rename to pandas/tests/tools/data/allow_exact_matches.csv
diff --git a/pandas/tools/tests/data/allow_exact_matches_and_tolerance.csv b/pandas/tests/tools/data/allow_exact_matches_and_tolerance.csv
similarity index 100%
rename from pandas/tools/tests/data/allow_exact_matches_and_tolerance.csv
rename to pandas/tests/tools/data/allow_exact_matches_and_tolerance.csv
diff --git a/pandas/tools/tests/data/asof.csv b/pandas/tests/tools/data/asof.csv
similarity index 100%
rename from pandas/tools/tests/data/asof.csv
rename to pandas/tests/tools/data/asof.csv
diff --git a/pandas/tools/tests/data/asof2.csv b/pandas/tests/tools/data/asof2.csv
similarity index 100%
rename from pandas/tools/tests/data/asof2.csv
rename to pandas/tests/tools/data/asof2.csv
diff --git a/pandas/tools/tests/data/cut_data.csv b/pandas/tests/tools/data/cut_data.csv
similarity index 100%
rename from pandas/tools/tests/data/cut_data.csv
rename to pandas/tests/tools/data/cut_data.csv
diff --git a/pandas/tools/tests/data/quotes.csv b/pandas/tests/tools/data/quotes.csv
similarity index 100%
rename from pandas/tools/tests/data/quotes.csv
rename to pandas/tests/tools/data/quotes.csv
diff --git a/pandas/tools/tests/data/quotes2.csv b/pandas/tests/tools/data/quotes2.csv
similarity index 100%
rename from pandas/tools/tests/data/quotes2.csv
rename to pandas/tests/tools/data/quotes2.csv
diff --git a/pandas/tools/tests/data/tolerance.csv b/pandas/tests/tools/data/tolerance.csv
similarity index 100%
rename from pandas/tools/tests/data/tolerance.csv
rename to pandas/tests/tools/data/tolerance.csv
diff --git a/pandas/tools/tests/data/trades.csv b/pandas/tests/tools/data/trades.csv
similarity index 100%
rename from pandas/tools/tests/data/trades.csv
rename to pandas/tests/tools/data/trades.csv
diff --git a/pandas/tools/tests/data/trades2.csv b/pandas/tests/tools/data/trades2.csv
similarity index 100%
rename from pandas/tools/tests/data/trades2.csv
rename to pandas/tests/tools/data/trades2.csv
diff --git a/pandas/tools/tests/test_concat.py b/pandas/tests/tools/test_concat.py
similarity index 100%
rename from pandas/tools/tests/test_concat.py
rename to pandas/tests/tools/test_concat.py
diff --git a/pandas/tools/tests/test_hashing.py b/pandas/tests/tools/test_hashing.py
similarity index 100%
rename from pandas/tools/tests/test_hashing.py
rename to pandas/tests/tools/test_hashing.py
diff --git a/pandas/tools/tests/test_join.py b/pandas/tests/tools/test_join.py
similarity index 99%
rename from pandas/tools/tests/test_join.py
rename to pandas/tests/tools/test_join.py
index fe5821a637205..ab42b1212301b 100644
--- a/pandas/tools/tests/test_join.py
+++ b/pandas/tests/tools/test_join.py
@@ -11,7 +11,7 @@
import pandas._join as _join
import pandas.util.testing as tm
-from pandas.tools.tests.test_merge import get_test_data, N, NGROUPS
+from pandas.tests.tools.test_merge import get_test_data, N, NGROUPS
a_ = np.array
diff --git a/pandas/tools/tests/test_merge.py b/pandas/tests/tools/test_merge.py
similarity index 100%
rename from pandas/tools/tests/test_merge.py
rename to pandas/tests/tools/test_merge.py
diff --git a/pandas/tools/tests/test_merge_asof.py b/pandas/tests/tools/test_merge_asof.py
similarity index 100%
rename from pandas/tools/tests/test_merge_asof.py
rename to pandas/tests/tools/test_merge_asof.py
diff --git a/pandas/tools/tests/test_merge_ordered.py b/pandas/tests/tools/test_merge_ordered.py
similarity index 100%
rename from pandas/tools/tests/test_merge_ordered.py
rename to pandas/tests/tools/test_merge_ordered.py
diff --git a/pandas/tools/tests/test_pivot.py b/pandas/tests/tools/test_pivot.py
similarity index 100%
rename from pandas/tools/tests/test_pivot.py
rename to pandas/tests/tools/test_pivot.py
diff --git a/pandas/tools/tests/test_tile.py b/pandas/tests/tools/test_tile.py
similarity index 100%
rename from pandas/tools/tests/test_tile.py
rename to pandas/tests/tools/test_tile.py
diff --git a/pandas/tools/tests/test_util.py b/pandas/tests/tools/test_util.py
similarity index 100%
rename from pandas/tools/tests/test_util.py
rename to pandas/tests/tools/test_util.py
diff --git a/setup.py b/setup.py
index edec53e9cefb0..cbcadce459c67 100755
--- a/setup.py
+++ b/setup.py
@@ -622,12 +622,10 @@ def pxd(name):
version=versioneer.get_version(),
packages=['pandas',
'pandas.api',
- 'pandas.api.tests',
'pandas.api.types',
'pandas.compat',
'pandas.compat.numpy',
'pandas.computation',
- 'pandas.computation.tests',
'pandas.core',
'pandas.indexes',
'pandas.io',
@@ -635,59 +633,61 @@ def pxd(name):
'pandas.io.sas',
'pandas.formats',
'pandas.sparse',
- 'pandas.sparse.tests',
'pandas.stats',
'pandas.util',
'pandas.tests',
+ 'pandas.tests.api',
+ 'pandas.tests.computation',
'pandas.tests.frame',
'pandas.tests.indexes',
'pandas.tests.indexes.datetimes',
'pandas.tests.indexes.timedeltas',
'pandas.tests.indexes.period',
+ 'pandas.tests.io',
+ 'pandas.tests.io.json',
+ 'pandas.tests.io.parser',
+ 'pandas.tests.io.sas',
'pandas.tests.groupby',
'pandas.tests.series',
'pandas.tests.formats',
+ 'pandas.tests.msgpack',
'pandas.tests.scalar',
+ 'pandas.tests.sparse',
'pandas.tests.tseries',
+ 'pandas.tests.tools',
'pandas.tests.types',
- 'pandas.tests.test_msgpack',
'pandas.tests.plotting',
'pandas.tools',
- 'pandas.tools.tests',
'pandas.tseries',
'pandas.types',
- 'pandas.io.tests',
- 'pandas.io.tests.json',
- 'pandas.io.tests.parser',
- 'pandas.io.tests.sas',
'pandas.msgpack',
'pandas.util.clipboard'
],
- package_data={'pandas.io': ['tests/data/legacy_hdf/*.h5',
- 'tests/data/legacy_pickle/*/*.pickle',
- 'tests/data/legacy_msgpack/*/*.msgpack',
- 'tests/data/*.csv*',
- 'tests/data/*.dta',
- 'tests/data/*.pickle',
- 'tests/data/*.txt',
- 'tests/data/*.xls',
- 'tests/data/*.xlsx',
- 'tests/data/*.xlsm',
- 'tests/data/*.table',
- 'tests/parser/data/*.csv',
- 'tests/parser/data/*.gz',
- 'tests/parser/data/*.bz2',
- 'tests/parser/data/*.txt',
- 'tests/sas/data/*.csv',
- 'tests/sas/data/*.xpt',
- 'tests/sas/data/*.sas7bdat',
- 'tests/data/*.html',
- 'tests/data/html_encoding/*.html',
- 'tests/json/data/*.json'],
- 'pandas.tools': ['tests/data/*.csv'],
- 'pandas.tests': ['data/*.csv'],
+ package_data={'pandas.tests': ['data/*.csv'],
'pandas.tests.formats': ['data/*.csv'],
'pandas.tests.indexes': ['data/*.pickle'],
+ 'pandas.tests.io': ['data/legacy_hdf/*.h5',
+ 'data/legacy_pickle/*/*.pickle',
+ 'data/legacy_msgpack/*/*.msgpack',
+ 'data/*.csv*',
+ 'data/*.dta',
+ 'data/*.pickle',
+ 'data/*.txt',
+ 'data/*.xls',
+ 'data/*.xlsx',
+ 'data/*.xlsm',
+ 'data/*.table',
+ 'parser/data/*.csv',
+ 'parser/data/*.gz',
+ 'parser/data/*.bz2',
+ 'parser/data/*.txt',
+ 'sas/data/*.csv',
+ 'sas/data/*.xpt',
+ 'sas/data/*.sas7bdat',
+ 'data/*.html',
+ 'data/html_encoding/*.html',
+ 'json/data/*.json'],
+ 'pandas.tests.tools': ['data/*.csv'],
'pandas.tests.tseries': ['data/*.pickle']
},
ext_modules=extensions,