diff --git a/bin/tests/system/checkds/tests-checkds.py b/bin/tests/system/checkds/tests_checkds.py
similarity index 100%
rename from bin/tests/system/checkds/tests-checkds.py
rename to bin/tests/system/checkds/tests_checkds.py
diff --git a/bin/tests/system/dispatch/tests-connreset.py b/bin/tests/system/dispatch/tests_connreset.py
similarity index 100%
rename from bin/tests/system/dispatch/tests-connreset.py
rename to bin/tests/system/dispatch/tests_connreset.py
diff --git a/bin/tests/system/rpzextra/tests-rpz-passthru-logging.py b/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
similarity index 100%
rename from bin/tests/system/rpzextra/tests-rpz-passthru-logging.py
rename to bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
diff --git a/bin/tests/system/shutdown/tests-shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
similarity index 100%
rename from bin/tests/system/shutdown/tests-shutdown.py
rename to bin/tests/system/shutdown/tests_shutdown.py
diff --git a/bin/tests/system/statschannel/tests-json.py b/bin/tests/system/statschannel/tests_json.py
similarity index 100%
rename from bin/tests/system/statschannel/tests-json.py
rename to bin/tests/system/statschannel/tests_json.py
diff --git a/bin/tests/system/statschannel/tests-xml.py b/bin/tests/system/statschannel/tests_xml.py
similarity index 100%
rename from bin/tests/system/statschannel/tests-xml.py
rename to bin/tests/system/statschannel/tests_xml.py
diff --git a/bin/tests/system/tcp/tests-tcp.py b/bin/tests/system/tcp/tests_tcp.py
similarity index 100%
rename from bin/tests/system/tcp/tests-tcp.py
rename to bin/tests/system/tcp/tests_tcp.py
diff --git a/bin/tests/system/timeouts/tests-tcp.py b/bin/tests/system/timeouts/tests_tcp_timeouts.py
similarity index 100%
rename from bin/tests/system/timeouts/tests-tcp.py
rename to bin/tests/system/timeouts/tests_tcp_timeouts.py
diff --git a/bin/tests/system/wildcard/tests-wildcard.py b/bin/tests/system/wildcard/tests_wildcard.py
similarity index 100%
rename from bin/tests/system/wildcard/tests-wildcard.py
rename to bin/tests/system/wildcard/tests_wildcard.py