diff --git a/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_ceph_ha.py b/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_ceph_ha.py
index 459cfc3b9..922ec163f 100644
--- a/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_ceph_ha.py
+++ b/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_ceph_ha.py
@@ -184,7 +184,7 @@ class UpgradeCephHA(DataDrivenUpgradeBase):
         Scenario:
         1. Revert "upgrade_ceph_ha_restore" snapshot.
         2. Warm restart of a controller.
-        3. Wait until HA services become ready.
+        3. Wait until services become ready.
         4. Run OSTF.
 
         Duration: 20m
@@ -201,6 +201,7 @@ class UpgradeCephHA(DataDrivenUpgradeBase):
         self.fuel_web.warm_restart_nodes([d_ctrls[0]])
         self.show_step(3)
         self.fuel_web.assert_ha_services_ready(cluster_id)
+        self.fuel_web.assert_os_services_ready(cluster_id)
         self.show_step(4)
         self.fuel_web.run_ostf(cluster_id)
 
diff --git a/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_net_tmpl.py b/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_net_tmpl.py
index acebe409d..e9c22ace8 100644
--- a/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_net_tmpl.py
+++ b/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_net_tmpl.py
@@ -296,8 +296,9 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
         Scenario:
         1. Revert "replace_controller_net_tmpl" snapshot
         2. Reboot node
-        3. Verify networks
-        4. Run OSTF
+        3. Wait until OS and HA services are ready
+        4. Verify networks
+        5. Run OSTF
 
         Snapshot: restart_node_net_tmpl
         """
@@ -311,9 +312,12 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
             self.env.d_env.get_nodes(name__in=['slave-03']))
 
         self.show_step(3)
+        self.fuel_web.assert_ha_services_ready(cluster_id)
+        self.fuel_web.assert_os_services_ready(cluster_id)
+        self.show_step(4)
         self.fuel_web.verify_network(cluster_id)
 
-        self.show_step(4)
+        self.show_step(5)
         self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1,
                                test_sets=['smoke', 'sanity', 'ha'])
         self.env.make_snapshot("restart_node_net_tmpl", is_make=True)