diff --git a/tests/include_dir/01.rem b/tests/include_dir/01.rem
new file mode 100644
index 00000000..ca5af414
--- /dev/null
+++ b/tests/include_dir/01.rem
@@ -0,0 +1 @@
+REM 15 MSG 01
diff --git a/tests/include_dir/02.rem b/tests/include_dir/02.rem
new file mode 100644
index 00000000..ef53d19b
--- /dev/null
+++ b/tests/include_dir/02.rem
@@ -0,0 +1 @@
+REM 15 MSG 02
diff --git a/tests/include_dir/03.notrem b/tests/include_dir/03.notrem
new file mode 100644
index 00000000..605533c4
--- /dev/null
+++ b/tests/include_dir/03.notrem
@@ -0,0 +1 @@
+REM MSG IGNORE
diff --git a/tests/include_dir_no_rems/03.notrem b/tests/include_dir_no_rems/03.notrem
new file mode 100644
index 00000000..605533c4
--- /dev/null
+++ b/tests/include_dir_no_rems/03.notrem
@@ -0,0 +1 @@
+REM MSG IGNORE
diff --git a/tests/include_test.rem b/tests/include_test.rem
new file mode 100644
index 00000000..d75adcbd
--- /dev/null
+++ b/tests/include_test.rem
@@ -0,0 +1,5 @@
+INCLUDE include_dir
+INCLUDE include_dir_no_rems
+INCLUDE nonexistent_include_dir
+
+REM 15 MSG Whee!!!!
diff --git a/tests/test-rem b/tests/test-rem
index dade41a2..ca4a5b0a 100644
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -11,6 +11,13 @@
 # Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 # ---------------------------------------------------------------------------
 
+DIR=`dirname $0`
+cd $DIR
+if test $? != 0 ; then
+    echo "Unable to cd $DIR" >&2
+    exit 1
+fi
+
 TEST_GETENV="foo bar baz" ; export TEST_GETENV
 echo "Test 1" > ../tests/test.out
 echo "" >> ../tests/test.out
@@ -37,6 +44,16 @@ echo "Test 7" >> ../tests/test.out
 echo "" >> ../tests/test.out
 ../src/remind -p -b2 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out
 
+echo "Test 8" >> ../tests/test.out
+echo "" >> ../tests/test.out
+../src/remind -p -b2 ../tests/include_dir 1 aug 2007 >> ../tests/test.out
+
+echo "Test 9" >> ../tests/test.out
+echo "" >> ../tests/test.out
+../src/remind -p -b2 ../tests/nonexistent_include_dir 1 aug 2007 >> ../tests/test.out 2>&1
+../src/remind -p -b2 ../tests/include_dir_no_rems 1 aug 2007 >> ../tests/test.out 2>&1
+../src/remind -p -b2 ../tests/include_test.rem 1 aug 2007 >> ../tests/test.out 2>&1
+
 cmp -s ../tests/test.out ../tests/test.cmp
 if [ "$?" = "0" ]; then
    echo "Remind:  Acceptance test PASSED"
diff --git a/tests/test.cmp b/tests/test.cmp
index 4c75f358..e40721b9 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -1184,3 +1184,100 @@ September 30
 2007/08/01 * * 2205 780 Brown
 2007/08/01 * * 2925 780 Strange
 # rem2ps end
+Test 8
+
+# rem2ps begin
+August 2007 31 3 0
+Sunday Monday Tuesday Wednesday Thursday Friday Saturday
+July 31
+September 30
+2007/08/15 * * * * 01
+2007/08/15 * * * * 02
+# rem2ps end
+Test 9
+
+Can't open file: ../tests/nonexistent_include_dir
+Error reading ../tests/nonexistent_include_dir: Can't open file
+# rem2ps begin
+August 2007 31 3 0
+Sunday Monday Tuesday Wednesday Thursday Friday Saturday
+July 31
+September 30
+../tests/include_dir_no_rems: No files matching *.rem
+Error reading ../tests/include_dir_no_rems: No files matching *.rem
+# rem2ps begin
+August 2007 31 3 0
+Sunday Monday Tuesday Wednesday Thursday Friday Saturday
+July 31
+September 30
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+../tests/include_test.rem(2): include_dir_no_rems: No files matching *.rem
+../tests/include_test.rem(3): Can't open file: nonexistent_include_dir
+# rem2ps begin
+August 2007 31 3 0
+Sunday Monday Tuesday Wednesday Thursday Friday Saturday
+July 31
+September 30
+2007/08/15 * * * * 01
+2007/08/15 * * * * 02
+2007/08/15 * * * * Whee!!!!
+# rem2ps end