diff --git a/tests/test-timezone-support b/tests/test-timezone-support
index 0c1219bf..ef3b5537 100755
--- a/tests/test-timezone-support
+++ b/tests/test-timezone-support
@@ -82,6 +82,23 @@ REM [last]  +100 TZ Australia/Sydney MSG Last Quarter  %*l %3. (*)
 
 EOF
 
+TZ=America/Los_Angeles $REMIND - 2026-01-01 <<'EOF' >> $OUT 2>&1
+BANNER %
+SET $AddBlankLines 0
+
+REM AT 13:33 MSG Whatsup? %*l %3.
+REM AT 13:33 TZ "" MSG Whatsup? %*l %3.
+EOF
+
+TZ=America/Los_Angeles $REMIND - 2026-01-01 <<'EOF' >> $OUT 2>&1
+BANNER %
+SET $AddBlankLines 0
+
+REM AT 13:33 TZ America/Los_Angeles TZ Universal MSG Whatsup? %*l %3.
+REM AT 13:33 TZ "" TZ America/Los_Angeles MSG Whatsup? %*l %3.
+REM TZ Universal MSG Borked
+EOF
+
 cmp -s $OUT $CMP
 if [ "$?" = "0" ] ; then
     echo "Remind:  Time zone test  PASSED"
diff --git a/tests/tz.cmp b/tests/tz.cmp
index c6aa82bd..bf1bada7 100644
--- a/tests/tz.cmp
+++ b/tests/tz.cmp
@@ -24,3 +24,9 @@ New Moon      2026-01-18 at 14:53.
 New Moon      2026-01-18 at 14:53. (*)
 First Quarter 2026-01-25 at 23:48.
 First Quarter 2026-01-25 at 23:48. (*)
+Whatsup? today at 13:33.
+Whatsup? today at 13:33.
+-stdin-(4): TZ specified twice
+-stdin-(5): TZ specified twice
+-stdin-(6): TZ specified for non-timed reminder
+No reminders.