diff --git a/tests/test_boot.robot b/tests/test_boot_devices.robot
similarity index 100%
rename from tests/test_boot.robot
rename to tests/test_boot_devices.robot
diff --git a/tests/test_bootpolicy.robot b/tests/test_boot_policies.robot
similarity index 100%
rename from tests/test_bootpolicy.robot
rename to tests/test_boot_policies.robot
diff --git a/tests/test_networkd.robot b/tests/test_network.robot
similarity index 100%
rename from tests/test_networkd.robot
rename to tests/test_network.robot
diff --git a/tests/test_obmcrest.robot b/tests/test_rest_interfaces.robot
similarity index 100%
rename from tests/test_obmcrest.robot
rename to tests/test_rest_interfaces.robot
diff --git a/tests/test_openbmc_service_restart_policy.robot b/tests/test_service_restart_policy.robot
similarity index 100%
rename from tests/test_openbmc_service_restart_policy.robot
rename to tests/test_service_restart_policy.robot
diff --git a/tests/test_warmreset.robot b/tests/test_warm_reset.robot
similarity index 100%
rename from tests/test_warmreset.robot
rename to tests/test_warm_reset.robot