diff --git a/tests/test-pushpop1.rem b/tests/test-pushpop1.rem
new file mode 100644
index 00000000..fe0382c3
--- /dev/null
+++ b/tests/test-pushpop1.rem
@@ -0,0 +1,4 @@
+PUSH-OMIT-CONTEXT
+PUSH-FUNCS a b c
+PUSH-VARS a b c
+DO test-pushpop2.rem
diff --git a/tests/test-pushpop2.rem b/tests/test-pushpop2.rem
new file mode 100644
index 00000000..edeecaa9
--- /dev/null
+++ b/tests/test-pushpop2.rem
@@ -0,0 +1,4 @@
+POP-VARS
+POP-FUNCS
+POP-OMIT-CONTEXT
+
diff --git a/tests/test-rem b/tests/test-rem
index bce8441c..9f02c933 100644
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -988,7 +988,11 @@ REM 15 INFO "Url: https://dianne.skoll.ca" SPECIAL COLOR 255 0 0 Hello, linky 4!
 EOF
 
 # Test the $Shaded system variable
-$REMIND -pp ../tests/shaded.rem >> $OUT 2>&1
+$REMIND -pp ../tests/shaded.rem 2026-02-01 >> $OUT 2>&1
+
+# Test the push/pop warnings
+$REMIND ../tests/test-pushpop1.rem 2026-01-01 >> $OUT 2>&1
+$REMIND -dp ../tests/test-pushpop1.rem 2026-01-01 >> $OUT 2>&1
 
 cmp -s $OUT $CMP
 if [ "$?" = "0" ]; then
diff --git a/tests/test.cmp b/tests/test.cmp
index c178b90c..ebb0028f 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -40273,3 +40273,8 @@ March 31
 {"date":"2026-02-27","filename":"../tests/shaded.rem","lineno":14,"passthru":"SHADE","is_todo":0,"priority":5000,"if_depth":1,"r":255,"g":255,"b":0,"body":"255 255 0"}
 {"date":"2026-02-28","filename":"../tests/shaded.rem","lineno":6,"passthru":"SHADE","is_todo":0,"priority":5000,"if_depth":1,"r":0,"g":0,"b":255,"body":"0 0 255"}
 # rem2ps2 end
+No reminders.
+../tests/test-pushpop2.rem(1): POP-VARS at ../tests/test-pushpop2.rem:1 matches PUSH-VARS in different file: ../tests/test-pushpop1.rem:3
+../tests/test-pushpop2.rem(2): POP-FUNCS at ../tests/test-pushpop2.rem:2 matches PUSH-FUNCS in different file: ../tests/test-pushpop1.rem:2
+../tests/test-pushpop2.rem(3): POP-OMIT-CONTEXT at ../tests/test-pushpop2.rem:3 matches PUSH-OMIT-CONTEXT in different file: ../tests/test-pushpop1.rem:1
+No reminders.