diff --git a/tools/test/bin/onos-uninstall b/tools/test/bin/onos-uninstall
index 11e5ba2..ff8ff53 100755
--- a/tools/test/bin/onos-uninstall
+++ b/tools/test/bin/onos-uninstall
@@ -34,9 +34,12 @@
       [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] && break
       sleep 1
     done
-    [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] || echo 'ONOS failed to stop.'
+    [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] || \
+        (echo 'ONOS failed to stop.'; status=1)
 
     # Remove onos directory and init file
-    sudo rm -fr $ONOS_INSTALL_DIR
-    [ -f /etc/init/onos.conf ] && sudo rm /etc/init/onos.conf
+    [ -d $ONOS_INSTALL_DIR ] && sudo rm -fr $ONOS_INSTALL_DIR
+    [ -f /etc/init/onos.conf ] && sudo rm -f /etc/init/onos.conf
+
+    exit \${status:-0};
 "
diff --git a/tools/test/cells/andrea b/tools/test/cells/andrea
index 2fb4df0..0d93b18 100644
--- a/tools/test/cells/andrea
+++ b/tools/test/cells/andrea
@@ -7,4 +7,5 @@
 export OCN="10.128.12.4"
 
 export OCT=$OC1
-export ONOS_APPS=drivers,openflow,proxyarp
+export ONOS_USE_SSH=true
+export ONOS_APPS=drivers,openflow,proxyarp,mobility
diff --git a/tools/test/cells/tomx b/tools/test/cells/tomx
index 3e528ee..91036e6 100644
--- a/tools/test/cells/tomx
+++ b/tools/test/cells/tomx
@@ -7,4 +7,5 @@
 export OCN="10.128.11.4"
 
 export OCT=$OC1
-export ONOS_APPS=drivers,openflow,proxyarp
\ No newline at end of file
+export ONOS_USE_SSH=true
+export ONOS_APPS=drivers,openflow,proxyarp,mobility
\ No newline at end of file