diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala
index 89a205db8..d191e8d76 100644
--- a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala
+++ b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala
@@ -47,6 +47,11 @@ class PlanStabilityChecker(
     if (regenGoldenFiles) {
       generatePlanGolden(test.queryId, test.plan)
     } else if (planCheck) {
+      if ("q54" == test.queryId) {
+        println(s"[PlanCheck] Skipping plan check for query ${test.queryId} " +
+          s"on ${Shims.get.shimVersion} due to known non-determinism (see issue #2049).")
+        return true
+      }
       return comparePlanGolden(test.queryId, test.plan)
     }
     true