diff --git a/orchagent/fdborch.cpp b/orchagent/fdborch.cpp
index c159ddd7145..dc56eae655c 100644
--- a/orchagent/fdborch.cpp
+++ b/orchagent/fdborch.cpp
@@ -30,7 +30,7 @@ FdbOrch::FdbOrch(DBConnector *db, string tableName, PortsOrch *port) :
     Orch::addExecutor(flushNotifier);
 
     /* Add FDB notifications support from ASIC */
-    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
+    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::SECONDARY_UNIXSOCKET, 0);
     m_fdbNotificationConsumer = new swss::NotificationConsumer(notificationsDb, "NOTIFICATIONS");
     auto fdbNotifier = new Notifier(m_fdbNotificationConsumer, this, "FDB_NOTIFICATIONS");
     Orch::addExecutor(fdbNotifier);
diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index 9e3ffb62756..d9bd12cb3cb 100644
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -249,7 +249,7 @@ PortsOrch::PortsOrch(DBConnector *db, vector<table_name_with_pri_t> &tableNames)
     removeDefaultBridgePorts();
 
     /* Add port oper status notification support */
-    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
+    DBConnector *notificationsDb = new DBConnector(ASIC_DB, DBConnector::SECONDARY_UNIXSOCKET, 0);
     m_portStatusNotificationConsumer = new swss::NotificationConsumer(notificationsDb, "NOTIFICATIONS");
     auto portStatusNotificatier = new Notifier(m_portStatusNotificationConsumer, this, "PORT_STATUS_NOTIFICATIONS");
     Orch::addExecutor(portStatusNotificatier);
diff --git a/tests/conftest.py b/tests/conftest.py
index 013b0cefa2f..e2c98bc8180 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -21,7 +21,7 @@ def pytest_addoption(parser):
 
 class AsicDbValidator(object):
     def __init__(self, dvs):
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # get default dot1q vlan id
         atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_VLAN")
@@ -131,7 +131,8 @@ def __init__(self, name=None):
                        'neighsyncd',
                        'orchagent',
                        'portsyncd',
-                       'redis-server',
+                       'redis-servers:redis-server',
+                       'redis-servers:redis-server-secondary',
                        'rsyslogd',
                        'syncd',
                        'teamsyncd',
@@ -139,6 +140,7 @@ def __init__(self, name=None):
                        'zebra']
         self.mount = "/var/run/redis-vs"
         self.redis_sock = self.mount + '/' + "redis.sock"
+        self.redis_sec_sock = self.mount + '/' + "redis-secondary.sock"
         self.client = docker.from_env()
 
         self.ctn = None
diff --git a/tests/test_acl.py b/tests/test_acl.py
index 31a5528288e..9aa8d76c113 100644
--- a/tests/test_acl.py
+++ b/tests/test_acl.py
@@ -28,7 +28,7 @@ def verify_if_any_acl_table_created(self, dvs, adb):
         return False
 
     def clean_up_left_over(self, dvs):
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE_GROUP")
         keys = atbl.getKeys()
         for key in keys:
@@ -132,7 +132,7 @@ def verify_acl_lag_binding(self, adb, lag_ids):
 
     def test_AclTableCreation(self, dvs):
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create ACL_TABLE in config db
         bind_ports = ["Ethernet0", "Ethernet4"]
