diff --git a/tests/reports/Makefile.am b/tests/reports/Makefile.am
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy9NYWtlZmlsZS5hbQ==..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy9NYWtlZmlsZS5hbQ== 100644
--- a/tests/reports/Makefile.am
+++ b/tests/reports/Makefile.am
@@ -20,7 +20,7 @@
 test tests: $(top_builddir)/xsltproc/xsltproc
 	@echo '## Running reports tests'
 	@(echo > .memdump)
-	-@(for i in $(srcdir)/../docs/*.xml ; do \
+	-@(for i in $(srcdir)/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
 	  for j in $(srcdir)/$$doc*.xsl ; do \
diff --git a/tests/reports/recglobparam.err b/tests/reports/recglobparam.err
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy9yZWNnbG9icGFyYW0uZXJy..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy9yZWNnbG9icGFyYW0uZXJy 100644
--- a/tests/reports/recglobparam.err
+++ b/tests/reports/recglobparam.err
@@ -1,6 +1,6 @@
 runtime error: file ./recglobparam.xsl line 4 element param
 Recursive definition of ok
 runtime error: file ./recglobparam.xsl line 4 element value-of
-unregistered variable ok
-xmlXPathCompiledEval: evaluation failed
+Variable 'ok' has not been declared.
+XPath error : Undefined variable
 runtime error: file ./recglobparam.xsl line 4 element value-of
@@ -6,3 +6,3 @@
 runtime error: file ./recglobparam.xsl line 4 element value-of
-xsltValueOf: text copy failed
+XPath evaluation returned no result.
 no result for ./recglobparam.xml
diff --git a/tests/reports/recglobvar.err b/tests/reports/recglobvar.err
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy9yZWNnbG9idmFyLmVycg==..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy9yZWNnbG9idmFyLmVycg== 100644
--- a/tests/reports/recglobvar.err
+++ b/tests/reports/recglobvar.err
@@ -1,6 +1,6 @@
 runtime error: file ./recglobvar.xsl line 4 element variable
 Recursive definition of ok
 runtime error: file ./recglobvar.xsl line 4 element value-of
-unregistered variable ok
-xmlXPathCompiledEval: evaluation failed
+Variable 'ok' has not been declared.
+XPath error : Undefined variable
 runtime error: file ./recglobvar.xsl line 4 element value-of
@@ -6,3 +6,3 @@
 runtime error: file ./recglobvar.xsl line 4 element value-of
-xsltValueOf: text copy failed
+XPath evaluation returned no result.
 no result for ./recglobvar.xml
diff --git a/tests/reports/reclocparam.err b/tests/reports/reclocparam.err
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy9yZWNsb2NwYXJhbS5lcnI=..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy9yZWNsb2NwYXJhbS5lcnI= 100644
--- a/tests/reports/reclocparam.err
+++ b/tests/reports/reclocparam.err
@@ -1,4 +1,4 @@
 runtime error: file ./reclocparam.xsl line 5 element value-of
-unregistered variable ok
-xmlXPathCompiledEval: evaluation failed
+Variable 'ok' has not been declared.
+XPath error : Undefined variable
 runtime error: file ./reclocparam.xsl line 5 element value-of
@@ -4,3 +4,3 @@
 runtime error: file ./reclocparam.xsl line 5 element value-of
-xsltValueOf: text copy failed
+XPath evaluation returned no result.
 no result for ./reclocparam.xml
diff --git a/tests/reports/reclocvar.err b/tests/reports/reclocvar.err
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy9yZWNsb2N2YXIuZXJy..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy9yZWNsb2N2YXIuZXJy 100644
--- a/tests/reports/reclocvar.err
+++ b/tests/reports/reclocvar.err
@@ -1,4 +1,4 @@
 runtime error: file ./reclocvar.xsl line 5 element value-of
-unregistered variable ok
-xmlXPathCompiledEval: evaluation failed
+Variable 'ok' has not been declared.
+XPath error : Undefined variable
 runtime error: file ./reclocvar.xsl line 5 element value-of
@@ -4,3 +4,3 @@
 runtime error: file ./reclocvar.xsl line 5 element value-of
-xsltValueOf: text copy failed
+XPath evaluation returned no result.
 no result for ./reclocvar.xml
diff --git a/tests/reports/tst-2.err b/tests/reports/tst-2.err
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy90c3QtMi5lcnI=..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy90c3QtMi5lcnI= 100644
--- a/tests/reports/tst-2.err
+++ b/tests/reports/tst-2.err
@@ -1,5 +1,5 @@
-compilation error: file ./tst-2.xsl line 2 element text
-misplaced text element: '
+compilation error: file ./tst-2.xsl line 6 element text
+misplaced text node: '
 
 a not allowed top level element
 
diff --git a/tests/reports/undefvar.err b/tests/reports/undefvar.err
index 88e6139997f8ccbdd8be1f37d230813da7e8a359_dGVzdHMvcmVwb3J0cy91bmRlZnZhci5lcnI=..1023866dd9e5b45c4920f3ab6e4a47dffb33a814_dGVzdHMvcmVwb3J0cy91bmRlZnZhci5lcnI= 100644
--- a/tests/reports/undefvar.err
+++ b/tests/reports/undefvar.err
@@ -1,5 +1,4 @@
 runtime error: file ./undefvar.xsl line 6 element value-of
-unregistered variable one
-xmlXPathCompOpEval: parameter error
-xmlXPathCompiledEval: 1 object left on the stack
+Variable 'one' has not been declared.
+XPath error : Undefined variable
 runtime error: file ./undefvar.xsl line 6 element value-of
@@ -5,3 +4,3 @@
 runtime error: file ./undefvar.xsl line 6 element value-of
-xsltValueOf: text copy failed
+XPath evaluation returned no result.
 no result for ./undefvar.xml