diff --git a/gui/gui_test/access_control/test_obmc_gui_certificate.robot b/gui/gui_test/access_control_menu/test_obmc_gui_certificate.robot
similarity index 100%
rename from gui/gui_test/access_control/test_obmc_gui_certificate.robot
rename to gui/gui_test/access_control_menu/test_obmc_gui_certificate.robot
diff --git a/gui/gui_test/access_control/test_obmc_gui_client_sessions_sub_menu.robot b/gui/gui_test/access_control_menu/test_obmc_gui_client_sessions_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control/test_obmc_gui_client_sessions_sub_menu.robot
rename to gui/gui_test/access_control_menu/test_obmc_gui_client_sessions_sub_menu.robot
diff --git a/gui/gui_test/access_control/test_obmc_gui_ldap.robot b/gui/gui_test/access_control_menu/test_obmc_gui_ldap.robot
similarity index 100%
rename from gui/gui_test/access_control/test_obmc_gui_ldap.robot
rename to gui/gui_test/access_control_menu/test_obmc_gui_ldap.robot
diff --git a/gui/gui_test/access_control/test_obmc_gui_local_users.robot b/gui/gui_test/access_control_menu/test_obmc_gui_local_users.robot
similarity index 100%
rename from gui/gui_test/access_control/test_obmc_gui_local_users.robot
rename to gui/gui_test/access_control_menu/test_obmc_gui_local_users.robot
diff --git a/gui/gui_test/server_config/test_date_time_settings_sub_menu.robot b/gui/gui_test/configuration_menu/test_date_time_settings_sub_menu.robot
similarity index 100%
rename from gui/gui_test/server_config/test_date_time_settings_sub_menu.robot
rename to gui/gui_test/configuration_menu/test_date_time_settings_sub_menu.robot
diff --git a/gui/gui_test/server_config/test_obmc_gui_firmware_update.robot b/gui/gui_test/configuration_menu/test_obmc_gui_firmware_update.robot
similarity index 100%
rename from gui/gui_test/server_config/test_obmc_gui_firmware_update.robot
rename to gui/gui_test/configuration_menu/test_obmc_gui_firmware_update.robot
diff --git a/gui/gui_test/server_config/test_obmc_gui_network_settings.robot b/gui/gui_test/configuration_menu/test_obmc_gui_network_settings.robot
similarity index 100%
rename from gui/gui_test/server_config/test_obmc_gui_network_settings.robot
rename to gui/gui_test/configuration_menu/test_obmc_gui_network_settings.robot
diff --git a/gui/gui_test/server_config/test_obmc_multiple_interfaces.robot b/gui/gui_test/configuration_menu/test_obmc_multiple_interfaces.robot
similarity index 100%
rename from gui/gui_test/server_config/test_obmc_multiple_interfaces.robot
rename to gui/gui_test/configuration_menu/test_obmc_multiple_interfaces.robot