diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
index baa2c2f..dd34863 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -187,9 +187,9 @@
 
         main.step("List devices")
         for i in range(1,8):
-            main.Mininet2.handle.sendline("sudo ovs-vsctl set-controller s"+str(i)+
+            main.Mininet2.handle.sendline("sh ovs-vsctl set-controller s"+str(i)+
                     " tcp:10.128.20.11")
-            main.Mininet2.handle.expect("\$")
+            main.Mininet2.handle.expect("mininet>")
         #Need to sleep to allow switch add processing
         time.sleep(10)
         list_result = main.ONOScli.devices()
diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.topo b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
index 1e319d8..a5f544a 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.topo
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
@@ -44,10 +44,10 @@
         </Mininet1>
 
         <Mininet2>
-            <host>10.128.10.90</host>
+            <host>10.128.10.91</host>
             <user>admin</user>
             <password>onos_test</password>
-            <type>RemoteMininetDriver</type>
+            <type>MininetCliDriver</type>
             <connect_order>5</connect_order>
             <COMPONENTS> 
                 <arg1> --custom topo-intentTPtest.py </arg1>