diff --git a/tests/topotests/lib/topojson.py b/tests/topotests/lib/topojson.py
index 53e6945bee..ad6dddc76b 100644
--- a/tests/topotests/lib/topojson.py
+++ b/tests/topotests/lib/topojson.py
@@ -316,6 +316,7 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
     func_dict = OrderedDict(
         [
             ("vrfs", create_vrf_cfg),
+            ("ospf", create_router_ospf),
             ("links", create_interfaces_cfg),
             ("static_routes", create_static_routes),
             ("prefix_lists", create_prefix_lists),
@@ -325,7 +326,6 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
             ("igmp", create_igmp_config),
             ("mld", create_mld_config),
             ("bgp", create_router_bgp),
-            ("ospf", create_router_ospf),
         ]
     )
 
diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py
index cf7d95b65a..0531e81d44 100644
--- a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py
+++ b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py
@@ -1579,10 +1579,6 @@ def test_ospf_type5_summary_tc45_p0(request):
     result = create_interfaces_cfg(tgen, input_dict)
     assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result)
 
-    # clear neighbor state on both routers to avoid stale state
-    tgen.net["r0"].cmd("clear ip ospf neighbor")
-    tgen.net["r1"].cmd("clear ip ospf neighbor")
-
     ospf_covergence = verify_ospf_neighbor(tgen, topo)
     assert ospf_covergence is True, "setup_module :Failed \n Error  {}".format(
         ospf_covergence
diff --git a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
index 8cc0ed6090..49c25ab8f6 100644
--- a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
+++ b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
@@ -1428,10 +1428,6 @@ def ospfv3_type5_summary_tc45_p0(request):
     result = create_interfaces_cfg(tgen, input_dict)
     assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result)
 
-    # restart interface state machine on both routers to avoid stale state
-    tgen.net["r0"].cmd("clear ipv6 ospf6 interface")
-    tgen.net["r1"].cmd("clear ipv6 ospf6 interface")
-
     ospf_covergence = verify_ospf6_neighbor(tgen, topo)
     assert ospf_covergence is True, "Testcase {} :Failed \n Error: {}".format(
         tc_name, ospf_covergence