diff --git a/AUTOTEST/configure.filters b/AUTOTEST/configure.filters
new file mode 100644
index 000000000..e5f163bd1
--- /dev/null
+++ b/AUTOTEST/configure.filters
@@ -0,0 +1,2 @@
+configure: WARNING: Disabling F90 Support
+configure: WARNING: Configuration for Python failed.  Support for Python disabled!
diff --git a/AUTOTEST/make.filters b/AUTOTEST/make.filters
new file mode 100644
index 000000000..a25774f72
--- /dev/null
+++ b/AUTOTEST/make.filters
@@ -0,0 +1,5 @@
+autoconf has been disabled
+automake has been disabled
+configure: WARNING: Disabling F90 Support
+configure: WARNING: Configuration for Python failed.
+warning: warning: feupdateenv is not implemented and will always fail
diff --git a/AUTOTEST/test.sh b/AUTOTEST/test.sh
index 8c909e9b4..93ec15cd7 100755
--- a/AUTOTEST/test.sh
+++ b/AUTOTEST/test.sh
@@ -65,7 +65,19 @@ EOF
    esac
 done
 
+# Run the test and capture stdout, stderr
 testname=`basename $1 .sh`
 shift
 echo "Running test [$testname]"
 ./$testname.sh $@ 1>"$testname.out" 2>"$testname.err"
+
+# Filter misleading error messages
+if [ -e $testname.filters ]; then
+    if (egrep -f $testname.filters $testname.err > /dev/null) ; then
+	echo "This file contains the original copy of $testname.err before filtering" > $testname.fil
+	cat $testname.err >> $testname.fil
+	mv $testname.err $testname.tmp
+	egrep -v -f $testname.filters $testname.tmp > $testname.err
+	rm -f $testname.tmp
+    fi
+fi