diff --git a/tests/audio/actor_test.py b/tests/audio/test_actor.py
similarity index 100%
rename from tests/audio/actor_test.py
rename to tests/audio/test_actor.py
diff --git a/tests/audio/listener_test.py b/tests/audio/test_listener.py
similarity index 100%
rename from tests/audio/listener_test.py
rename to tests/audio/test_listener.py
diff --git a/tests/audio/playlists_test.py b/tests/audio/test_playlists.py
similarity index 100%
rename from tests/audio/playlists_test.py
rename to tests/audio/test_playlists.py
diff --git a/tests/audio/scan_test.py b/tests/audio/test_scan.py
similarity index 100%
rename from tests/audio/scan_test.py
rename to tests/audio/test_scan.py
diff --git a/tests/backend/listener_test.py b/tests/backend/test_listener.py
similarity index 100%
rename from tests/backend/listener_test.py
rename to tests/backend/test_listener.py
diff --git a/tests/config/config_test.py b/tests/config/test_config.py
similarity index 100%
rename from tests/config/config_test.py
rename to tests/config/test_config.py
diff --git a/tests/config/schemas_test.py b/tests/config/test_schemas.py
similarity index 100%
rename from tests/config/schemas_test.py
rename to tests/config/test_schemas.py
diff --git a/tests/config/types_test.py b/tests/config/test_types.py
similarity index 100%
rename from tests/config/types_test.py
rename to tests/config/test_types.py
diff --git a/tests/config/validator_tests.py b/tests/config/test_validator.py
similarity index 100%
rename from tests/config/validator_tests.py
rename to tests/config/test_validator.py
diff --git a/tests/core/actor_test.py b/tests/core/test_actor.py
similarity index 100%
rename from tests/core/actor_test.py
rename to tests/core/test_actor.py
diff --git a/tests/core/events_test.py b/tests/core/test_events.py
similarity index 100%
rename from tests/core/events_test.py
rename to tests/core/test_events.py
diff --git a/tests/core/library_test.py b/tests/core/test_library.py
similarity index 100%
rename from tests/core/library_test.py
rename to tests/core/test_library.py
diff --git a/tests/core/listener_test.py b/tests/core/test_listener.py
similarity index 100%
rename from tests/core/listener_test.py
rename to tests/core/test_listener.py
diff --git a/tests/core/playback_test.py b/tests/core/test_playback.py
similarity index 100%
rename from tests/core/playback_test.py
rename to tests/core/test_playback.py
diff --git a/tests/core/playlists_test.py b/tests/core/test_playlists.py
similarity index 100%
rename from tests/core/playlists_test.py
rename to tests/core/test_playlists.py
diff --git a/tests/core/tracklist_test.py b/tests/core/test_tracklist.py
similarity index 100%
rename from tests/core/tracklist_test.py
rename to tests/core/test_tracklist.py
diff --git a/tests/http/events_test.py b/tests/http/test_events.py
similarity index 100%
rename from tests/http/events_test.py
rename to tests/http/test_events.py
diff --git a/tests/local/events_test.py b/tests/local/test_events.py
similarity index 100%
rename from tests/local/events_test.py
rename to tests/local/test_events.py
diff --git a/tests/local/library_test.py b/tests/local/test_library.py
similarity index 100%
rename from tests/local/library_test.py
rename to tests/local/test_library.py
diff --git a/tests/local/playback_test.py b/tests/local/test_playback.py
similarity index 100%
rename from tests/local/playback_test.py
rename to tests/local/test_playback.py
diff --git a/tests/local/playlists_test.py b/tests/local/test_playlists.py
similarity index 100%
rename from tests/local/playlists_test.py
rename to tests/local/test_playlists.py
diff --git a/tests/local/tracklist_test.py b/tests/local/test_tracklist.py
similarity index 100%
rename from tests/local/tracklist_test.py
rename to tests/local/test_tracklist.py
diff --git a/tests/local/translator_test.py b/tests/local/test_translator.py
similarity index 100%
rename from tests/local/translator_test.py
rename to tests/local/test_translator.py
diff --git a/tests/mpd/protocol/audio_output_test.py b/tests/mpd/protocol/test_audio_output.py
similarity index 100%
rename from tests/mpd/protocol/audio_output_test.py
rename to tests/mpd/protocol/test_audio_output.py
diff --git a/tests/mpd/protocol/authentication_test.py b/tests/mpd/protocol/test_authentication.py
similarity index 100%
rename from tests/mpd/protocol/authentication_test.py
rename to tests/mpd/protocol/test_authentication.py
diff --git a/tests/mpd/protocol/channels_test.py b/tests/mpd/protocol/test_channels.py
similarity index 100%
rename from tests/mpd/protocol/channels_test.py
rename to tests/mpd/protocol/test_channels.py
diff --git a/tests/mpd/protocol/command_list_test.py b/tests/mpd/protocol/test_command_list.py
similarity index 100%
rename from tests/mpd/protocol/command_list_test.py
rename to tests/mpd/protocol/test_command_list.py
diff --git a/tests/mpd/protocol/connection_test.py b/tests/mpd/protocol/test_connection.py
similarity index 100%
rename from tests/mpd/protocol/connection_test.py
rename to tests/mpd/protocol/test_connection.py
diff --git a/tests/mpd/protocol/current_playlist_test.py b/tests/mpd/protocol/test_current_playlist.py
similarity index 100%
rename from tests/mpd/protocol/current_playlist_test.py
rename to tests/mpd/protocol/test_current_playlist.py
diff --git a/tests/mpd/protocol/idle_test.py b/tests/mpd/protocol/test_idle.py
similarity index 100%
rename from tests/mpd/protocol/idle_test.py
rename to tests/mpd/protocol/test_idle.py
diff --git a/tests/mpd/protocol/music_db_test.py b/tests/mpd/protocol/test_music_db.py
similarity index 100%
rename from tests/mpd/protocol/music_db_test.py
rename to tests/mpd/protocol/test_music_db.py
diff --git a/tests/mpd/protocol/playback_test.py b/tests/mpd/protocol/test_playback.py
similarity index 100%
rename from tests/mpd/protocol/playback_test.py
rename to tests/mpd/protocol/test_playback.py
diff --git a/tests/mpd/protocol/reflection_test.py b/tests/mpd/protocol/test_reflection.py
similarity index 100%
rename from tests/mpd/protocol/reflection_test.py
rename to tests/mpd/protocol/test_reflection.py
diff --git a/tests/mpd/protocol/regression_test.py b/tests/mpd/protocol/test_regression.py
similarity index 100%
rename from tests/mpd/protocol/regression_test.py
rename to tests/mpd/protocol/test_regression.py
diff --git a/tests/mpd/protocol/status_test.py b/tests/mpd/protocol/test_status.py
similarity index 100%
rename from tests/mpd/protocol/status_test.py
rename to tests/mpd/protocol/test_status.py
diff --git a/tests/mpd/protocol/stickers_test.py b/tests/mpd/protocol/test_stickers.py
similarity index 100%
rename from tests/mpd/protocol/stickers_test.py
rename to tests/mpd/protocol/test_stickers.py
diff --git a/tests/mpd/protocol/stored_playlists_test.py b/tests/mpd/protocol/test_stored_playlists.py
similarity index 100%
rename from tests/mpd/protocol/stored_playlists_test.py
rename to tests/mpd/protocol/test_stored_playlists.py
diff --git a/tests/mpd/dispatcher_test.py b/tests/mpd/test_dispatcher.py
similarity index 100%
rename from tests/mpd/dispatcher_test.py
rename to tests/mpd/test_dispatcher.py
diff --git a/tests/mpd/exception_test.py b/tests/mpd/test_exceptions.py
similarity index 100%
rename from tests/mpd/exception_test.py
rename to tests/mpd/test_exceptions.py
diff --git a/tests/mpd/status_test.py b/tests/mpd/test_status.py
similarity index 100%
rename from tests/mpd/status_test.py
rename to tests/mpd/test_status.py
diff --git a/tests/mpd/translator_test.py b/tests/mpd/test_translator.py
similarity index 100%
rename from tests/mpd/translator_test.py
rename to tests/mpd/test_translator.py
diff --git a/tests/outputs/__init__.py b/tests/outputs/__init__.py
deleted file mode 100644
index baffc488..00000000
--- a/tests/outputs/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/tests/commands_test.py b/tests/test_commands.py
similarity index 100%
rename from tests/commands_test.py
rename to tests/test_commands.py
diff --git a/tests/exceptions_test.py b/tests/test_exceptions.py
similarity index 100%
rename from tests/exceptions_test.py
rename to tests/test_exceptions.py
diff --git a/tests/ext_test.py b/tests/test_ext.py
similarity index 100%
rename from tests/ext_test.py
rename to tests/test_ext.py
diff --git a/tests/help_test.py b/tests/test_help.py
similarity index 100%
rename from tests/help_test.py
rename to tests/test_help.py
diff --git a/tests/models_test.py b/tests/test_models.py
similarity index 100%
rename from tests/models_test.py
rename to tests/test_models.py
diff --git a/tests/version_test.py b/tests/test_version.py
similarity index 100%
rename from tests/version_test.py
rename to tests/test_version.py
diff --git a/tests/utils/network/connection_test.py b/tests/utils/network/test_connection.py
similarity index 100%
rename from tests/utils/network/connection_test.py
rename to tests/utils/network/test_connection.py
diff --git a/tests/utils/network/lineprotocol_test.py b/tests/utils/network/test_lineprotocol.py
similarity index 100%
rename from tests/utils/network/lineprotocol_test.py
rename to tests/utils/network/test_lineprotocol.py
diff --git a/tests/utils/network/server_test.py b/tests/utils/network/test_server.py
similarity index 100%
rename from tests/utils/network/server_test.py
rename to tests/utils/network/test_server.py
diff --git a/tests/utils/network/utils_test.py b/tests/utils/network/test_utils.py
similarity index 100%
rename from tests/utils/network/utils_test.py
rename to tests/utils/network/test_utils.py
diff --git a/tests/utils/deps_test.py b/tests/utils/test_deps.py
similarity index 100%
rename from tests/utils/deps_test.py
rename to tests/utils/test_deps.py
diff --git a/tests/utils/encoding_test.py b/tests/utils/test_encoding.py
similarity index 100%
rename from tests/utils/encoding_test.py
rename to tests/utils/test_encoding.py
diff --git a/tests/utils/jsonrpc_test.py b/tests/utils/test_jsonrpc.py
similarity index 100%
rename from tests/utils/jsonrpc_test.py
rename to tests/utils/test_jsonrpc.py
diff --git a/tests/utils/path_test.py b/tests/utils/test_path.py
similarity index 100%
rename from tests/utils/path_test.py
rename to tests/utils/test_path.py