diff --git a/tools/test/bin/onos-check-component b/tools/test/bin/onos-check-component
index 686d936..27ce619 100755
--- a/tools/test/bin/onos-check-component
+++ b/tools/test/bin/onos-check-component
@@ -13,7 +13,7 @@
 for attempt in {1..30}; do
     onos ${node:-$OCI} scr:list  | grep $component > $aux
 
-    if grep -q $state $aux; then
+    if grep $state $aux; then
         exit 0
     else
         sleep 1
diff --git a/tools/test/bin/onos-mininet b/tools/test/bin/onos-mininet
index 5256166..9079e88 100755
--- a/tools/test/bin/onos-mininet
+++ b/tools/test/bin/onos-mininet
@@ -6,7 +6,7 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-export MAX_WAIT=60
+export MAX_WAIT=${ONOS_MN_TIMEOUT:-90}
 
 cmd="$1" && shift
 log="screenlog.0"