diff --git a/feature/gribi/otg_tests/backup_nhg_multiple_nh_pbf_test/backup_nhg_multiple_nh_pbf_test.go b/feature/gribi/otg_tests/backup_nhg_multiple_nh_pbf_test/backup_nhg_multiple_nh_pbf_test.go
index 6b12449d0fb..6aff784f57a 100644
--- a/feature/gribi/otg_tests/backup_nhg_multiple_nh_pbf_test/backup_nhg_multiple_nh_pbf_test.go
+++ b/feature/gribi/otg_tests/backup_nhg_multiple_nh_pbf_test/backup_nhg_multiple_nh_pbf_test.go
@@ -47,8 +47,8 @@ const (
 	routeCount       = 1
 	vrf1             = "TE_VRF_111"
 	vrf2             = "vrfB"
-	fps              = 1000000 // traffic frames per second
-	switchovertime   = 250.0   // switchovertime during interface shut in milliseconds
+	fps              = 10000 // traffic frames per second
+	switchovertime   = 250.0 // switchovertime during interface shut in milliseconds
 	ethernetCsmacd   = oc.IETFInterfaces_InterfaceType_ethernetCsmacd
 	decapFlowSrc     = "198.51.100.111"
 	dscpEncapA1      = 10
diff --git a/feature/gribi/otg_tests/backup_nhg_multiple_nh_test/backup_nhg_multiple_nh_test.go b/feature/gribi/otg_tests/backup_nhg_multiple_nh_test/backup_nhg_multiple_nh_test.go
index 0763e3ace23..34ac6d075f2 100644
--- a/feature/gribi/otg_tests/backup_nhg_multiple_nh_test/backup_nhg_multiple_nh_test.go
+++ b/feature/gribi/otg_tests/backup_nhg_multiple_nh_test/backup_nhg_multiple_nh_test.go
@@ -45,8 +45,8 @@ const (
 	routeCount       = 1
 	vrf1             = "vrfA"
 	vrf2             = "vrfB"
-	fps              = 1000000 // traffic frames per second
-	switchovertime   = 250.0   // switchovertime during interface shut in milliseconds
+	fps              = 10000 // traffic frames per second
+	switchovertime   = 250.0 // switchovertime during interface shut in milliseconds
 	ethernetCsmacd   = oc.IETFInterfaces_InterfaceType_ethernetCsmacd
 )
 
diff --git a/feature/gribi/otg_tests/ipv4_entry_test/ipv4_entry_test.go b/feature/gribi/otg_tests/ipv4_entry_test/ipv4_entry_test.go
index b2ab3770cd6..d414157aea0 100644
--- a/feature/gribi/otg_tests/ipv4_entry_test/ipv4_entry_test.go
+++ b/feature/gribi/otg_tests/ipv4_entry_test/ipv4_entry_test.go
@@ -541,6 +541,7 @@ func createTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good, bad []string
 	if len(good) == 0 && len(bad) == 0 {
 		otg.PushConfig(t, ateTop)
 		otg.StartProtocols(t)
+		otgutils.WaitForARP(t, otg, ateTop, "IPv4")
 		return newGoodFlows, newBadFlows
 	}
 	ateTop.Flows().Clear().Items()
@@ -574,6 +575,7 @@ func createTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good, bad []string
 	}
 	otg.PushConfig(t, ateTop)
 	otg.StartProtocols(t)
+	otgutils.WaitForARP(t, otg, ateTop, "IPv4")
 	return newGoodFlows, newBadFlows
 }
 
diff --git a/feature/gribi/otg_tests/ordering_ack_test/ordering_ack_test.go b/feature/gribi/otg_tests/ordering_ack_test/ordering_ack_test.go
index acac1e7a900..4e0e782f4cf 100644
--- a/feature/gribi/otg_tests/ordering_ack_test/ordering_ack_test.go
+++ b/feature/gribi/otg_tests/ordering_ack_test/ordering_ack_test.go
@@ -34,6 +34,7 @@ import (
 	"github.com/openconfig/ondatra"
 	"github.com/openconfig/ondatra/gnmi"
 	"github.com/openconfig/ondatra/gnmi/oc"
+	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ygot"
 )
 
@@ -369,8 +370,11 @@ func testModifyNHGIPv4(t *testing.T, args *testArgs) {
 				}
 			}
 			ipv4Path := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Afts().Ipv4Entry(ateDstNetCIDR)
-			if got, want := gnmi.Get(t, args.dut, ipv4Path.State()).GetPrefix(), ateDstNetCIDR; got != want {
-				t.Errorf("ipv4-entry/state/prefix got %s, want %s", got, want)
+			if got, ok := gnmi.Watch(t, args.dut, ipv4Path.State(), awaitDuration, func(val *ygnmi.Value[*oc.NetworkInstance_Afts_Ipv4Entry]) bool {
+				ipv4Entry, present := val.Val()
+				return present && ipv4Entry.GetPrefix() == ateDstNetCIDR
+			}).Await(t); !ok {
+				t.Errorf("ipv4-entry/state/prefix got %v, want %s", got, ateDstNetCIDR)
 			}
 		}
 	})
@@ -449,8 +453,11 @@ func testModifyIPv4AddDelAdd(t *testing.T, args *testArgs) {
 
 	t.Run("Telemetry", func(t *testing.T) {
 		ipv4Path := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Afts().Ipv4Entry(ateDstNetCIDR)
-		if got, want := gnmi.Get(t, args.dut, ipv4Path.State()).GetPrefix(), ateDstNetCIDR; got != want {
-			t.Errorf("ipv4-entry/state/prefix got %s, want %s", got, want)
+		if got, ok := gnmi.Watch(t, args.dut, ipv4Path.State(), awaitDuration, func(val *ygnmi.Value[*oc.NetworkInstance_Afts_Ipv4Entry]) bool {
+			ipv4Entry, present := val.Val()
+			return present && ipv4Entry.GetPrefix() == ateDstNetCIDR
+		}).Await(t); !ok {
+			t.Errorf("ipv4-entry/state/prefix got %v, want %s", got, ateDstNetCIDR)
 		}
 	})