diff --git a/configuration/scripts/tests/poll_queue.csh b/configuration/scripts/tests/poll_queue.csh
index 39c53efd9..0734bf9c1 100755
--- a/configuration/scripts/tests/poll_queue.csh
+++ b/configuration/scripts/tests/poll_queue.csh
@@ -13,7 +13,7 @@ foreach line ("`cat suite.jobs`")
   set qstatjob = 1
   if (${job} =~ [0-9]*) then
     while ($qstatjob)
-        set qstatus = `${ICE_MACHINE_QSTAT} $job | grep $job | wc -l`
+        set qstatus = `${ICE_MACHINE_QSTAT} $job | grep -iv " historical " | grep $job | wc -l`
 #        echo $job $qstatus
         if ($qstatus == 0) then
         echo "Job $job completed"
diff --git a/icepack.setup b/icepack.setup
index d6cf67255..e85fe8977 100755
--- a/icepack.setup
+++ b/icepack.setup
@@ -981,7 +981,7 @@ EOF0
 
   if ($?ICE_MACHINE_QSTAT) then
     cat >! ${tsdir}/poll_queue.env << EOF0
-setenv ICE_MACHINE_QSTAT ${ICE_MACHINE_QSTAT}
+setenv ICE_MACHINE_QSTAT "${ICE_MACHINE_QSTAT}"
 EOF0
   endif