diff --git a/tests/test_008-arbiter-env.py b/tests/test_arbiter.py
similarity index 100%
rename from tests/test_008-arbiter-env.py
rename to tests/test_arbiter.py
diff --git a/tests/test_003-config.py b/tests/test_config.py
similarity index 100%
rename from tests/test_003-config.py
rename to tests/test_config.py
diff --git a/tests/test_009-gaiohttp.py b/tests/test_gaiohttp.py
similarity index 100%
rename from tests/test_009-gaiohttp.py
rename to tests/test_gaiohttp.py
diff --git a/tests/test_004-http-body.py b/tests/test_http_body.py
similarity index 100%
rename from tests/test_004-http-body.py
rename to tests/test_http_body.py
diff --git a/tests/test_002-invalid-requests.py b/tests/test_invalid_requests.py
similarity index 100%
rename from tests/test_002-invalid-requests.py
rename to tests/test_invalid_requests.py
diff --git a/tests/test_006-logger.py b/tests/test_logger.py
similarity index 100%
rename from tests/test_006-logger.py
rename to tests/test_logger.py
diff --git a/tests/test_007-ssl.py b/tests/test_ssl.py
similarity index 100%
rename from tests/test_007-ssl.py
rename to tests/test_ssl.py
diff --git a/tests/test_001-valid-requests.py b/tests/test_valid_requests.py
similarity index 100%
rename from tests/test_001-valid-requests.py
rename to tests/test_valid_requests.py