diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index 779f8e9..e521536 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -510,6 +510,9 @@
         ping_result = main.FALSE
         time1 = time.time()
         ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again...")
+            ping_result = main.Mininet1.pingall( timeout=main.pingTimeout)
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -566,6 +569,9 @@
         ping_result = main.FALSE
         time1 = time.time()
         ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again...")
+            ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -622,6 +628,9 @@
         ping_result = main.FALSE
         time1 = time.time()
         ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again...")
+            ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -662,7 +671,10 @@
         main.step( "Verify IPv6 Pingall" )
         ping_result = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+        ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout)
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again..")
+            ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -728,7 +740,10 @@
         main.step( "Verify IPv6 Pingall" )
         ping_result = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+        ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout)
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again..")
+            ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -794,7 +809,10 @@
         main.step( "Verify IPv6 Pingall" )
         ping_result = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+        ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout)
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again..")
+            ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(