diff --git a/t/and_or.t b/t/and_or.t
index 3278a90..6b13400 100644
--- a/t/and_or.t
+++ b/t/and_or.t
@@ -2,12 +2,21 @@
   (and nil (set a 'fail))
   (expect "and - Short circuit" (equal a 'ok)))
 
-;; (let ((a 'ok))
-;;   (or t (set a 'fail))
-;;   (expect "or - short circuit" (equal a 'ok)))
-
 (expect "and - returns last value if all operands evaluate to true"
         (equal (and t 'ok) 'ok))
 
 (expect "and - returns nil if any operand evaluates to false"
         (null (and nil t)))
+
+(expect "and - returns nil if no operands supplied"
+        (null (and)))
+
+(let ((a 'ok))
+  (or t (set a 'fail))
+  (expect "or - short circuit" (equal a 'ok)))
+
+(expect "or - returns last value if all operands evaluate to false"
+        (equal (or nil 'ok) 'ok))
+
+(expect "or - returns nil if no operands supplied"
+        (null (or)))