diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp
index 605e1a257f..fec8aeba07 100644
--- a/Libraries/LibJS/AST.cpp
+++ b/Libraries/LibJS/AST.cpp
@@ -258,9 +258,12 @@ Value IfStatement::execute(Interpreter& interpreter, GlobalObject& global_object
 Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const
 {
     Value last_value = js_undefined();
-    while (m_test->execute(interpreter, global_object).to_boolean()) {
+    for (;;) {
+        auto test_result = m_test->execute(interpreter, global_object);
         if (interpreter.exception())
             return {};
+        if (!test_result.to_boolean())
+            break;
         last_value = interpreter.execute_statement(global_object, *m_body);
         if (interpreter.exception())
             return {};
@@ -282,7 +285,7 @@ Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_obj
 Value DoWhileStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const
 {
     Value last_value = js_undefined();
-    do {
+    for (;;) {
         if (interpreter.exception())
             return {};
         last_value = interpreter.execute_statement(global_object, *m_body);
@@ -298,7 +301,12 @@ Value DoWhileStatement::execute(Interpreter& interpreter, GlobalObject& global_o
                 return last_value;
             }
         }
-    } while (m_test->execute(interpreter, global_object).to_boolean());
+        auto test_result = m_test->execute(interpreter, global_object);
+        if (interpreter.exception())
+            return {};
+        if (!test_result.to_boolean())
+            break;
+    }
 
     return last_value;
 }
diff --git a/Libraries/LibJS/Tests/loops/do-while-basic.js b/Libraries/LibJS/Tests/loops/do-while-basic.js
index baf428760e..e76c20e211 100644
--- a/Libraries/LibJS/Tests/loops/do-while-basic.js
+++ b/Libraries/LibJS/Tests/loops/do-while-basic.js
@@ -12,3 +12,9 @@ test("no braces", () => {
     while (number < 3);
     expect(number).toBe(3);
 });
+
+test("exception in test expression", () => {
+    expect(() => {
+        do {} while (foo);
+    }).toThrow(ReferenceError);
+});
diff --git a/Libraries/LibJS/Tests/loops/while-basic.js b/Libraries/LibJS/Tests/loops/while-basic.js
index ce25d27345..f3a4a2da88 100644
--- a/Libraries/LibJS/Tests/loops/while-basic.js
+++ b/Libraries/LibJS/Tests/loops/while-basic.js
@@ -17,3 +17,9 @@ test("does not loop when initially false", () => {
         expect().fail();
     }
 });
+
+test("exception in test expression", () => {
+    expect(() => {
+        while (foo);
+    }).toThrow(ReferenceError);
+});