diff --git a/backend/src/main/scala/cromwell/backend/async/KnownJobFailureException.scala b/backend/src/main/scala/cromwell/backend/async/KnownJobFailureException.scala
index e106f06fcd2..23ad85e957d 100644
--- a/backend/src/main/scala/cromwell/backend/async/KnownJobFailureException.scala
+++ b/backend/src/main/scala/cromwell/backend/async/KnownJobFailureException.scala
@@ -5,7 +5,9 @@ import common.exception.ThrowableAggregation
 import cromwell.core.path.Path
 import wom.expression.{NoIoFunctionSet, WomExpression}
 
-abstract class KnownJobFailureException extends Exception {
+import scala.util.control.NoStackTrace
+
+abstract class KnownJobFailureException extends Exception with NoStackTrace {
   def stderrPath: Option[Path]
 }
 
diff --git a/centaur/src/main/resources/standardTestCases/quota_fail_retry.test b/centaur/src/main/resources/standardTestCases/quota_fail_retry.test
index db6d29e1d8f..7203a9958ae 100644
--- a/centaur/src/main/resources/standardTestCases/quota_fail_retry.test
+++ b/centaur/src/main/resources/standardTestCases/quota_fail_retry.test
@@ -1,3 +1,4 @@
+ignore: true # GCP seems to have fixed the quota handling bug, which makes this test unnecessary
 name: quota_fail_retry
 testFormat: workflowfailure
 # In PAPI v2 there seems to be a quota exhaustion message in a reasonably timely manner, while in GCP Batch the job
diff --git a/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/errors/package.scala b/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/errors/package.scala
index ade5f84e00f..2a90f588803 100644
--- a/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/errors/package.scala
+++ b/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/errors/package.scala
@@ -7,7 +7,8 @@ package object errors {
     "usage too high",
     "no available zones",
     "resource_exhausted",
-    "quota too low"
+    "quota too low",
+    "waiting for quota"
   )
 
   def isQuotaMessage(msg: String): Boolean =