diff --git a/Docs/manual.texi b/Docs/manual.texi
index bc21efc2cf0..a032c4f8e6d 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -40213,6 +40213,40 @@ attachemnts, you should ftp all the relevant files to:
 
 @end itemize
 
+If your @strong{MySQL} version doesn't pass the test suite you should
+do the following:
+
+@itemize @bullet
+@item
+Don't send a bug report before you have found out as much as possible of
+what when wrong!  When you do it, please use the @code{mysqlbug} script
+so that we can get information about your system and @code{MySQL}
+version. @xref{Bug reports}.
+@item
+If you have compiled @strong{MySQL} yourself, check our manual for how
+to compile @strong{MySQL} on your platform or, preferable, use one of
+the binaries we have compiled for you at
+@uref{http://www.mysql.com/downloads/}.  All our standard binaries should
+pass the test suite !
+
+@item
+If you get an error, like @code{Result length mismatch} or @code{Result
+content mismatch} it means that the output of the test didn't match
+exactly the expected output. This could be a bug in @strong{MySQL} or
+that your mysqld version produces slight different results under some
+circumstances. In this case you should compare the @code{.test}
+and @code{.reject} file in the @code{mysql-test/r} sub directory to
+see if this is something to worry about.
+
+@item
+If a test fails totally, you should check the logs file in the
+@code{mysql-test/var/log} directory for hints of what went wrong.
+
+@item
+If you have compiled @strong{MySQL} with debugging you can try to debug this
+with the @code{--gdb} and @code{--debug} options to @code{mysql-test-run}.
+@end itemize
+
 @page
 @cindex environment variables, list of
 @node Environment variables, Users, MySQL internals, Top
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 075cfd83933..fb247000be7 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -291,6 +291,11 @@ report_stats () {
 	xwhole=`$EXPR $whole \* 100`      
 	deci=`$EXPR $raw - $xwhole`       
 	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% successful."
+	$ECHO ""
+        $ECHO "The log files in $MYSQL_TEST_DIR/var/log may give you some hint"
+	$ECHO "of what when wrong."
+	$ECHO "If you want to report this error, please read first the documentation at"
+        $ECHO "http://www.mysql.com/doc/M/y/MySQL_test_suite.html"
     fi
 }