diff --git a/astropy_xarray/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from astropy_xarray/tests/__init__.py
rename to tests/__init__.py
diff --git a/astropy_xarray/tests/test_accessors.py b/tests/test_accessors.py
similarity index 99%
rename from astropy_xarray/tests/test_accessors.py
rename to tests/test_accessors.py
index af0bc907..4cb02cc6 100644
--- a/astropy_xarray/tests/test_accessors.py
+++ b/tests/test_accessors.py
@@ -11,7 +11,7 @@
 
 from astropy_xarray import accessors, conversion
 from astropy_xarray.index import AstropyIndex
-from astropy_xarray.tests.utils import (
+from tests.utils import (
     assert_equal,
     assert_identical,
     assert_units_equal,
diff --git a/astropy_xarray/tests/test_accessors_coords.py b/tests/test_accessors_coords.py
similarity index 100%
rename from astropy_xarray/tests/test_accessors_coords.py
rename to tests/test_accessors_coords.py
diff --git a/astropy_xarray/tests/test_accessors_log.py b/tests/test_accessors_log.py
similarity index 100%
rename from astropy_xarray/tests/test_accessors_log.py
rename to tests/test_accessors_log.py
diff --git a/astropy_xarray/tests/test_accessors_time.py b/tests/test_accessors_time.py
similarity index 100%
rename from astropy_xarray/tests/test_accessors_time.py
rename to tests/test_accessors_time.py
diff --git a/astropy_xarray/tests/test_conversion.py b/tests/test_conversion.py
similarity index 99%
rename from astropy_xarray/tests/test_conversion.py
rename to tests/test_conversion.py
index 922bfb8b..bbd3940e 100644
--- a/astropy_xarray/tests/test_conversion.py
+++ b/tests/test_conversion.py
@@ -7,7 +7,7 @@
 
 from astropy_xarray import conversion
 from astropy_xarray.index import AstropyIndex
-from astropy_xarray.tests.utils import (
+from tests.utils import (
     assert_array_equal,
     assert_array_units_equal,
     assert_identical,
diff --git a/astropy_xarray/tests/test_formatting.py b/tests/test_formatting.py
similarity index 100%
rename from astropy_xarray/tests/test_formatting.py
rename to tests/test_formatting.py
diff --git a/astropy_xarray/tests/test_frame_conversion.py b/tests/test_frame_conversion.py
similarity index 100%
rename from astropy_xarray/tests/test_frame_conversion.py
rename to tests/test_frame_conversion.py
diff --git a/astropy_xarray/tests/test_index.py b/tests/test_index.py
similarity index 100%
rename from astropy_xarray/tests/test_index.py
rename to tests/test_index.py
diff --git a/astropy_xarray/tests/test_sky_coord.py b/tests/test_sky_coord.py
similarity index 100%
rename from astropy_xarray/tests/test_sky_coord.py
rename to tests/test_sky_coord.py
diff --git a/astropy_xarray/tests/test_testing.py b/tests/test_testing.py
similarity index 100%
rename from astropy_xarray/tests/test_testing.py
rename to tests/test_testing.py
diff --git a/astropy_xarray/tests/test_time.py b/tests/test_time.py
similarity index 100%
rename from astropy_xarray/tests/test_time.py
rename to tests/test_time.py
diff --git a/astropy_xarray/tests/test_visibility_serialization.py b/tests/test_visibility_serialization.py
similarity index 100%
rename from astropy_xarray/tests/test_visibility_serialization.py
rename to tests/test_visibility_serialization.py
diff --git a/astropy_xarray/tests/utils.py b/tests/utils.py
similarity index 100%
rename from astropy_xarray/tests/utils.py
rename to tests/utils.py