diff --git a/rw_core/mocks/adapter_onu.go b/rw_core/mocks/adapter_onu.go
index 6c7e35b..b641407 100644
--- a/rw_core/mocks/adapter_onu.go
+++ b/rw_core/mocks/adapter_onu.go
@@ -56,12 +56,21 @@
 		if res := onuA.coreProxy.DeviceUpdate(context.TODO(), d); res != nil {
 			log.Fatalf("deviceUpdate-failed-%s", res)
 		}
-		d.ConnectStatus = voltha.ConnectStatus_REACHABLE
-		d.OperStatus = voltha.OperStatus_DISCOVERED
 
-		if err := onuA.coreProxy.DeviceStateUpdate(context.TODO(), d.Id, d.ConnectStatus, d.OperStatus); err != nil {
-			log.Fatalf("device-state-update-failed-%s", err)
-		}
+		// Updating the device states twice, once with oper status to discovered and followed by active may cause
+		// a failure for unit tests when these requests reaches the Core within a millisecond of each other (with real
+		// hardware will not happen as the time between these requests is much higher than 1 millisecond).  For
+		// some reasons this issue is seen on Jenkins but not when running the tests locally. The issue
+		// in the core is triggered when these requests are processed out of order (an issue in the Core that is
+		// being handled by https://jira.opencord.org/browse/VOL-2164).
+		// TODO:  Once the above change is completed then this code can be uncommented.
+
+		//d.ConnectStatus = voltha.ConnectStatus_REACHABLE
+		//d.OperStatus = voltha.OperStatus_DISCOVERED
+
+		//if err := onuA.coreProxy.DeviceStateUpdate(context.TODO(), d.Id, d.ConnectStatus, d.OperStatus); err != nil {
+		//	log.Fatalf("device-state-update-failed-%s", err)
+		//}
 
 		uniPortNo := uint32(2)
 		if device.ProxyAddress != nil {