diff --git a/tests/tests.el b/tests/tests.el
index c4f959e7..dbcbc1e7 100644
--- a/tests/tests.el
+++ b/tests/tests.el
@@ -4741,12 +4741,25 @@ Not multiple of 3: 7"
                                      (while (< i 3))
                                      (collect i)))))))
 
+(loopy-deftest while
+  :result '(1 2)
+  :body ((list i '(1 2 3 4 5 6))
+         (while (< i 3))
+         (collect i))
+  :loopy t
+  :iter-keyword (list while collect)
+  :iter-bare nil)
+
 ;;;;; Until
-(ert-deftest until ()
-  (should (equal '(1 2 3)
-                 (eval (quote (loopy (list i '(1 2 3 4 5 6))
-                                     (until (> i 3))
-                                     (collect i)))))))
+(loopy-deftest until
+  :result '(1 2 3)
+  :body ((list i '(1 2 3 4 5 6))
+         (until (> i 3))
+         (collect i))
+  :loopy t
+  :iter-keyword (list until collect)
+  :iter-bare nil)
+
 
 ;;;;; Always
 (loopy-deftest always-pass