diff --git a/.travis.yml b/.travis.yml
index 38147953..265ca2e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,24 +14,18 @@ addons:
 
 matrix:
     include:
-        - php: 5.6
-          env: TEST_CONFIG="phpunit.xml"
-        - php: 7.0
+        - php: 7.1
           env: TEST_CONFIG="phpunit.xml"
         - php: 7.2
           env: TEST_CONFIG="phpunit.xml" CHECK_CS=true
-        - php: 7.0
-          env: TEST_CONFIG="phpunit-integration-legacy.xml"
-        - php: 5.6
-          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="4.10.4" CORES_SETUP="single" SOLR_CORES="collection1" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml"
-        - php: 7.1
-          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.6.0" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml"
+        - php: 7.3
+          env: TEST_CONFIG="phpunit.xml"
         - php: 7.1
+          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.6.5" CORES_SETUP="shared" SOLR_CONFIG="vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/schema.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/custom-fields-types.xml vendor/ezsystems/ezplatform-solr-search-engine/lib/Resources/config/solr/language-fieldtypes.xml"
+        - php: 7.2
           env: TEST_CONFIG="phpunit-integration-legacy-empty-db.xml" DB="postgresql" DATABASE="pgsql://postgres@localhost/testdb"
-        - php: 7.1
+        - php: 7.3
           env: TEST_CONFIG="phpunit-integration-legacy-empty-db.xml" DB="mysql" DATABASE="mysql://root@localhost/testdb"
-        - php: 7.0
-          env: TEST_CONFIG="phpunit.xml" COMPOSER_REQUIRE="ezsystems/ezpublish-kernel:^6.13.6@dev"
 
 # test only master (+ Pull requests)
 branches:
