diff --git a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
index 38d08e4..7788951 100644
--- a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
@@ -7,6 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Factory_Reset_Sub_Menu
 
 *** Variables ***
 
@@ -56,4 +57,4 @@
     Click Element  ${xpath_settings_menu}
     Click Element  ${xpath_factory_reset_sub_menu}
     Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  factory-reset
-
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/settings_menu/test_network_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
index a824b5a..a7e800b 100644
--- a/gui/gui_test/settings_menu/test_network_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_network_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Network_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
index 81d4661..56a9af2 100644
--- a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
+Force Tags       Power_Restore_Policy_Sub_Menu
 
 *** Variables ***