diff --git a/tools/test/bin/onos-wait-for-start b/tools/test/bin/onos-wait-for-start
index 93500f5..030e5cc 100755
--- a/tools/test/bin/onos-wait-for-start
+++ b/tools/test/bin/onos-wait-for-start
@@ -10,7 +10,7 @@
 
 ssh -t $remote "
     # Wait until we reach the run-level 100
-    for i in \$(seq 1 30); do
+    for i in \$(seq 1 20); do
         $ONOS_INSTALL_DIR/bin/onos bundle:list 2>/dev/null | \
             grep -q 'START LEVEL 100' && break || sleep 2
     done
@@ -20,4 +20,6 @@
         grep -q \" ApplicationManager .* Started\" \
             $ONOS_INSTALL_DIR/log/karaf.log && break || sleep 1
     done
+
+    grep -q \" ApplicationManager .* Started\" $ONOS_INSTALL_DIR/log/karaf.log
 "
diff --git a/tools/test/cells/beast-5 b/tools/test/cells/beast-5
index 8e959c5..e23f077 100644
--- a/tools/test/cells/beast-5
+++ b/tools/test/cells/beast-5
@@ -6,6 +6,8 @@
 # ONOS Test proxy
 export OCT=10.254.1.200
 
+export OCN=10.254.1.200
+
 # Use the 1G NICs for external access
 export OC1=10.254.1.201
 export OC2=10.254.1.202
@@ -13,4 +15,4 @@
 export OC4=10.254.1.204
 export OC5=10.254.1.205
 
-export ONOS_APPS="drivers,null,intentperf"
+export ONOS_APPS="drivers,openflow,proxyarp,fwd"