diff --git a/composer.json b/composer.json
index eae04f6c..8dd704e6 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     ],
     "require": {
         "ezsystems/ezpublish-kernel": "^6.13.6@dev || ^7.2.5@dev",
-        "ezsystems/repository-forms": "^1.9 || ^2.0"
+        "ezsystems/repository-forms": "^1.9 || ^2.0",
+        "ezsystems/ezplatform-richtext": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
diff --git a/lib/FieldType/XmlText/Converter/RichText.php b/lib/FieldType/XmlText/Converter/RichText.php
index 25da64e3..f6e975d8 100644
--- a/lib/FieldType/XmlText/Converter/RichText.php
+++ b/lib/FieldType/XmlText/Converter/RichText.php
@@ -16,12 +16,12 @@
 use Psr\Log\LoggerInterface;
 use eZ\Publish\Core\FieldType\RichText\Converter\Aggregate;
 use eZ\Publish\Core\FieldType\RichText\Converter\Xslt;
-use eZ\Publish\Core\FieldType\RichText\Validator;
 use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use Psr\Log\NullLogger;
 use Psr\Log\LogLevel;
 use Symfony\Component\Debug\Exception\ContextErrorException;
 use eZ\Publish\API\Repository\Repository;
+use EzSystems\EzPlatformRichText\eZ\RichText\Validator\Validator;
 
 class RichText implements Converter
 {
diff --git a/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl b/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
index e77b62bf..761fc44c 100644
--- a/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
+++ b/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
@@ -115,6 +115,7 @@
               <xsl:value-of select="@custom:language"/>
             </xsl:attribute>
           </xsl:if>
+          <xsl:call-template name="custom-attributes" />
           <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
           <xsl:value-of disable-output-escaping="yes" select="./text()"/>
           <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
@@ -149,6 +150,18 @@
   <xsl:template match="line">
   </xsl:template>
 
+  <xsl:template name="custom-attributes">
+    <xsl:if test="@*[namespace-uri() = 'http://ez.no/namespaces/ezpublish3/custom/' and not( local-name() = 'class' ) and not( local-name() = 'align' )]">
+      <xsl:element name="ezattribute" namespace="http://docbook.org/ns/docbook">
+        <xsl:for-each select="@*[namespace-uri() = 'http://ez.no/namespaces/ezpublish3/custom/' and not( local-name() = 'class' ) and not( local-name() = 'align' )]">
+          <xsl:call-template name="addHashValue">
+            <xsl:with-param name="attribute" select="current()"/>
+          </xsl:call-template>
+        </xsl:for-each>
+      </xsl:element>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template match="paragraph">
     <xsl:element name="para" namespace="http://docbook.org/ns/docbook">
       <xsl:if test="@class">
@@ -161,6 +174,7 @@
           <xsl:with-param name="align" select="@align"/>
         </xsl:call-template>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:variable name="lines" select="line"/>
       <xsl:choose>
         <xsl:when test="count( $lines ) &gt; 0">
@@ -185,6 +199,7 @@
 
   <xsl:template match="custom[@name='quote']">
     <xsl:element name="blockquote" namespace="http://docbook.org/ns/docbook">
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -196,6 +211,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -208,6 +224,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -217,22 +234,26 @@
       <xsl:when test="@name='underline'">
         <xsl:element name="emphasis" namespace="http://docbook.org/ns/docbook">
           <xsl:attribute name="role">underlined</xsl:attribute>
+          <xsl:call-template name="custom-attributes" />
           <xsl:apply-templates/>
         </xsl:element>
       </xsl:when>
       <xsl:when test="@name='strike'">
         <xsl:element name="emphasis" namespace="http://docbook.org/ns/docbook">
           <xsl:attribute name="role">strikedthrough</xsl:attribute>
+          <xsl:call-template name="custom-attributes" />
           <xsl:apply-templates/>
         </xsl:element>
       </xsl:when>
       <xsl:when test="@name='sub'">
         <xsl:element name="subscript" namespace="http://docbook.org/ns/docbook">
+          <xsl:call-template name="custom-attributes" />
           <xsl:apply-templates/>
         </xsl:element>
       </xsl:when>
       <xsl:when test="@name='sup'">
         <xsl:element name="superscript" namespace="http://docbook.org/ns/docbook">
+          <xsl:call-template name="custom-attributes" />
           <xsl:apply-templates/>
         </xsl:element>
       </xsl:when>
@@ -278,6 +299,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -367,6 +389,7 @@
           <xsl:with-param name="align" select="@align"/>
         </xsl:call-template>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -378,6 +401,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -389,6 +413,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -400,6 +425,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -451,6 +477,7 @@
           </xsl:choose>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:if test="$tableElement = 'table'">
         <xsl:element name="caption" namespace="http://docbook.org/ns/docbook">
           <xsl:value-of select="@custom:caption"/>
@@ -471,6 +498,7 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -517,6 +545,7 @@
           <xsl:value-of select="@custom:scope"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
@@ -553,6 +582,7 @@
           <xsl:value-of select="@xhtml:rowspan"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:call-template name="custom-attributes" />
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
diff --git a/tests/lib/FieldType/Converter/EzxmlToDocbookTest.php b/tests/lib/FieldType/Converter/EzxmlToDocbookTest.php
index c733b4e3..65c91cd2 100644
--- a/tests/lib/FieldType/Converter/EzxmlToDocbookTest.php
+++ b/tests/lib/FieldType/Converter/EzxmlToDocbookTest.php
@@ -8,7 +8,7 @@
  */
 namespace EzSystems\EzPlatformXmlTextFieldType\Tests\FieldType\Converter;
 
-use eZ\Publish\Core\FieldType\RichText\Validator;
+use EzSystems\EzPlatformRichText\eZ\RichText\Validator\Validator;
 use eZ\Publish\Core\FieldType\XmlText\Converter\RichText;
 use eZ\Publish\Core\SignalSlot\Repository;
 use eZ\Publish\API\Repository\ContentService;
@@ -58,8 +58,8 @@ private function createApiRepositoryStub()
     protected function getConverter($inputFile)
     {
         $validatorSchemas = [
-            './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/ezpublish.rng',
-            './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
+            './vendor/ezsystems/ezplatform-richtext/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng',
+            './vendor/ezsystems/ezplatform-richtext/src/lib/eZ/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
         ];
         $apiRepositoryStub = $this->createApiRepositoryStub();
 
diff --git a/tests/lib/FieldType/Converter/RichTextTest.php b/tests/lib/FieldType/Converter/RichTextTest.php
index 7d6433dd..313795e0 100644
--- a/tests/lib/FieldType/Converter/RichTextTest.php
+++ b/tests/lib/FieldType/Converter/RichTextTest.php
@@ -19,7 +19,7 @@
 use eZ\Publish\API\Repository\Values\Content\Location;
 use Psr\Log\NullLogger;
 use eZ\Publish\Core\Base\Exceptions\NotFoundException;
-use eZ\Publish\Core\FieldType\RichText\Validator;
+use EzSystems\EzPlatformRichText\eZ\RichText\Validator\Validator;
 
 class RichTextTest extends TestCase
 {
@@ -258,8 +258,8 @@ public function getValidator()
     {
         return new Validator(
             array(
-                './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/ezpublish.rng',
-                './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
+                './vendor/ezsystems/ezplatform-richtext/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng',
+                './vendor/ezsystems/ezplatform-richtext/src/lib/eZ/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
             )
         );
     }
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/002-para.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/002-para.xml
index d717b1d5..dda924e3 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/002-para.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/002-para.xml
@@ -10,4 +10,5 @@
   <para ezxhtml:textalign="center">This is a centered paragraph.</para>
   <para ezxhtml:textalign="right">This is a right aligned paragraph.</para>
   <para ezxhtml:textalign="justify">This is a justified paragraph.</para>
+  <para><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>This is a paragraph with custom tags.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/005-emphasis.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/005-emphasis.xml
index d891f32f..68722560 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/005-emphasis.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/005-emphasis.xml
@@ -6,4 +6,5 @@
          version="5.0-variant ezpublish-1.0">
   <title ezxhtml:level="2">This is a heading.</title>
   <para>This is a paragraph with <emphasis ezxhtml:class="emphasisClass">emphasized</emphasis> text.</para>
+  <para>This is a paragraph with <emphasis><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>emphasized (custom attributes)</emphasis> text.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/006-emphasisStrong.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/006-emphasisStrong.xml
index 771509f8..a6ae3c22 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/006-emphasisStrong.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/006-emphasisStrong.xml
@@ -6,4 +6,5 @@
          version="5.0-variant ezpublish-1.0">
   <title ezxhtml:level="2">This is a heading.</title>
   <para>This is a paragraph with <emphasis role="strong" ezxhtml:class="emphasisStrongClass">strong</emphasis> text.</para>
+  <para>This is a paragraph with <emphasis role="strong"><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>strong (custom attributes)</emphasis> text.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/007-emphasisUnderlined.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/007-emphasisUnderlined.xml
index 4378b1fd..a7da8c8d 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/007-emphasisUnderlined.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/007-emphasisUnderlined.xml
@@ -6,4 +6,5 @@
          version="5.0-variant ezpublish-1.0">
   <title ezxhtml:level="2">This is a heading.</title>
   <para>This is a paragraph with <emphasis role="underlined">underlined</emphasis> text.</para>
+  <para>This is a paragraph with <emphasis role="underlined"><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>underlined (custom attributes)</emphasis> text.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/008-orderedList.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/008-orderedList.xml
index 8e9d8ae8..1dd0a7ef 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/008-orderedList.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/008-orderedList.xml
@@ -7,4 +7,17 @@
   <orderedlist ezxhtml:class="orderedListClass">
     <listitem ezxhtml:class="listItemClass"><para>This is a list item.</para></listitem>
   </orderedlist>
+  <orderedlist>
+    <ezattribute>
+      <ezvalue key="name-1">list 1</ezvalue>
+      <ezvalue key="name-2">list 2</ezvalue>
+    </ezattribute>
+    <listitem>
+      <ezattribute>
+        <ezvalue key="name-1">list item 1</ezvalue>
+        <ezvalue key="name-2">list item 2</ezvalue>
+      </ezattribute>
+      <para>This is a list item (custom attributes).</para>
+    </listitem>
+  </orderedlist>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml
index 11559d6a..22ec413b 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml
@@ -7,4 +7,17 @@
   <itemizedlist ezxhtml:class="itemizedListClass">
     <listitem ezxhtml:class="listItemClass"><para>This is a list item.</para></listitem>
   </itemizedlist>
+  <itemizedlist>
+    <ezattribute>
+      <ezvalue key="name-1">list 1</ezvalue>
+      <ezvalue key="name-2">list 2</ezvalue>
+    </ezattribute>
+    <listitem>
+      <ezattribute>
+        <ezvalue key="name-1">list item 1</ezvalue>
+        <ezvalue key="name-2">list item 2</ezvalue>
+      </ezattribute>
+      <para>This is a list item.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml
index 01cd6f14..2a4633c0 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml
@@ -5,24 +5,56 @@
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
   <informaltable class="tableClass" width="24" title="tableTitle" border="1" style="border-width:42px;">
+    <ezattribute>
+      <ezvalue key="summary">tableTitle</ezvalue>
+      <ezvalue key="caption"/>
+      <ezvalue key="table-1">value 1</ezvalue>
+      <ezvalue key="table-2">value 2</ezvalue>
+    </ezattribute>
     <tbody>
       <tr class="rowClass1">
+        <ezattribute>
+          <ezvalue key="row">value 1</ezvalue>
+        </ezattribute>
         <th class="headingClass1" ezxhtml:width="102" valign="top" colspan="1" rowspan="5" abbr="XSLT" scope="col">
+          <ezattribute>
+            <ezvalue key="valign">top</ezvalue>
+            <ezvalue key="abbr">XSLT</ezvalue>
+            <ezvalue key="scope">col</ezvalue>
+            <ezvalue key="header">value 1</ezvalue>
+          </ezattribute>
           <para>11</para>
         </th>
         <th class="headingClass2" ezxhtml:width="37%" valign="middle" colspan="2" rowspan="6" abbr="XSD" scope="row">
+          <ezattribute>
+            <ezvalue key="valign">middle</ezvalue>
+            <ezvalue key="abbr">XSD</ezvalue>
+            <ezvalue key="scope">row</ezvalue>
+            <ezvalue key="header">value 2</ezvalue>
+          </ezattribute>
           <para>12.1</para>
           <para>12.2</para>
         </th>
       </tr>
       <tr class="rowClass2">
+        <ezattribute>
+          <ezvalue key="row">value 2</ezvalue>
+        </ezattribute>
         <td class="cellClass1" ezxhtml:width="74%" valign="bottom" colspan="3" rowspan="7">
+          <ezattribute>
+            <ezvalue key="valign">bottom</ezvalue>
+            <ezvalue key="column">value 1</ezvalue>
+          </ezattribute>
           <para>21</para>
           <itemizedlist ezxhtml:class="itemizedListClass">
             <listitem ezxhtml:class="listItemClass"><para>This is a list item.</para></listitem>
           </itemizedlist>
         </td>
         <td class="cellClass2" ezxhtml:width="38" valign="baseline" colspan="4" rowspan="8">
+          <ezattribute>
+            <ezvalue key="valign">baseline</ezvalue>
+            <ezvalue key="column">value 2</ezvalue>
+          </ezattribute>
           <para>22</para>
           <para><literallayout class="normal">This is a paragraph
 with some
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml
index 3875abf8..c2686917 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml
@@ -5,21 +5,53 @@
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
   <table class="tableClass" width="24%" title="tableTitle">
+    <ezattribute>
+      <ezvalue key="summary">tableTitle</ezvalue>
+      <ezvalue key="caption">Table caption.</ezvalue>
+      <ezvalue key="table-1">value 1</ezvalue>
+      <ezvalue key="table-2">value 2</ezvalue>
+    </ezattribute>
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
+        <ezattribute>
+          <ezvalue key="row">value 1</ezvalue>
+        </ezattribute>
         <th class="headingClass1" ezxhtml:width="102" valign="top" colspan="1" rowspan="5" abbr="XSLT" scope="col">
+          <ezattribute>
+            <ezvalue key="valign">top</ezvalue>
+            <ezvalue key="abbr">XSLT</ezvalue>
+            <ezvalue key="scope">col</ezvalue>
+            <ezvalue key="header">value 1</ezvalue>
+          </ezattribute>
           <para>11</para>
         </th>
         <th class="headingClass2" ezxhtml:width="37%" valign="middle" colspan="2" rowspan="6" abbr="XSD" scope="row">
+          <ezattribute>
+            <ezvalue key="valign">middle</ezvalue>
+            <ezvalue key="abbr">XSD</ezvalue>
+            <ezvalue key="scope">row</ezvalue>
+            <ezvalue key="header">value 2</ezvalue>
+          </ezattribute>
           <para>12</para>
         </th>
       </tr>
       <tr class="rowClass2">
+        <ezattribute>
+          <ezvalue key="row">value 2</ezvalue>
+        </ezattribute>
         <td class="cellClass1" ezxhtml:width="74%" valign="bottom" colspan="3" rowspan="7">
+          <ezattribute>
+            <ezvalue key="valign">bottom</ezvalue>
+            <ezvalue key="column">value 1</ezvalue>
+          </ezattribute>
           <para>21</para>
         </td>
         <td class="cellClass2" ezxhtml:width="38" valign="baseline" colspan="4" rowspan="8">
+          <ezattribute>
+            <ezvalue key="valign">baseline</ezvalue>
+            <ezvalue key="column">value 2</ezvalue>
+          </ezattribute>
           <para>22</para>
         </td>
       </tr>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
index 9ce2897f..3df67905 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
@@ -21,4 +21,7 @@
     <link xlink:href="ezcontent://333" xlink:show="none" xml:id="id5" xlink:title="Content title" ezxhtml:class="linkClass5">Content name</link>
   </para>
   <para><anchor xml:id="anchor"/>Some anchored content.</para>
+  <para>
+    <link xlink:href="ezcontent://333" xlink:show="none" xml:id="id6"><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>Link with custom attributes</link>
+  </para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/015-subscript.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/015-subscript.xml
index 679ce61d..3513cf47 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/015-subscript.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/015-subscript.xml
@@ -5,4 +5,5 @@
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
   <para>Thirsty? Have some H<subscript>2</subscript>O.</para>
+  <para>Thirsty? Have some H<subscript><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>2 (custom attribute)</subscript>O.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/016-superscript.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/016-superscript.xml
index ca7709bb..496eab52 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/016-superscript.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/016-superscript.xml
@@ -5,4 +5,5 @@
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
   <para>The equation e<superscript>πi</superscript> + 1 = 0 ties together five of the most important mathematical constants.</para>
+  <para>The equation e<superscript><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>&#x3C0;i (custom attributes)</superscript> + 1 = 0 ties together five of the most important mathematical constants.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/019-emphasisStrikedthrough.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/019-emphasisStrikedthrough.xml
index c7665ea1..37272c5b 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/019-emphasisStrikedthrough.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/019-emphasisStrikedthrough.xml
@@ -6,4 +6,5 @@
          version="5.0-variant ezpublish-1.0">
   <title ezxhtml:level="2">This is a heading.</title>
   <para>This is a paragraph with <emphasis role="strikedthrough">strikedthrough</emphasis> text.</para>
+  <para>This is a paragraph with <emphasis role="strikedthrough"><ezattribute><ezvalue key="name-1">value 1</ezvalue><ezvalue key="name-2">value 2</ezvalue></ezattribute>strikedthrough (custom attributes)</emphasis> text.</para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/020-blockquote.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/020-blockquote.xml
index 7cb930d0..b6a756cc 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/020-blockquote.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/020-blockquote.xml
@@ -13,4 +13,11 @@
   <blockquote>
     <para>Don't wake me for the end of the world unless it has very good special effects.</para>
   </blockquote>
+  <blockquote>
+    <ezattribute>
+      <ezvalue key="name-1">value 1</ezvalue>
+      <ezvalue key="name-2">value 2</ezvalue>
+    </ezattribute>
+    <para>Don't wake me for the end of the world unless it has very good special effects.</para>
+  </blockquote>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/021-titleImplicitLevels.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/021-titleImplicitLevels.xml
index ffdc5924..39b14297 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/021-titleImplicitLevels.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/021-titleImplicitLevels.xml
@@ -4,53 +4,18 @@
          xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
-  <title>This is a first level heading.</title>
-  <section>
-    <title>This is a second level heading.</title>
-  </section>
-  <section>
-    <section>
-      <title>This is a third level heading.</title>
-    </section>
-  </section>
-  <section>
-    <section>
-      <section>
-        <title>This is a fourth level heading.</title>
-      </section>
-    </section>
-  </section>
-  <section>
-    <section>
-      <section>
-        <section>
-          <title>This is a fifth level heading.</title>
-        </section>
-      </section>
-    </section>
-  </section>
-  <section>
-    <section>
-      <section>
-        <section>
-          <section>
-            <title>This is a sixth level heading.</title>
-          </section>
-        </section>
-      </section>
-    </section>
-  </section>
-  <section>
-    <section>
-      <section>
-        <section>
-          <section>
-            <section>
-              <title>This is a seventh level heading.</title>
-            </section>
-          </section>
-        </section>
-      </section>
-    </section>
-  </section>
+  <title ezxhtml:level="2">This is a first level heading.</title>
+  <title ezxhtml:level="2">This is a second level heading.</title>
+  <title ezxhtml:level="3">This is a third level heading.</title>
+  <title ezxhtml:level="4">This is a fourth level heading.</title>
+  <title ezxhtml:level="5">This is a fifth level heading.</title>
+  <title ezxhtml:level="6">This is a sixth level heading.</title>
+  <title ezxhtml:level="6">This is a seventh level heading.</title>
+  <title ezxhtml:level="2"><ezattribute><ezvalue key="title-level">1</ezvalue></ezattribute>This is a first level heading.</title>
+  <title ezxhtml:level="2"><ezattribute><ezvalue key="title-level">2</ezvalue></ezattribute>This is a second level heading.</title>
+  <title ezxhtml:level="3"><ezattribute><ezvalue key="title-level">3</ezvalue></ezattribute>This is a third level heading.</title>
+  <title ezxhtml:level="4"><ezattribute><ezvalue key="title-level">4</ezvalue></ezattribute>This is a fourth level heading.</title>
+  <title ezxhtml:level="5"><ezattribute><ezvalue key="title-level">5</ezvalue></ezattribute>This is a fifth level heading.</title>
+  <title ezxhtml:level="6"><ezattribute><ezvalue key="title-level">6</ezvalue></ezattribute>This is a sixth level heading.</title>
+  <title ezxhtml:level="6"><ezattribute><ezvalue key="title-level">7</ezvalue></ezattribute>This is a seventh level heading.</title>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/024-template.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/024-template.xml
index 421f529e..4f36bde6 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/024-template.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/024-template.xml
@@ -7,6 +7,10 @@
   <eztemplate name="factbox" ezxhtml:class="templateClass" ezxhtml:align="left">
     <ezcontent>
       <table title="tableTitle">
+        <ezattribute>
+          <ezvalue key="summary">tableTitle</ezvalue>
+          <ezvalue key="caption">About factoids</ezvalue>
+        </ezattribute>
         <caption>About factoids</caption>
         <tbody>
           <tr>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/002-para.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/002-para.xml
index 206902b7..d74e4f29 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/002-para.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/002-para.xml
@@ -10,4 +10,5 @@
   <paragraph align="center">This is a centered paragraph.</paragraph>
   <paragraph align="right">This is a right aligned paragraph.</paragraph>
   <paragraph align="justify">This is a justified paragraph.</paragraph>
+  <paragraph custom:name-1="value 1" custom:name-2="value 2">This is a paragraph with custom tags.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/005-emphasis.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/005-emphasis.xml
index edc25aa7..ec2874b0 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/005-emphasis.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/005-emphasis.xml
@@ -6,4 +6,5 @@
     <header>This is a heading.</header>
   </section>
   <paragraph>This is a paragraph with <emphasize class="emphasisClass">emphasized</emphasize> text.</paragraph>
+  <paragraph>This is a paragraph with <emphasize custom:name-1="value 1" custom:name-2="value 2">emphasized (custom attributes)</emphasize> text.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/006-emphasisStrong.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/006-emphasisStrong.xml
index e592d260..b23ead3e 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/006-emphasisStrong.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/006-emphasisStrong.xml
@@ -6,4 +6,5 @@
     <header>This is a heading.</header>
   </section>
   <paragraph>This is a paragraph with <strong class="emphasisStrongClass">strong</strong> text.</paragraph>
+  <paragraph>This is a paragraph with <strong custom:name-1="value 1" custom:name-2="value 2">strong (custom attributes)</strong> text.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/007-emphasisUnderlined.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/007-emphasisUnderlined.xml
index 520d241f..5a28d408 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/007-emphasisUnderlined.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/007-emphasisUnderlined.xml
@@ -6,4 +6,5 @@
     <header>This is a heading.</header>
   </section>
   <paragraph>This is a paragraph with <custom name="underline">underlined</custom> text.</paragraph>
+  <paragraph>This is a paragraph with <custom name="underline" custom:name-1="value 1" custom:name-2="value 2">underlined (custom attributes)</custom> text.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/008-orderedList.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/008-orderedList.xml
index 4b191a21..09abcd54 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/008-orderedList.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/008-orderedList.xml
@@ -9,4 +9,11 @@
       </li>
     </ol>
   </paragraph>
+  <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+    <ol custom:name-1="list 1" custom:name-2="list 2">
+      <li custom:name-1="list item 1" custom:name-2="list item 2">
+        <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">This is a list item (custom attributes).</paragraph>
+      </li>
+    </ol>
+  </paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/009-itemizedList.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/009-itemizedList.xml
index 958df716..026a6389 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/009-itemizedList.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/009-itemizedList.xml
@@ -9,4 +9,11 @@
       </li>
     </ul>
   </paragraph>
+  <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+    <ul custom:name-1="list 1" custom:name-2="list 2">
+      <li custom:name-1="list item 1" custom:name-2="list item 2">
+        <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">This is a list item.</paragraph>
+      </li>
+    </ul>
+  </paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/010-htmlInformaltable.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/010-htmlInformaltable.xml
index bb816641..5f6f15c7 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/010-htmlInformaltable.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/010-htmlInformaltable.xml
@@ -3,18 +3,18 @@
          xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
          xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
   <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
-    <table class="tableClass" width="24" border="42" custom:summary="tableTitle" custom:caption="">
-      <tr class="rowClass1">
-        <th class="headingClass1" xhtml:width="102" custom:valign="top" xhtml:colspan="1" xhtml:rowspan="5" custom:abbr="XSLT" custom:scope="col">
+    <table class="tableClass" width="24" border="42" custom:summary="tableTitle" custom:caption="" custom:table-1="value 1" custom:table-2="value 2">
+      <tr class="rowClass1" custom:row="value 1">
+        <th class="headingClass1" xhtml:width="102" custom:valign="top" xhtml:colspan="1" xhtml:rowspan="5" custom:abbr="XSLT" custom:scope="col" custom:header="value 1">
           <paragraph>11</paragraph>
         </th>
-        <th class="headingClass2" xhtml:width="37%" custom:valign="middle" xhtml:colspan="2" xhtml:rowspan="6" custom:abbr="XSD" custom:scope="row">
+        <th class="headingClass2" xhtml:width="37%" custom:valign="middle" xhtml:colspan="2" xhtml:rowspan="6" custom:abbr="XSD" custom:scope="row" custom:header="value 2">
           <paragraph>12.1</paragraph>
           <paragraph>12.2</paragraph>
         </th>
       </tr>
-      <tr class="rowClass2">
-        <td class="cellClass1" xhtml:width="74%" custom:valign="bottom" xhtml:colspan="3" xhtml:rowspan="7">
+      <tr class="rowClass2" custom:row="value 2">
+        <td class="cellClass1" xhtml:width="74%" custom:valign="bottom" xhtml:colspan="3" xhtml:rowspan="7" custom:column="value 1">
           <paragraph>21</paragraph>
           <paragraph>
             <ul class="itemizedListClass">
@@ -24,7 +24,7 @@
             </ul>
           </paragraph>
         </td>
-        <td class="cellClass2" xhtml:width="38" custom:valign="baseline" xhtml:colspan="4" xhtml:rowspan="8">
+        <td class="cellClass2" xhtml:width="38" custom:valign="baseline" xhtml:colspan="4" xhtml:rowspan="8" custom:column="value 2">
           <paragraph>22</paragraph>
           <paragraph>
             <line>This is a paragraph</line>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/011-htmlTable.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/011-htmlTable.xml
index 631dbb3e..b2446d7f 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/011-htmlTable.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/011-htmlTable.xml
@@ -3,20 +3,20 @@
          xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
          xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
   <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
-    <table class="tableClass" width="24%" border="0" custom:summary="tableTitle" custom:caption="Table caption.">
-      <tr class="rowClass1">
-        <th class="headingClass1" xhtml:width="102" custom:valign="top" xhtml:colspan="1" xhtml:rowspan="5" custom:abbr="XSLT" custom:scope="col">
+    <table class="tableClass" width="24%" border="0" custom:summary="tableTitle" custom:caption="Table caption." custom:table-1="value 1" custom:table-2="value 2">
+      <tr class="rowClass1" custom:row="value 1">
+        <th class="headingClass1" xhtml:width="102" custom:valign="top" xhtml:colspan="1" xhtml:rowspan="5" custom:abbr="XSLT" custom:scope="col" custom:header="value 1">
           <paragraph>11</paragraph>
         </th>
-        <th class="headingClass2" xhtml:width="37%" custom:valign="middle" xhtml:colspan="2" xhtml:rowspan="6" custom:abbr="XSD" custom:scope="row">
+        <th class="headingClass2" xhtml:width="37%" custom:valign="middle" xhtml:colspan="2" xhtml:rowspan="6" custom:abbr="XSD" custom:scope="row" custom:header="value 2">
           <paragraph>12</paragraph>
         </th>
       </tr>
-      <tr class="rowClass2">
-        <td class="cellClass1" xhtml:width="74%" custom:valign="bottom" xhtml:colspan="3" xhtml:rowspan="7">
+      <tr class="rowClass2" custom:row="value 2">
+        <td class="cellClass1" xhtml:width="74%" custom:valign="bottom" xhtml:colspan="3" xhtml:rowspan="7" custom:column="value 1">
           <paragraph>21</paragraph>
         </td>
-        <td class="cellClass2" xhtml:width="38" custom:valign="baseline" xhtml:colspan="4" xhtml:rowspan="8">
+        <td class="cellClass2" xhtml:width="38" custom:valign="baseline" xhtml:colspan="4" xhtml:rowspan="8" custom:column="value 2">
           <paragraph>22</paragraph>
         </td>
       </tr>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
index 5d39db51..341dbd99 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
@@ -21,4 +21,7 @@
     <link object_id="333" xhtml:id="id5" xhtml:title="Content title" class="linkClass5">Content name</link>
   </paragraph>
   <paragraph><anchor name="anchor"/>Some anchored content.</paragraph>
+  <paragraph>
+    <link object_id="333" xhtml:id="id6" custom:name-1="value 1" custom:name-2="value 2">Link with custom attributes</link>
+  </paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/015-subscript.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/015-subscript.xml
index 6bca5d53..568890d8 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/015-subscript.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/015-subscript.xml
@@ -3,4 +3,5 @@
          xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
          xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
   <paragraph>Thirsty? Have some H<custom name="sub">2</custom>O.</paragraph>
+  <paragraph>Thirsty? Have some H<custom name="sub" custom:name-1="value 1" custom:name-2="value 2">2 (custom attribute)</custom>O.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/016-superscript.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/016-superscript.xml
index d5a8badf..0aa03a34 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/016-superscript.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/016-superscript.xml
@@ -3,4 +3,5 @@
          xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
          xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
   <paragraph>The equation e<custom name="sup">πi</custom> + 1 = 0 ties together five of the most important mathematical constants.</paragraph>
+  <paragraph>The equation e<custom name="sup" custom:name-1="value 1" custom:name-2="value 2">πi (custom attributes)</custom> + 1 = 0 ties together five of the most important mathematical constants.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/019-emphasisStrikedthrough.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/019-emphasisStrikedthrough.xml
index 68d3ec5c..7832f60c 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/019-emphasisStrikedthrough.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/019-emphasisStrikedthrough.xml
@@ -6,4 +6,5 @@
     <header>This is a heading.</header>
   </section>
   <paragraph>This is a paragraph with <custom name="strike">strikedthrough</custom> text.</paragraph>
+  <paragraph>This is a paragraph with <custom name="strike" custom:name-1="value 1" custom:name-2="value 2">strikedthrough (custom attributes)</custom> text.</paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/020-blockquote.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/020-blockquote.xml
index 63bc042c..683031d6 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/020-blockquote.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/020-blockquote.xml
@@ -15,4 +15,9 @@
       <paragraph>Don't wake me for the end of the world unless it has very good special effects.</paragraph>
     </custom>
   </paragraph>
+  <paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/">
+    <custom name="quote" custom:name-1="value 1" custom:name-2="value 2">
+      <paragraph>Don't wake me for the end of the world unless it has very good special effects.</paragraph>
+    </custom>
+  </paragraph>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/021-titleImplicitLevels.lossy.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/021-titleImplicitLevels.xml
similarity index 59%
rename from tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/021-titleImplicitLevels.lossy.xml
rename to tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/021-titleImplicitLevels.xml
index 0b30577a..22d0f42e 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/021-titleImplicitLevels.lossy.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/021-titleImplicitLevels.xml
@@ -65,4 +65,53 @@ level attributes in docbook format.
       </section>
     </section>
   </section>
+  <section>
+    <header custom:title-level="1">This is a first level heading.</header>
+  </section>
+  <section>
+    <header custom:title-level="2">This is a second level heading.</header>
+  </section>
+  <section>
+    <section>
+      <header custom:title-level="3">This is a third level heading.</header>
+    </section>
+  </section>
+  <section>
+    <section>
+      <section>
+        <header custom:title-level="4">This is a fourth level heading.</header>
+      </section>
+    </section>
+  </section>
+  <section>
+    <section>
+      <section>
+        <section>
+          <header custom:title-level="5">This is a fifth level heading.</header>
+        </section>
+      </section>
+    </section>
+  </section>
+  <section>
+    <section>
+      <section>
+        <section>
+          <section>
+            <header custom:title-level="6">This is a sixth level heading.</header>
+          </section>
+        </section>
+      </section>
+    </section>
+  </section>
+  <section>
+    <section>
+      <section>
+        <section>
+          <section>
+            <header custom:title-level="7">This is a seventh level heading.</header>
+          </section>
+        </section>
+      </section>
+    </section>
+  </section>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/002-htmlTable.docbook.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/002-htmlTable.docbook.xml
index 3875abf8..dd7e20a2 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/002-htmlTable.docbook.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/002-htmlTable.docbook.xml
@@ -5,21 +5,41 @@
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
   <table class="tableClass" width="24%" title="tableTitle">
+    <ezattribute>
+      <ezvalue key="summary">tableTitle</ezvalue>
+      <ezvalue key="caption">Table caption.</ezvalue>
+    </ezattribute>
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
         <th class="headingClass1" ezxhtml:width="102" valign="top" colspan="1" rowspan="5" abbr="XSLT" scope="col">
+          <ezattribute>
+            <ezvalue key="valign">top</ezvalue>
+            <ezvalue key="abbr">XSLT</ezvalue>
+            <ezvalue key="scope">col</ezvalue>
+          </ezattribute>
           <para>11</para>
         </th>
         <th class="headingClass2" ezxhtml:width="37%" valign="middle" colspan="2" rowspan="6" abbr="XSD" scope="row">
+          <ezattribute>
+            <ezvalue key="valign">middle</ezvalue>
+            <ezvalue key="abbr">XSD</ezvalue>
+            <ezvalue key="scope">row</ezvalue>
+          </ezattribute>
           <para>12</para>
         </th>
       </tr>
       <tr class="rowClass2">
         <td class="cellClass1" ezxhtml:width="74%" valign="bottom" colspan="3" rowspan="7">
+          <ezattribute>
+            <ezvalue key="valign">bottom</ezvalue>
+          </ezattribute>
           <para>21</para>
         </td>
         <td class="cellClass2" ezxhtml:width="38" valign="baseline" colspan="4" rowspan="8">
+          <ezattribute>
+            <ezvalue key="valign">baseline</ezvalue>
+          </ezattribute>
           <para>22</para>
         </td>
       </tr>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/004-tableTitles.docbook.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/004-tableTitles.docbook.xml
index 3f8d9c2c..e09af903 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/004-tableTitles.docbook.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/004-tableTitles.docbook.xml
@@ -8,6 +8,9 @@
   <title ezxhtml:level="2">Heading 2</title>
   <title ezxhtml:level="3">Heading 3</title>
   <informaltable border="1" class="class1" style="border-width:1px;" title="summary1" width="100%">
+    <ezattribute>
+      <ezvalue key="summary">summary1</ezvalue>
+    </ezattribute>
     <tbody>
       <tr>
         <td>
@@ -16,6 +19,9 @@
           <title ezxhtml:level="3">Heading 3</title>
           <title ezxhtml:level="3">Heading 3</title>
           <informaltable border="1" class="class2" style="border-width:1px;" title="summary2" width="100%">
+            <ezattribute>
+              <ezvalue key="summary">summary2</ezvalue>
+            </ezattribute>
             <tbody>
               <tr>
                 <td>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/108-expandTable.docbook.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/108-expandTable.docbook.xml
index 3f8d9c2c..e09af903 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/108-expandTable.docbook.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/lossy/108-expandTable.docbook.xml
@@ -8,6 +8,9 @@
   <title ezxhtml:level="2">Heading 2</title>
   <title ezxhtml:level="3">Heading 3</title>
   <informaltable border="1" class="class1" style="border-width:1px;" title="summary1" width="100%">
+    <ezattribute>
+      <ezvalue key="summary">summary1</ezvalue>
+    </ezattribute>
     <tbody>
       <tr>
         <td>
@@ -16,6 +19,9 @@
           <title ezxhtml:level="3">Heading 3</title>
           <title ezxhtml:level="3">Heading 3</title>
           <informaltable border="1" class="class2" style="border-width:1px;" title="summary2" width="100%">
+            <ezattribute>
+              <ezvalue key="summary">summary2</ezvalue>
+            </ezattribute>
             <tbody>
               <tr>
                 <td>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/083-header-nested.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/083-header-nested.xml
index 6782bab8..69246821 100644
--- a/tests/lib/FieldType/Converter/_fixtures/richtext/output/083-header-nested.xml
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/083-header-nested.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <section xmlns="http://docbook.org/ns/docbook" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0-variant ezpublish-1.0">
   <table>
+    <ezattribute>
+      <ezvalue key="caption">some caption</ezvalue>
+    </ezattribute>
     <caption>some caption</caption>
     <tbody>
       <tr>
@@ -11,6 +14,9 @@
       <tr>
         <td>
           <table>
+            <ezattribute>
+              <ezvalue key="caption">some caption</ezvalue>
+            </ezattribute>
             <caption>some caption</caption>
             <tbody>
               <tr>
@@ -25,6 +31,9 @@
     </tbody>
   </table>
   <table>
+    <ezattribute>
+      <ezvalue key="caption">some caption</ezvalue>
+    </ezattribute>
     <caption>some caption</caption>
     <tbody>
       <tr>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml
index 6782c344..850408ea 100644
--- a/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/090-table.xml
@@ -6,6 +6,10 @@
         xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
     <para>some table</para>
     <table class="default" width="100%" title="custom summary">
+        <ezattribute>
+            <ezvalue key="summary">custom summary</ezvalue>
+            <ezvalue key="caption">custom caption</ezvalue>
+        </ezattribute>
         <caption>custom caption</caption>
         <tbody>
             <tr>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/143-paragraph-temporary-table-oe.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/143-paragraph-temporary-table-oe.xml
index d2cfba8a..ef06329d 100644
--- a/tests/lib/FieldType/Converter/_fixtures/richtext/output/143-paragraph-temporary-table-oe.xml
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/143-paragraph-temporary-table-oe.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
     <table width="100%" title="test table summary">
+        <ezattribute>
+            <ezvalue key="summary">test table summary</ezvalue>
+            <ezvalue key="caption">my caption</ezvalue>
+        </ezattribute>
         <caption>my caption</caption>
         <tbody>
             <tr>
@@ -40,6 +44,10 @@
     </table>
     <title ezxhtml:level="2">Header 1</title>
     <table class="default" width="100%" title="summary2">
+        <ezattribute>
+            <ezvalue key="summary">summary2</ezvalue>
+            <ezvalue key="caption">caption2</ezvalue>
+        </ezattribute>
         <caption>caption2</caption>
         <tbody>
             <tr>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/144-paragraph-temporary-table-simplifiedxml.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/144-paragraph-temporary-table-simplifiedxml.xml
index d2cfba8a..ef06329d 100644
--- a/tests/lib/FieldType/Converter/_fixtures/richtext/output/144-paragraph-temporary-table-simplifiedxml.xml
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/144-paragraph-temporary-table-simplifiedxml.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
     <table width="100%" title="test table summary">
+        <ezattribute>
+            <ezvalue key="summary">test table summary</ezvalue>
+            <ezvalue key="caption">my caption</ezvalue>
+        </ezattribute>
         <caption>my caption</caption>
         <tbody>
             <tr>
@@ -40,6 +44,10 @@
     </table>
     <title ezxhtml:level="2">Header 1</title>
     <table class="default" width="100%" title="summary2">
+        <ezattribute>
+            <ezvalue key="summary">summary2</ezvalue>
+            <ezvalue key="caption">caption2</ezvalue>
+        </ezattribute>
         <caption>caption2</caption>
         <tbody>
             <tr>
diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/150-literal.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/150-literal.xml
index 2082d0d6..ad72905d 100644
--- a/tests/lib/FieldType/Converter/_fixtures/richtext/output/150-literal.xml
+++ b/tests/lib/FieldType/Converter/_fixtures/richtext/output/150-literal.xml
@@ -12,7 +12,7 @@
     return 0;
 }]]></programlisting>
   <para>the php one with language attribute:</para>
-  <programlisting language="php" ezxhtml:class="red">function foobar()
+  <programlisting language="php" ezxhtml:class="red"><ezattribute><ezvalue key="language">php</ezvalue></ezattribute>function foobar()
 {
     thisIsSomePHPCode();
     return 0;