diff --git a/tests/e2e/ensure-test-stack.js b/tests/e2e/ensure-test-stack.js
index 00daa44c8af84..443328d8bebf3 100644
--- a/tests/e2e/ensure-test-stack.js
+++ b/tests/e2e/ensure-test-stack.js
@@ -43,14 +43,16 @@ exports.ensureTestStack = async (client, stackName, templateBody) => {
 
   try {
     // TODO: Feature Request: return the last describe response from the waiter result, so we can inspect failure reasons.
-    await waitUntilChangeSetCreateComplete({ client }, { ChangeSetName: Id });
+    await waitUntilChangeSetCreateComplete({ client, maxWaitTime: 300 }, { ChangeSetName: Id });
   } catch (e) {
-    const { Status, StatusReason } = await client.send(
-      new DescribeChangeSetCommand({
-        StackName: stackName,
-        ChangeSetName: Id,
-      })
-    );
+    const { Status, StatusReason = "" } = await client
+      .send(
+        new DescribeChangeSetCommand({
+          StackName: stackName,
+          ChangeSetName: Id,
+        })
+      )
+      .catch((e) => console.warn("Failed to describe changeset", e));
     if (Status === "FAILED" && StatusReason.includes("The submitted information didn't contain changes")) {
       await client
         .send(