diff --git a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py
index 37e6bab9d..3652eb712 100755
--- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py
+++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py
@@ -94,11 +94,15 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(unittest.TestCase):
         self.assertEqual(self.nodes[SED1].get_state(), 'child')
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py
index d6b9bd196..2314803ad 100755
--- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py
+++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py
@@ -94,11 +94,15 @@ class Cert_5_6_2_NetworkDataRouterAsBr(unittest.TestCase):
         self.assertEqual(self.nodes[SED1].get_state(), 'child')
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py
index 8e799ebb9..c070fe810 100755
--- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py
+++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py
@@ -96,11 +96,15 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py
index 6fb7b1ecc..07df39ade 100755
--- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py
+++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py
@@ -96,11 +96,15 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py
index bfa41abd2..55fec0cb9 100755
--- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py
+++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py
@@ -96,11 +96,15 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
@@ -111,11 +115,17 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py
index ccfa9634a..7abdd7743 100755
--- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py
+++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py
@@ -96,11 +96,15 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
@@ -111,11 +115,17 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
@@ -125,11 +135,17 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
+        self.assertFalse(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
+        self.assertFalse(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py
index 9c9fc4c27..6a210fab0 100755
--- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py
+++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py
@@ -92,6 +92,7 @@ class Cert_5_6_7_NetworkDataRequestREED(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[REED].get_addrs()
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py
index 88b4eba04..3d3cce4a9 100755
--- a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py
+++ b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py
@@ -83,6 +83,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
         time.sleep(2)
 
         addrs = self.nodes[LEADER].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[ED].ping(addr)
@@ -92,6 +93,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
         time.sleep(5)
 
         addrs = self.nodes[LEADER].get_addrs()
+        self.assertFalse(any('2001' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[ED].ping(addr)
@@ -101,6 +103,8 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
         time.sleep(5)
 
         addrs = self.nodes[LEADER].get_addrs()
+        self.assertFalse(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[ED].ping(addr)
@@ -111,6 +115,9 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
         time.sleep(5)
 
         addrs = self.nodes[LEADER].get_addrs()
+        self.assertFalse(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:3] == '200':
                 self.nodes[ED].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py
index 9bdde16d5..666913cf9 100755
--- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py
+++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py
@@ -72,6 +72,7 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase):
         time.sleep(3)
 
         addrs = self.nodes[ED].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001':
                 self.nodes[LEADER].ping(addr)
@@ -88,6 +89,8 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase):
         time.sleep(10)
 
         addrs = self.nodes[ED].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py
index 8e3b6c084..2a7170828 100755
--- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py
+++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py
@@ -94,11 +94,15 @@ class Cert_7_1_1_BorderRouterAsLeader(unittest.TestCase):
         self.assertEqual(self.nodes[ED1].get_state(), 'child')
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py
index 343e22145..16da935de 100755
--- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py
+++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py
@@ -94,11 +94,15 @@ class Cert_7_1_2_BorderRouterAsRouter(unittest.TestCase):
         self.assertEqual(self.nodes[SED2].get_state(), 'child')
 
         addrs = self.nodes[ED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py
index 10e727318..4f9ecbf4c 100755
--- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py
+++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py
@@ -95,11 +95,15 @@ class Cert_7_1_3_BorderRouterAsLeader(unittest.TestCase):
         time.sleep(3)
 
         addrs = self.nodes[SED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[ED1].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py
index 65a189522..d79263d74 100755
--- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py
+++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py
@@ -95,11 +95,15 @@ class Cert_7_1_4_BorderRouterAsRouter(unittest.TestCase):
         time.sleep(3)
 
         addrs = self.nodes[ED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
diff --git a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py
index 4aa7b81fa..a2bd589ef 100755
--- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py
+++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py
@@ -95,11 +95,15 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase):
         time.sleep(3)
 
         addrs = self.nodes[ED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002':
                 self.nodes[LEADER].ping(addr)
@@ -109,11 +113,17 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase):
         time.sleep(3)
 
         addrs = self.nodes[ED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertTrue(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003':
                 self.nodes[LEADER].ping(addr)
 
         addrs = self.nodes[SED2].get_addrs()
+        self.assertTrue(any('2001' in word for word in addrs))
+        self.assertFalse(any('2002' in word for word in addrs))
+        self.assertTrue(any('2003' in word for word in addrs))
         for addr in addrs:
             if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003':
                 self.nodes[LEADER].ping(addr)