diff --git a/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/README.md b/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/README.md
index 724e759f578..b372590de53 100644
--- a/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/README.md
+++ b/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/README.md
@@ -16,14 +16,23 @@ BGP 2-Byte and 4-Byte ASN support
     *   ATE (4-byte) - DUT (4-byte) - iBGP IPv4
     *   ATE (4-byte) - DUT (4-byte) - iBGP IPv6
 
-## Config Parameter Coverage
-
-*   /global/config/as
-*   /neighbors/neighbor/config/peer-as
-*   /neighbors/neighbor/config/local-as
-
-## Telemetry Parameter Coverage
-
-*   /global/config/as
-*   /neighbors/neighbor/config/peer-as
-*   /neighbors/neighbor/config/local-as
+## OpenConfig Path and RPC Coverage
+```yaml
+paths:
+    ## Config Parameter Coverage
+
+    /network-instances/network-instance/protocols/protocol/bgp/global/config/as:
+    /network-instances/network-instance/protocols/protocol/bgp/neighbors/neighbor/config/peer-as:
+    /network-instances/network-instance/protocols/protocol/bgp/neighbors/neighbor/config/local-as:
+
+    ## Telemetry Parameter Coverage
+
+    /network-instances/network-instance/protocols/protocol/bgp/global/state/as:
+    /network-instances/network-instance/protocols/protocol/bgp/neighbors/neighbor/state/peer-as:
+    /network-instances/network-instance/protocols/protocol/bgp/neighbors/neighbor/state/local-as:
+
+rpcs:
+  gnmi:
+    gNMI.Subscribe:
+    gNMI.Set:
+```
diff --git a/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go b/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go
index aa6222e648f..dcc80fbed56 100644
--- a/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go
+++ b/feature/experimental/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go
@@ -149,7 +149,7 @@ func TestBgpSession(t *testing.T) {
 
 			t.Log("Verify BGP session state : ESTABLISHED")
 			nbrPath := statePath.Neighbor(tc.nbr.peerIP)
-			gnmi.Await(t, dut, nbrPath.SessionState().State(), time.Second*60, oc.Bgp_Neighbor_SessionState_ESTABLISHED)
+			gnmi.Await(t, dut, nbrPath.SessionState().State(), time.Second*120, oc.Bgp_Neighbor_SessionState_ESTABLISHED)
 
 			t.Log("Verify BGP AS numbers")
 			verifyPeer(t, tc.nbr, dut)
diff --git a/feature/gnmi/otg_tests/telemetry_port_speed_test/telemetry_port_speed_test.go b/feature/gnmi/otg_tests/telemetry_port_speed_test/telemetry_port_speed_test.go
index 90f4f8d72fb..23cc5a9411b 100644
--- a/feature/gnmi/otg_tests/telemetry_port_speed_test/telemetry_port_speed_test.go
+++ b/feature/gnmi/otg_tests/telemetry_port_speed_test/telemetry_port_speed_test.go
@@ -353,7 +353,7 @@ func TestGNMIPortDown(t *testing.T) {
 	ate.OTG().SetControlState(t, portStateAction)
 
 	want := oc.Interface_OperStatus_DOWN
-	gnmi.Await(t, dut, gnmi.OC().Interface(dutPort.Name()).OperStatus().State(), 1*time.Minute, want)
+	gnmi.Await(t, dut, gnmi.OC().Interface(dutPort.Name()).OperStatus().State(), 2*time.Minute, want)
 	dutPortStatus := gnmi.Get(t, dut, gnmi.OC().Interface(dutPort.Name()).OperStatus().State())
 	if dutPortStatus != want {
 		t.Errorf("Get(DUT port1 status): got %v, want %v", dutPortStatus, want)