diff --git a/t/unless.t b/t/unless.t
index c931dd9..c06d5b5 100644
--- a/t/unless.t
+++ b/t/unless.t
@@ -7,3 +7,9 @@
 (let ((a 'ok))
   (unless t (set a 'fail))
   (expect "unless - does not evaluate on true" (equal a 'ok)))
+
+(expect "unless - without body returns nil"
+        (null (unless nil)))
+
+(expect "when - implicit progn"
+        (equal 'ok (unless nil 'wrong 'wrong2 'ok)))
diff --git a/t/when.t b/t/when.t
index 0a24226..036dc7c 100644
--- a/t/when.t
+++ b/t/when.t
@@ -7,3 +7,9 @@
 (let ((a 'ok))
   (when nil (set a 'fail))
   (expect "when - does not evaluate on false" (equal a 'ok)))
+
+(expect "when - without body returns nil"
+        (null (when t)))
+
+(expect "when - implicit progn"
+        (equal 'ok (when t 'wrong 'wrong2 'ok)))