diff --git a/tests/indexes/arithmetic/__init__.py b/tests/indexes/bool/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/__init__.py
rename to tests/indexes/bool/__init__.py
diff --git a/tests/indexes/arithmetic/bool/test_add.py b/tests/indexes/bool/test_add.py
similarity index 100%
rename from tests/indexes/arithmetic/bool/test_add.py
rename to tests/indexes/bool/test_add.py
diff --git a/tests/indexes/arithmetic/bool/test_mul.py b/tests/indexes/bool/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/bool/test_mul.py
rename to tests/indexes/bool/test_mul.py
diff --git a/tests/indexes/arithmetic/bool/test_sub.py b/tests/indexes/bool/test_sub.py
similarity index 100%
rename from tests/indexes/arithmetic/bool/test_sub.py
rename to tests/indexes/bool/test_sub.py
diff --git a/tests/indexes/arithmetic/bool/test_truediv.py b/tests/indexes/bool/test_truediv.py
similarity index 100%
rename from tests/indexes/arithmetic/bool/test_truediv.py
rename to tests/indexes/bool/test_truediv.py
diff --git a/tests/indexes/arithmetic/bool/__init__.py b/tests/indexes/complex/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/bool/__init__.py
rename to tests/indexes/complex/__init__.py
diff --git a/tests/indexes/arithmetic/complex/test_add.py b/tests/indexes/complex/test_add.py
similarity index 100%
rename from tests/indexes/arithmetic/complex/test_add.py
rename to tests/indexes/complex/test_add.py
diff --git a/tests/indexes/arithmetic/complex/test_mul.py b/tests/indexes/complex/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/complex/test_mul.py
rename to tests/indexes/complex/test_mul.py
diff --git a/tests/indexes/arithmetic/complex/test_sub.py b/tests/indexes/complex/test_sub.py
similarity index 100%
rename from tests/indexes/arithmetic/complex/test_sub.py
rename to tests/indexes/complex/test_sub.py
diff --git a/tests/indexes/arithmetic/complex/test_truediv.py b/tests/indexes/complex/test_truediv.py
similarity index 100%
rename from tests/indexes/arithmetic/complex/test_truediv.py
rename to tests/indexes/complex/test_truediv.py
diff --git a/tests/indexes/arithmetic/complex/__init__.py b/tests/indexes/datetimeindex/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/complex/__init__.py
rename to tests/indexes/datetimeindex/__init__.py
diff --git a/tests/indexes/arithmetic/datetimeindex/__init__.py b/tests/indexes/float/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/datetimeindex/__init__.py
rename to tests/indexes/float/__init__.py
diff --git a/tests/indexes/arithmetic/float/test_add.py b/tests/indexes/float/test_add.py
similarity index 100%
rename from tests/indexes/arithmetic/float/test_add.py
rename to tests/indexes/float/test_add.py
diff --git a/tests/indexes/arithmetic/float/test_floordiv.py b/tests/indexes/float/test_floordiv.py
similarity index 100%
rename from tests/indexes/arithmetic/float/test_floordiv.py
rename to tests/indexes/float/test_floordiv.py
diff --git a/tests/indexes/arithmetic/float/test_mul.py b/tests/indexes/float/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/float/test_mul.py
rename to tests/indexes/float/test_mul.py
diff --git a/tests/indexes/arithmetic/float/test_sub.py b/tests/indexes/float/test_sub.py
similarity index 100%
rename from tests/indexes/arithmetic/float/test_sub.py
rename to tests/indexes/float/test_sub.py
diff --git a/tests/indexes/arithmetic/float/test_truediv.py b/tests/indexes/float/test_truediv.py
similarity index 100%
rename from tests/indexes/arithmetic/float/test_truediv.py
rename to tests/indexes/float/test_truediv.py
diff --git a/tests/indexes/arithmetic/float/__init__.py b/tests/indexes/int/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/float/__init__.py
rename to tests/indexes/int/__init__.py
diff --git a/tests/indexes/arithmetic/int/test_add.py b/tests/indexes/int/test_add.py
similarity index 100%
rename from tests/indexes/arithmetic/int/test_add.py
rename to tests/indexes/int/test_add.py
diff --git a/tests/indexes/arithmetic/int/test_floordiv.py b/tests/indexes/int/test_floordiv.py
similarity index 100%
rename from tests/indexes/arithmetic/int/test_floordiv.py
rename to tests/indexes/int/test_floordiv.py
diff --git a/tests/indexes/arithmetic/int/test_mul.py b/tests/indexes/int/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/int/test_mul.py
rename to tests/indexes/int/test_mul.py
diff --git a/tests/indexes/arithmetic/int/test_sub.py b/tests/indexes/int/test_sub.py
similarity index 100%
rename from tests/indexes/arithmetic/int/test_sub.py
rename to tests/indexes/int/test_sub.py
diff --git a/tests/indexes/arithmetic/int/test_truediv.py b/tests/indexes/int/test_truediv.py
similarity index 100%
rename from tests/indexes/arithmetic/int/test_truediv.py
rename to tests/indexes/int/test_truediv.py
diff --git a/tests/indexes/arithmetic/int/__init__.py b/tests/indexes/str/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/int/__init__.py
rename to tests/indexes/str/__init__.py
diff --git a/tests/indexes/arithmetic/str/test_add.py b/tests/indexes/str/test_add.py
similarity index 100%
rename from tests/indexes/arithmetic/str/test_add.py
rename to tests/indexes/str/test_add.py
diff --git a/tests/indexes/arithmetic/str/test_mul.py b/tests/indexes/str/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/str/test_mul.py
rename to tests/indexes/str/test_mul.py
diff --git a/tests/indexes/arithmetic/test_add.py b/tests/indexes/test_add.py
similarity index 100%
rename from tests/indexes/arithmetic/test_add.py
rename to tests/indexes/test_add.py
diff --git a/tests/indexes/arithmetic/test_floordiv.py b/tests/indexes/test_floordiv.py
similarity index 100%
rename from tests/indexes/arithmetic/test_floordiv.py
rename to tests/indexes/test_floordiv.py
diff --git a/tests/indexes/arithmetic/test_mul.py b/tests/indexes/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/test_mul.py
rename to tests/indexes/test_mul.py
diff --git a/tests/indexes/arithmetic/test_sub.py b/tests/indexes/test_sub.py
similarity index 100%
rename from tests/indexes/arithmetic/test_sub.py
rename to tests/indexes/test_sub.py
diff --git a/tests/indexes/arithmetic/test_truediv.py b/tests/indexes/test_truediv.py
similarity index 100%
rename from tests/indexes/arithmetic/test_truediv.py
rename to tests/indexes/test_truediv.py
diff --git a/tests/indexes/arithmetic/str/__init__.py b/tests/indexes/timedeltaindex/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/str/__init__.py
rename to tests/indexes/timedeltaindex/__init__.py
diff --git a/tests/indexes/arithmetic/timedeltaindex/test_floordiv.py b/tests/indexes/timedeltaindex/test_floordiv.py
similarity index 100%
rename from tests/indexes/arithmetic/timedeltaindex/test_floordiv.py
rename to tests/indexes/timedeltaindex/test_floordiv.py
diff --git a/tests/indexes/arithmetic/timedeltaindex/test_mul.py b/tests/indexes/timedeltaindex/test_mul.py
similarity index 100%
rename from tests/indexes/arithmetic/timedeltaindex/test_mul.py
rename to tests/indexes/timedeltaindex/test_mul.py
diff --git a/tests/indexes/arithmetic/timedeltaindex/test_truediv.py b/tests/indexes/timedeltaindex/test_truediv.py
similarity index 100%
rename from tests/indexes/arithmetic/timedeltaindex/test_truediv.py
rename to tests/indexes/timedeltaindex/test_truediv.py
diff --git a/tests/series/arithmetic/timedelta/__init__.py b/tests/series/arithmetic/timedelta/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/series/arithmetic/timestamp/__init__.py b/tests/series/arithmetic/timestamp/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/indexes/arithmetic/timedeltaindex/__init__.py b/tests/series/bool/__init__.py
similarity index 100%
rename from tests/indexes/arithmetic/timedeltaindex/__init__.py
rename to tests/series/bool/__init__.py
diff --git a/tests/series/arithmetic/bool/test_add.py b/tests/series/bool/test_add.py
similarity index 100%
rename from tests/series/arithmetic/bool/test_add.py
rename to tests/series/bool/test_add.py
diff --git a/tests/series/arithmetic/bool/test_mul.py b/tests/series/bool/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/bool/test_mul.py
rename to tests/series/bool/test_mul.py
diff --git a/tests/series/arithmetic/bool/test_sub.py b/tests/series/bool/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/bool/test_sub.py
rename to tests/series/bool/test_sub.py
diff --git a/tests/series/arithmetic/bool/test_truediv.py b/tests/series/bool/test_truediv.py
similarity index 100%
rename from tests/series/arithmetic/bool/test_truediv.py
rename to tests/series/bool/test_truediv.py
diff --git a/tests/series/arithmetic/__init__.py b/tests/series/complex/__init__.py
similarity index 100%
rename from tests/series/arithmetic/__init__.py
rename to tests/series/complex/__init__.py
diff --git a/tests/series/arithmetic/complex/test_add.py b/tests/series/complex/test_add.py
similarity index 100%
rename from tests/series/arithmetic/complex/test_add.py
rename to tests/series/complex/test_add.py
diff --git a/tests/series/arithmetic/complex/test_mul.py b/tests/series/complex/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/complex/test_mul.py
rename to tests/series/complex/test_mul.py
diff --git a/tests/series/arithmetic/complex/test_sub.py b/tests/series/complex/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/complex/test_sub.py
rename to tests/series/complex/test_sub.py
diff --git a/tests/series/arithmetic/complex/test_truediv.py b/tests/series/complex/test_truediv.py
similarity index 100%
rename from tests/series/arithmetic/complex/test_truediv.py
rename to tests/series/complex/test_truediv.py
diff --git a/tests/series/arithmetic/bool/__init__.py b/tests/series/float/__init__.py
similarity index 100%
rename from tests/series/arithmetic/bool/__init__.py
rename to tests/series/float/__init__.py
diff --git a/tests/series/arithmetic/float/test_add.py b/tests/series/float/test_add.py
similarity index 100%
rename from tests/series/arithmetic/float/test_add.py
rename to tests/series/float/test_add.py
diff --git a/tests/series/arithmetic/float/test_floordiv.py b/tests/series/float/test_floordiv.py
similarity index 100%
rename from tests/series/arithmetic/float/test_floordiv.py
rename to tests/series/float/test_floordiv.py
diff --git a/tests/series/arithmetic/float/test_mul.py b/tests/series/float/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/float/test_mul.py
rename to tests/series/float/test_mul.py
diff --git a/tests/series/arithmetic/float/test_sub.py b/tests/series/float/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/float/test_sub.py
rename to tests/series/float/test_sub.py
diff --git a/tests/series/arithmetic/float/test_truediv.py b/tests/series/float/test_truediv.py
similarity index 100%
rename from tests/series/arithmetic/float/test_truediv.py
rename to tests/series/float/test_truediv.py
diff --git a/tests/series/arithmetic/complex/__init__.py b/tests/series/int/__init__.py
similarity index 100%
rename from tests/series/arithmetic/complex/__init__.py
rename to tests/series/int/__init__.py
diff --git a/tests/series/arithmetic/int/test_add.py b/tests/series/int/test_add.py
similarity index 100%
rename from tests/series/arithmetic/int/test_add.py
rename to tests/series/int/test_add.py
diff --git a/tests/series/arithmetic/int/test_floordiv.py b/tests/series/int/test_floordiv.py
similarity index 100%
rename from tests/series/arithmetic/int/test_floordiv.py
rename to tests/series/int/test_floordiv.py
diff --git a/tests/series/arithmetic/int/test_mul.py b/tests/series/int/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/int/test_mul.py
rename to tests/series/int/test_mul.py
diff --git a/tests/series/arithmetic/int/test_sub.py b/tests/series/int/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/int/test_sub.py
rename to tests/series/int/test_sub.py
diff --git a/tests/series/arithmetic/int/test_truediv.py b/tests/series/int/test_truediv.py
similarity index 100%
rename from tests/series/arithmetic/int/test_truediv.py
rename to tests/series/int/test_truediv.py
diff --git a/tests/series/arithmetic/float/__init__.py b/tests/series/period/__init__.py
similarity index 100%
rename from tests/series/arithmetic/float/__init__.py
rename to tests/series/period/__init__.py
diff --git a/tests/series/arithmetic/period/test_sub.py b/tests/series/period/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/period/test_sub.py
rename to tests/series/period/test_sub.py
diff --git a/tests/series/arithmetic/int/__init__.py b/tests/series/str/__init__.py
similarity index 100%
rename from tests/series/arithmetic/int/__init__.py
rename to tests/series/str/__init__.py
diff --git a/tests/series/arithmetic/str/test_add.py b/tests/series/str/test_add.py
similarity index 100%
rename from tests/series/arithmetic/str/test_add.py
rename to tests/series/str/test_add.py
diff --git a/tests/series/arithmetic/str/test_mul.py b/tests/series/str/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/str/test_mul.py
rename to tests/series/str/test_mul.py
diff --git a/tests/series/arithmetic/test_add.py b/tests/series/test_add.py
similarity index 100%
rename from tests/series/arithmetic/test_add.py
rename to tests/series/test_add.py
diff --git a/tests/series/arithmetic/test_floordiv.py b/tests/series/test_floordiv.py
similarity index 100%
rename from tests/series/arithmetic/test_floordiv.py
rename to tests/series/test_floordiv.py
diff --git a/tests/series/arithmetic/test_mul.py b/tests/series/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/test_mul.py
rename to tests/series/test_mul.py
diff --git a/tests/series/arithmetic/test_sub.py b/tests/series/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/test_sub.py
rename to tests/series/test_sub.py
diff --git a/tests/series/arithmetic/test_truediv.py b/tests/series/test_truediv.py
similarity index 100%
rename from tests/series/arithmetic/test_truediv.py
rename to tests/series/test_truediv.py
diff --git a/tests/series/arithmetic/period/__init__.py b/tests/series/timedelta/__init__.py
similarity index 100%
rename from tests/series/arithmetic/period/__init__.py
rename to tests/series/timedelta/__init__.py
diff --git a/tests/series/arithmetic/timedelta/test_add.py b/tests/series/timedelta/test_add.py
similarity index 100%
rename from tests/series/arithmetic/timedelta/test_add.py
rename to tests/series/timedelta/test_add.py
diff --git a/tests/series/arithmetic/timedelta/test_floordiv.py b/tests/series/timedelta/test_floordiv.py
similarity index 100%
rename from tests/series/arithmetic/timedelta/test_floordiv.py
rename to tests/series/timedelta/test_floordiv.py
diff --git a/tests/series/arithmetic/timedelta/test_mul.py b/tests/series/timedelta/test_mul.py
similarity index 100%
rename from tests/series/arithmetic/timedelta/test_mul.py
rename to tests/series/timedelta/test_mul.py
diff --git a/tests/series/arithmetic/timedelta/test_sub.py b/tests/series/timedelta/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/timedelta/test_sub.py
rename to tests/series/timedelta/test_sub.py
diff --git a/tests/series/arithmetic/timedelta/test_truediv.py b/tests/series/timedelta/test_truediv.py
similarity index 100%
rename from tests/series/arithmetic/timedelta/test_truediv.py
rename to tests/series/timedelta/test_truediv.py
diff --git a/tests/series/arithmetic/str/__init__.py b/tests/series/timestamp/__init__.py
similarity index 100%
rename from tests/series/arithmetic/str/__init__.py
rename to tests/series/timestamp/__init__.py
diff --git a/tests/series/arithmetic/timestamp/test_add.py b/tests/series/timestamp/test_add.py
similarity index 100%
rename from tests/series/arithmetic/timestamp/test_add.py
rename to tests/series/timestamp/test_add.py
diff --git a/tests/series/arithmetic/timestamp/test_sub.py b/tests/series/timestamp/test_sub.py
similarity index 100%
rename from tests/series/arithmetic/timestamp/test_sub.py
rename to tests/series/timestamp/test_sub.py