diff --git a/gui/obmc_gui/test/server_control/server_power_operations.robot b/gui/obmc_gui/test/server_control/test_obmc_gui_server_power_operations.robot
similarity index 100%
rename from gui/obmc_gui/test/server_control/server_power_operations.robot
rename to gui/obmc_gui/test/server_control/test_obmc_gui_server_power_operations.robot
diff --git a/gui/obmc_gui/test/server_overview/server_overview.robot b/gui/obmc_gui/test/server_overview/test_obmc_gui_server_overview.robot
similarity index 100%
rename from gui/obmc_gui/test/server_overview/server_overview.robot
rename to gui/obmc_gui/test/server_overview/test_obmc_gui_server_overview.robot