diff --git a/tools/test/bin/onos-check-flows b/tools/test/bin/onos-check-flows
index 1c76511..afff9af 100755
--- a/tools/test/bin/onos-check-flows
+++ b/tools/test/bin/onos-check-flows
@@ -6,16 +6,14 @@
 aux=/tmp/stc-$$.log
 trap "rm -f $aux 2>/dev/null" EXIT
 
-onos ${1:-$OCI} "onos:flows" > $aux
-cat $aux
-
 for i in {1..5}; do
-    let status=0
-    grep "PENDING_" $aux && let status=status+1
-    if [ "$status" == "0" ]
-    then
+    onos ${1:-$OCI} "onos:flows" > $aux
+    if grep "PENDING_" $aux; then
+        sleep 5
+    else
+        cat $aux
         exit 0
     fi
-    sleep 5
 done
+cat $aux
 exit 1