diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 90514d0..d93567f 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -524,8 +524,6 @@
                     self.handle.sendline("links | grep '"+
                         str(grep_str)+"'")
                     self.handle.expect("onos>")
-                    self.handle.sendline("")
-                    self.handle.expect("onos>")
                 handle = self.handle.before
                 #print "handle =",handle
                 return handle
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 575de1c..1fb180a 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1053,7 +1053,7 @@
         self.handle.sendline("cd ~/ONOS/tools/test/bin")
         self.handle.expect("/bin$")
         self.handle.sendline("./onos-topo-cfg")
-        self.handle.expect("{}admin@onosTestBench")
+        self.handle.expect("{}")
         self.handle.sendline("cd ~")
         self.handle.expect("\$")