diff --git a/configuration/scripts/tests/poll_queue.csh b/configuration/scripts/tests/poll_queue.csh
index 0272a1aa..39c53efd 100755
--- a/configuration/scripts/tests/poll_queue.csh
+++ b/configuration/scripts/tests/poll_queue.csh
@@ -13,10 +13,9 @@ foreach line ("`cat suite.jobs`")
   set qstatjob = 1
   if (${job} =~ [0-9]*) then
     while ($qstatjob)
-      ${ICE_MACHINE_QSTAT} $job >&/dev/null
-      set qstatus = $status
-#      echo $job $qstatus
-      if ($qstatus != 0) then
+        set qstatus = `${ICE_MACHINE_QSTAT} $job | grep $job | wc -l`
+#        echo $job $qstatus
+        if ($qstatus == 0) then
         echo "Job $job completed"
         set qstatjob = 0
       else