diff --git a/src/device/tests/test_unitary_openconfig.py b/src/device/tests/test_unitary_openconfig.py
index 32fb5709a98d095982d46d16450117a84f89f165..38adcf15f530fc95d6346707b97fc6d5188867af 100644
--- a/src/device/tests/test_unitary_openconfig.py
+++ b/src/device/tests/test_unitary_openconfig.py
@@ -29,8 +29,12 @@ from .PrepareTestScenario import ( # pylint: disable=unused-import
     mock_service, device_service, context_client, device_client, monitoring_client, test_prepare_environment)
 
 try:
-    from .Device_OpenConfig_Infinera1 import(
+    #from .Device_OpenConfig_Infinera1 import(
     #from .Device_OpenConfig_Infinera2 import(
+    #from .Device_OpenConfig_Adva import(
+    #from .Device_OpenConfig_Adva_149 import(
+    from .Device_OpenConfig_Adva_155 import(
+
         DEVICE_OC, DEVICE_OC_CONFIG_RULES, DEVICE_OC_DECONFIG_RULES, DEVICE_OC_CONNECT_RULES, DEVICE_OC_ID,
         DEVICE_OC_UUID)
     ENABLE_OPENCONFIG = True
@@ -38,10 +42,9 @@ except ImportError:
     ENABLE_OPENCONFIG = False
 
 ENABLE_OPENCONFIG_CONFIGURE   = True
-ENABLE_OPENCONFIG_MONITOR     = True
+ENABLE_OPENCONFIG_MONITOR     = False
 ENABLE_OPENCONFIG_DECONFIGURE = True
 
-
 logging.getLogger('apscheduler.executors.default').setLevel(logging.WARNING)
 logging.getLogger('apscheduler.scheduler').setLevel(logging.WARNING)
 logging.getLogger('monitoring-client').setLevel(logging.WARNING)