diff --git a/tests/test_io.py b/geopandas/io/tests/test_io.py
similarity index 100%
rename from tests/test_io.py
rename to geopandas/io/tests/test_io.py
diff --git a/tests/__init__.py b/geopandas/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to geopandas/tests/__init__.py
diff --git a/tests/baseline_images/test_plotting/lines_plot.png b/geopandas/tests/baseline_images/test_plotting/lines_plot.png
similarity index 100%
rename from tests/baseline_images/test_plotting/lines_plot.png
rename to geopandas/tests/baseline_images/test_plotting/lines_plot.png
diff --git a/tests/baseline_images/test_plotting/points_plot.png b/geopandas/tests/baseline_images/test_plotting/points_plot.png
similarity index 100%
rename from tests/baseline_images/test_plotting/points_plot.png
rename to geopandas/tests/baseline_images/test_plotting/points_plot.png
diff --git a/tests/baseline_images/test_plotting/poly_plot.png b/geopandas/tests/baseline_images/test_plotting/poly_plot.png
similarity index 100%
rename from tests/baseline_images/test_plotting/poly_plot.png
rename to geopandas/tests/baseline_images/test_plotting/poly_plot.png
diff --git a/tests/baseline_images/test_plotting/poly_plot_with_kwargs.png b/geopandas/tests/baseline_images/test_plotting/poly_plot_with_kwargs.png
similarity index 100%
rename from tests/baseline_images/test_plotting/poly_plot_with_kwargs.png
rename to geopandas/tests/baseline_images/test_plotting/poly_plot_with_kwargs.png
diff --git a/tests/test_geocode.py b/geopandas/tests/test_geocode.py
similarity index 100%
rename from tests/test_geocode.py
rename to geopandas/tests/test_geocode.py
diff --git a/tests/test_geodataframe.py b/geopandas/tests/test_geodataframe.py
similarity index 100%
rename from tests/test_geodataframe.py
rename to geopandas/tests/test_geodataframe.py
diff --git a/tests/test_geom_methods.py b/geopandas/tests/test_geom_methods.py
similarity index 100%
rename from tests/test_geom_methods.py
rename to geopandas/tests/test_geom_methods.py
diff --git a/tests/test_geoseries.py b/geopandas/tests/test_geoseries.py
similarity index 100%
rename from tests/test_geoseries.py
rename to geopandas/tests/test_geoseries.py
diff --git a/tests/test_overlay.py b/geopandas/tests/test_overlay.py
similarity index 100%
rename from tests/test_overlay.py
rename to geopandas/tests/test_overlay.py
diff --git a/tests/test_plotting.py b/geopandas/tests/test_plotting.py
similarity index 100%
rename from tests/test_plotting.py
rename to geopandas/tests/test_plotting.py
diff --git a/tests/test_sindex.py b/geopandas/tests/test_sindex.py
similarity index 100%
rename from tests/test_sindex.py
rename to geopandas/tests/test_sindex.py
diff --git a/tests/test_types.py b/geopandas/tests/test_types.py
similarity index 100%
rename from tests/test_types.py
rename to geopandas/tests/test_types.py
diff --git a/tests/util.py b/geopandas/tests/util.py
similarity index 100%
rename from tests/util.py
rename to geopandas/tests/util.py
diff --git a/tests/test_sjoin.py b/geopandas/tools/tests/test_sjoin.py
similarity index 100%
rename from tests/test_sjoin.py
rename to geopandas/tools/tests/test_sjoin.py
diff --git a/tests/test_tools.py b/geopandas/tools/tests/test_tools.py
similarity index 100%
rename from tests/test_tools.py
rename to geopandas/tools/tests/test_tools.py