diff --git a/ChangeLog b/ChangeLog
index e0fcb7aa..7fee05eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Mar 30 17:23:52 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
+
+	* tests/general/bug-36-inc.xsl tests/general/bug-37-inc.xsl
+	  tests/general/bug-65-inc.xsl tests/general/bug-100.xsl
+	  tests/REC/test-15-1.xsl tests/REC/test-7.1.1-3.xsl
+	  tests/namespaces/extra2.xsl tests/extensions/module.xsl
+	  tests/plugins/plugin.xsl python/tests/extelem.py
+	  python/tests/extfunc.py: Fixed regression tests wrt
+	  usage of the attributes "exclude-result-prefixes"
+	  and "extension-element-prefixes". test-7.1.1-3.xsl fails
+	  now, since the code still does not exclude ns-decls
+	  correctly.
+
 Thu Mar 30 17:11:53 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
 
 	* libxslt/xslt.c libxslt/xsltutils.c libxslt/preproc.c
diff --git a/python/tests/extelem.py b/python/tests/extelem.py
index b01f9c3a..3364d01a 100644
--- a/python/tests/extelem.py
+++ b/python/tests/extelem.py
@@ -41,7 +41,7 @@ styledoc = libxml2.parseDoc("""
 <xsl:stylesheet version='1.0'
   xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
   xmlns:foo='%s'
-  xsl:extension-element-prefixes='foo'>
+  extension-element-prefixes='foo'>
 
   <xsl:template match='/'>
     <article><foo:test>FAILURE</foo:test></article>
diff --git a/python/tests/extfunc.py b/python/tests/extfunc.py
index 8d505e53..0a559531 100755
--- a/python/tests/extfunc.py
+++ b/python/tests/extfunc.py
@@ -30,7 +30,7 @@ styledoc = libxml2.parseDoc("""
 <xsl:stylesheet version='1.0'
   xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
   xmlns:foo='http://example.com/foo'
-  xsl:exclude-result-prefixes='foo'>
+  exclude-result-prefixes='foo'>
 
   <xsl:param name='bar'>failure</xsl:param>
   <xsl:template match='/'>
diff --git a/tests/REC/test-15-1.xsl b/tests/REC/test-15-1.xsl
index 920a268e..71cdc23c 100644
--- a/tests/REC/test-15-1.xsl
+++ b/tests/REC/test-15-1.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:test="http://example.org/"
-		xsl:extension-element-prefixes="test"
+		extension-element-prefixes="test"
 		exclude-result-prefixes="test"
                 version='1.0'>
 <xsl:template match="/">
diff --git a/tests/REC/test-7.1.1-3.xsl b/tests/REC/test-7.1.1-3.xsl
index d4a72b93..365a883d 100644
--- a/tests/REC/test-7.1.1-3.xsl
+++ b/tests/REC/test-7.1.1-3.xsl
@@ -5,8 +5,8 @@
 
 <doc:doc>Some ignored documentation the prefix should not show
          up on the doc element</doc:doc>
-<xsl:template xsl:exclude-result-prefixes="doc" match="/">
-<out>SUCCESS</out>
+<xsl:template match="/">
+<out xsl:exclude-result-prefixes="doc">SUCCESS</out>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/tests/extensions/module.xsl b/tests/extensions/module.xsl
index 7f69c18f..4ada2780 100644
--- a/tests/extensions/module.xsl
+++ b/tests/extensions/module.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:libxslt="http://xmlsoft.org/XSLT/"
 		xmlns:test="http://xmlsoft.org/XSLT/"
-		xsl:extension-element-prefixes="libxslt test"
+		extension-element-prefixes="libxslt test"
                 version='1.0'>
 <!-- the prefix is registered twice to check single initialization -->
 <xsl:template match="/">
diff --git a/tests/general/bug-100.xsl b/tests/general/bug-100.xsl
index c2e9a090..9a62e230 100644
--- a/tests/general/bug-100.xsl
+++ b/tests/general/bug-100.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns="http://xmlsoft.org/XSLT/"
-		xsl:extension-element-prefixes="#default"
+		extension-element-prefixes="#default"
                 version='1.0'>
 <xsl:template match="/">
 <test/>
diff --git a/tests/general/bug-36-inc.xsl b/tests/general/bug-36-inc.xsl
index 9605c886..df991b77 100644
--- a/tests/general/bug-36-inc.xsl
+++ b/tests/general/bug-36-inc.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:n="http://xmlsoft.org/"
-		xsl:exclude-result-prefixes="n"
+		exclude-result-prefixes="n"
                 version='1.0'>
 
 <xsl:variable name="var" select="/n:x" />
diff --git a/tests/general/bug-37-inc.xsl b/tests/general/bug-37-inc.xsl
index 4da21d5e..6fe22363 100644
--- a/tests/general/bug-37-inc.xsl
+++ b/tests/general/bug-37-inc.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:n="http://xmlsoft.org/"
-		xsl:exclude-result-prefixes="n"
+		exclude-result-prefixes="n"
                 version='1.0'>
 
 <xsl:template match="/">
diff --git a/tests/general/bug-65.xsl b/tests/general/bug-65.xsl
index 9caa31c0..ec8f76de 100644
--- a/tests/general/bug-65.xsl
+++ b/tests/general/bug-65.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:libxslt="http://xmlsoft.org/XSLT/namespace" xsl:exclude-result-prefixes="libxslt"  version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:libxslt="http://xmlsoft.org/XSLT/namespace" exclude-result-prefixes="libxslt"  version="1.0">
   <xsl:output method="xml" indent="yes"/>
   <xsl:variable name="one">
     <xsl:copy-of select="."/>
diff --git a/tests/namespaces/extra2.xsl b/tests/namespaces/extra2.xsl
index 237d9a88..52b63c8a 100644
--- a/tests/namespaces/extra2.xsl
+++ b/tests/namespaces/extra2.xsl
@@ -2,7 +2,7 @@
 	      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	      xmlns="http://www.w3.org/TR/xhtml1/strict"
 	      xmlns:libxml="http://xmlsoft.org/XSLT/namespace"
-	      xsl:extension-element-prefixes="libxml">
+	      extension-element-prefixes="libxml">
 
 <xsl:template match="/">
 <libxml:debug/>
diff --git a/tests/plugins/plugin.xsl b/tests/plugins/plugin.xsl
index 0203d230..767c980a 100644
--- a/tests/plugins/plugin.xsl
+++ b/tests/plugins/plugin.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:libxslt="http://xmlsoft.org/xslt/testplugin"
   xmlns:test="http://xmlsoft.org/xslt/testplugin"
-  xsl:extension-element-prefixes="libxslt test"
+  extension-element-prefixes="libxslt test"
   version='1.0'>
 <!-- the prefix is registered twice to check single initialization -->
 <xsl:template match="/">