@@ -165,7 +165,7 @@ def test_AclRuleL4SrcPort(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -216,7 +216,7 @@ def test_AclRuleInOutPorts(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -273,7 +273,7 @@ def test_AclRuleInOutPorts(self, dvs):
     def test_AclTableDeletion(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # get ACL_TABLE in config db
         tbl = swsscommon.Table(db, "ACL_TABLE")
@@ -289,7 +289,7 @@ def test_AclTableDeletion(self, dvs):
     def test_V6AclTableCreation(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         bind_ports = ["Ethernet0", "Ethernet4", "Ethernet8"]
         # create ACL_TABLE in config db
@@ -365,7 +365,7 @@ def test_V6AclRuleIPv6Any(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -416,7 +416,7 @@ def test_V6AclRuleIPv6AnyDrop(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -467,7 +467,7 @@ def test_V6AclRuleIpProtocol(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -518,7 +518,7 @@ def test_V6AclRuleSrcIPv6(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -569,7 +569,7 @@ def test_V6AclRuleDstIPv6(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -620,7 +620,7 @@ def test_V6AclRuleL4SrcPort(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -671,7 +671,7 @@ def test_V6AclRuleL4DstPort(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -722,7 +722,7 @@ def test_V6AclRuleTCPFlags(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -773,7 +773,7 @@ def test_V6AclRuleL4SrcPortRange(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -838,7 +838,7 @@ def test_V6AclRuleL4DstPortRange(self, dvs):
         """
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # create acl rule
         tbl = swsscommon.Table(db, "ACL_RULE")
@@ -900,7 +900,7 @@ def test_V6AclRuleL4DstPortRange(self, dvs):
     def test_V6AclTableDeletion(self, dvs):
 
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         # get ACL_TABLE in config db
         tbl = swsscommon.Table(db, "ACL_TABLE")
@@ -930,7 +930,7 @@ def check_rule_existence(self, entry, rules, verifs):
 
     def test_InsertAclRuleBetweenPriorities(self, dvs):
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         bind_ports = ["Ethernet0", "Ethernet4"]
         # create ACL_TABLE in config db
@@ -1028,7 +1028,7 @@ def test_InsertAclRuleBetweenPriorities(self, dvs):
 
     def test_RulesWithDiffMaskLengths(self, dvs):
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
         bind_ports = ["Ethernet0", "Ethernet4"]
         # create ACL_TABLE in config db
@@ -1115,7 +1115,7 @@ def test_AclTableCreationOnLAGMember(self, dvs):
         # prepare db and tables
         self.clean_up_left_over(dvs)
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         apldb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
 
         # create port channel
@@ -1143,7 +1143,7 @@ def test_AclTableCreationOnLAG(self, dvs):
         # prepare db and tables
         self.clean_up_left_over(dvs)
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         apldb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
 
         #create port channel
@@ -1193,7 +1193,7 @@ def test_AclTableCreationBeforeLAG(self, dvs):
         # prepare db and tables
         self.clean_up_left_over(dvs)
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         apldb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
 
         # create acl table
diff --git a/tests/test_crm.py b/tests/test_crm.py
index 3e2baf546b5..ff477c44bd5 100644
--- a/tests/test_crm.py
+++ b/tests/test_crm.py
@@ -18,14 +18,14 @@ def getCrmCounterValue(dvs, key, counter):
 
 def setReadOnlyAttr(dvs, obj, attr, val):
 
-    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     tbl = swsscommon.Table(db, "ASIC_STATE:{0}".format(obj))
     keys = tbl.getKeys()
 
     assert len(keys) == 1
 
     swVid = keys[0]
-    r = redis.Redis(unix_socket_path=dvs.redis_sock, db=swsscommon.ASIC_DB)
+    r = redis.Redis(unix_socket_path=dvs.redis_sec_sock, db=swsscommon.ASIC_DB)
     swRid = r.hget("VIDTORID", swVid)
 
     assert swRid is not None
@@ -482,7 +482,7 @@ def test_CrmNexthopGroupMember(dvs):
 def test_CrmAcl(dvs):
 
     db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     dvs.runcmd("crm config polling interval 1")
 
diff --git a/tests/test_dirbcast.py b/tests/test_dirbcast.py
index bf7d50c3c0e..f38b2b07c2b 100644
--- a/tests/test_dirbcast.py
+++ b/tests/test_dirbcast.py
@@ -6,7 +6,7 @@
 def test_DirectedBroadcast(dvs):
 
     db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     # create vlan in config db
     tbl = swsscommon.Table(db, "VLAN")
diff --git a/tests/test_dtel.py b/tests/test_dtel.py
index 8cdebbf425f..fad25e417c3 100644
--- a/tests/test_dtel.py
+++ b/tests/test_dtel.py
@@ -9,7 +9,7 @@ class TestDtel(object):
     def test_DtelGlobalAttribs(self, dvs):
     
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
     
         # create DTel global attributes in config db
         tbl = swsscommon.Table(db, "DTEL")
@@ -89,7 +89,7 @@ def test_DtelGlobalAttribs(self, dvs):
     def test_DtelReportSessionAttribs(self, dvs):
     
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
     
         # create DTel report session attributes in config db
         tbl = swsscommon.Table(db, "DTEL_REPORT_SESSION")
@@ -130,7 +130,7 @@ def test_DtelReportSessionAttribs(self, dvs):
     def test_DtelINTSessionAttribs(self, dvs):
     
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
     
         # create DTel INT session attributes in config db
         tbl = swsscommon.Table(db, "DTEL_INT_SESSION")
@@ -174,7 +174,7 @@ def test_DtelINTSessionAttribs(self, dvs):
     def test_DtelQueueReportAttribs(self, dvs):
     
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
     
         # create DTel queue report attributes in config db
         tbl = swsscommon.Table(db, "DTEL_QUEUE_REPORT")
@@ -215,7 +215,7 @@ def test_DtelQueueReportAttribs(self, dvs):
     def test_DtelEventAttribs(self, dvs):
     
         db = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
     
         # first create DTel report session in config db
         rtbl = swsscommon.Table(db, "DTEL_REPORT_SESSION")
diff --git a/tests/test_fdb.py b/tests/test_fdb.py
index d873a9f6dfd..fea1189155e 100644
--- a/tests/test_fdb.py
+++ b/tests/test_fdb.py
@@ -77,7 +77,7 @@ def is_fdb_entry_exists(db, table, key_values, attributes):
 
 def test_FDBAddedAfterMemberCreated(dvs):
     appl_db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     # create a FDB entry in Application DB
diff --git a/tests/test_interface.py b/tests/test_interface.py
index a2232015ada..1798bdbd288 100644
--- a/tests/test_interface.py
+++ b/tests/test_interface.py
@@ -6,7 +6,7 @@
 class TestRouterInterfaceIpv4(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
     def add_ip_address(self, interface, ip):
@@ -128,7 +128,7 @@ def test_InterfaceSetMtu(self, dvs):
 class TestLagRouterInterfaceIpv4(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
     # TODO: below three functions will be replaced with configuration
diff --git a/tests/test_mirror.py b/tests/test_mirror.py
index 221122c23ad..167705f7f4c 100644
--- a/tests/test_mirror.py
+++ b/tests/test_mirror.py
@@ -11,7 +11,7 @@
 class TestMirror(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
         self.sdb = swsscommon.DBConnector(6, dvs.redis_sock, 0)
 
diff --git a/tests/test_nhg.py b/tests/test_nhg.py
index 75f336d0275..ff92721e564 100644
--- a/tests/test_nhg.py
+++ b/tests/test_nhg.py
@@ -32,7 +32,7 @@ def test_route_nhg(dvs):
 
     # check if route was propagated to ASIC DB
 
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     rtbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY")
     nhgtbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP")
diff --git a/tests/test_pfc.py b/tests/test_pfc.py
index 19cfc50e269..6ae0da84a08 100644
--- a/tests/test_pfc.py
+++ b/tests/test_pfc.py
@@ -48,7 +48,7 @@ def getPortOid(dvs, port_name):
 
 def getPortAttr(dvs, port_oid, port_attr):
 
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     port_tbl = swsscommon.Table(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_PORT:{0}'.format(port_oid))
 
     for k in port_tbl.get('')[1]:
diff --git a/tests/test_port.py b/tests/test_port.py
index ce841800c3f..b0c630a7ca1 100644
--- a/tests/test_port.py
+++ b/tests/test_port.py
@@ -6,7 +6,7 @@
 class TestPort(object):
     def test_PortMtu(self, dvs):
         pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
         # set MTU to port
@@ -76,7 +76,7 @@ def test_PortFec(dvs):
     time.sleep(1)
 
     db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     tbl = swsscommon.Table(db, "PORT_TABLE")
     ptbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")
diff --git a/tests/test_port_an.py b/tests/test_port_an.py
index b9912caf173..92d088cf856 100644
--- a/tests/test_port_an.py
+++ b/tests/test_port_an.py
@@ -15,7 +15,7 @@ def test_PortAutoNeg(dvs):
 
     time.sleep(1)
 
-    adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_PORT")
     (status, fvs) = atbl.get(dvs.asicdb.portnamemap["Ethernet0"])
diff --git a/tests/test_port_buffer_rel.py b/tests/test_port_buffer_rel.py
index d8c3497121d..667304c6ec8 100644
--- a/tests/test_port_buffer_rel.py
+++ b/tests/test_port_buffer_rel.py
@@ -5,7 +5,7 @@
 
 def test_PortsAreUpAfterBuffers(dvs):    
     num_ports = 32
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     conf_port_table = swsscommon.Table(conf_db, "PORT")
diff --git a/tests/test_portchannel.py b/tests/test_portchannel.py
index f9ac0bf7970..d8447103d58 100644
--- a/tests/test_portchannel.py
+++ b/tests/test_portchannel.py
@@ -21,7 +21,7 @@ def test_PortChannel(dvs):
     time.sleep(1)
 
     # check asic db table
-    asicdb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    asicdb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     lagtbl = swsscommon.Table(asicdb, "ASIC_STATE:SAI_OBJECT_TYPE_LAG")
 
diff --git a/tests/test_route.py b/tests/test_route.py
index 20f66b9337c..edf20eb5d7e 100644
--- a/tests/test_route.py
+++ b/tests/test_route.py
@@ -28,7 +28,7 @@ def test_RouteAdd(dvs):
 
     # check if route was propagated to ASIC DB
 
-    db = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+    db = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
 
     tbl = swsscommon.Table(db, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY")
 
diff --git a/tests/test_setro.py b/tests/test_setro.py
index 1f619e66464..2bb53838154 100755
--- a/tests/test_setro.py
+++ b/tests/test_setro.py
@@ -6,7 +6,7 @@
 
 def test_SetReadOnlyAttribute(dvs):
 
-    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
 
     tbl = swsscommon.Table(db, "ASIC_STATE:SAI_OBJECT_TYPE_SWITCH")
 
@@ -16,7 +16,7 @@ def test_SetReadOnlyAttribute(dvs):
 
     swVid = keys[0]
  
-    r = redis.Redis(unix_socket_path=dvs.redis_sock, db=swsscommon.ASIC_DB)
+    r = redis.Redis(unix_socket_path=dvs.redis_sec_sock, db=swsscommon.ASIC_DB)
 
     swRid = r.hget("VIDTORID", swVid)
 
diff --git a/tests/test_speed.py b/tests/test_speed.py
index c4f92a7ef78..4f6df96aac9 100644
--- a/tests/test_speed.py
+++ b/tests/test_speed.py
@@ -19,7 +19,7 @@ def test_SpeedAndBufferSet(self, dvs):
         speed_list = ['50000', '25000', '40000', '10000', '100000']
 
         cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
-        adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         cfg_port_table = swsscommon.Table(cdb, "PORT")
         cfg_buffer_profile_table = swsscommon.Table(cdb, "BUFFER_PROFILE")
         cfg_buffer_pg_table = swsscommon.Table(cdb, "BUFFER_PG")
diff --git a/tests/test_tunnel.py b/tests/test_tunnel.py
index 5b21b9e993e..93c349bdd7f 100644
--- a/tests/test_tunnel.py
+++ b/tests/test_tunnel.py
@@ -167,7 +167,7 @@ def test_TunnelDecap_v4(self, dvs):
         """ test IPv4 tunnel creation """
 
         db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
-        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
 
         self.cleanup_left_over(db, asicdb)
 
@@ -181,7 +181,7 @@ def test_TunnelDecap_v6(self, dvs):
         """ test IPv6 tunnel creation """
 
         db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
-        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
 
         self.cleanup_left_over(db, asicdb)
 
@@ -199,7 +199,7 @@ def test_TunnelSymmetric_v4(self, dvs):
         """ test IPv4 tunnel creation """
 
         db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
-        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
 
         self.cleanup_left_over(db, asicdb)
 
@@ -214,7 +214,7 @@ def test_TunnelSymmetric_v6(self, dvs):
         """ test IPv6 tunnel creation """
 
         db = swsscommon.DBConnector(swsscommon.APPL_DB, dvs.redis_sock, 0)
-        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+        asicdb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
 
         self.cleanup_left_over(db, asicdb)
 
diff --git a/tests/test_vlan.py b/tests/test_vlan.py
index 498a296fc97..4597983d873 100644
--- a/tests/test_vlan.py
+++ b/tests/test_vlan.py
@@ -10,7 +10,7 @@
 class TestVlan(object):
     def setup_db(self, dvs):
         self.pdb = swsscommon.DBConnector(0, dvs.redis_sock, 0)
-        self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+        self.adb = swsscommon.DBConnector(1, dvs.redis_sec_sock, 0)
         self.cdb = swsscommon.DBConnector(4, dvs.redis_sock, 0)
 
     def create_vlan(self, vlan):
diff --git a/tests/test_vrf.py b/tests/test_vrf.py
index 9f3431ee6a8..117bfd74636 100644
--- a/tests/test_vrf.py
+++ b/tests/test_vrf.py
@@ -148,7 +148,7 @@ def packet_action_gen():
 
 
 def test_VRFOrch_Comprehensive(dvs):
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     attributes = [
@@ -179,7 +179,7 @@ def test_VRFOrch_Comprehensive(dvs):
 
 
 def test_VRFOrch(dvs):
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
     state = vrf_create(asic_db, conf_db, "vrf0",
         [
@@ -202,7 +202,7 @@ def test_VRFOrch(dvs):
     vrf_remove(asic_db, conf_db, "vrf1", state)
 
 def test_VRFOrch_Update(dvs):
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     attributes = [
diff --git a/tests/test_vxlan_tunnel.py b/tests/test_vxlan_tunnel.py
index be603dcb353..e3a22756cae 100644
--- a/tests/test_vxlan_tunnel.py
+++ b/tests/test_vxlan_tunnel.py
@@ -34,7 +34,7 @@ def entries(db, table):
     return set(tbl.getKeys())
 
 def get_exist_entries(dvs, table):
-    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     tbl =  swsscommon.Table(db, table)
     return set(tbl.getKeys())
 
@@ -72,7 +72,7 @@ def check_object(db, table, key, expected_attributes):
                                                    (value, name, expected_attributes[name])
 
 def create_vlan(dvs, vlan_name, vlan_ids):
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     vlan_id = vlan_name[4:]
@@ -102,7 +102,7 @@ def create_vlan(dvs, vlan_name, vlan_ids):
 
 
 def create_vxlan_tunnel(dvs, name, src_ip, dst_ip, tunnel_map_ids, tunnel_map_entry_ids, tunnel_ids, tunnel_term_ids, skip_dst_ip=False):
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     # check the source information
@@ -173,7 +173,7 @@ def create_vxlan_tunnel(dvs, name, src_ip, dst_ip, tunnel_map_ids, tunnel_map_en
 
 def create_vxlan_tunnel_entry(dvs, tunnel_name, tunnel_map_entry_name, tunnel_map_id, vlan, vni_id,
                               tunnel_map_ids, tunnel_map_entry_ids, tunnel_ids, tunnel_term_ids):
-    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+    asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sec_sock, 0)
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     # Check source information