diff --git a/tests/test_pylast_album.py b/tests/test_album.py
similarity index 100%
rename from tests/test_pylast_album.py
rename to tests/test_album.py
diff --git a/tests/test_pylast_artist.py b/tests/test_artist.py
similarity index 100%
rename from tests/test_pylast_artist.py
rename to tests/test_artist.py
diff --git a/tests/test_pylast_country.py b/tests/test_country.py
similarity index 100%
rename from tests/test_pylast_country.py
rename to tests/test_country.py
diff --git a/tests/test_pylast_library.py b/tests/test_library.py
similarity index 100%
rename from tests/test_pylast_library.py
rename to tests/test_library.py
diff --git a/tests/test_pylast_librefm.py b/tests/test_librefm.py
similarity index 100%
rename from tests/test_pylast_librefm.py
rename to tests/test_librefm.py
diff --git a/tests/test_pylast_network.py b/tests/test_network.py
similarity index 100%
rename from tests/test_pylast_network.py
rename to tests/test_network.py
diff --git a/tests/test_pylast_tag.py b/tests/test_tag.py
similarity index 100%
rename from tests/test_pylast_tag.py
rename to tests/test_tag.py
diff --git a/tests/test_pylast_track.py b/tests/test_track.py
similarity index 100%
rename from tests/test_pylast_track.py
rename to tests/test_track.py
diff --git a/tests/test_pylast_user.py b/tests/test_user.py
similarity index 100%
rename from tests/test_pylast_user.py
rename to tests/test_user.py