diff --git a/src/bundle/Resources/views/RichText/embed/content.html.twig b/src/bundle/Resources/views/RichText/embed/content.html.twig
index 918f61f5..b25f77c1 100644
--- a/src/bundle/Resources/views/RichText/embed/content.html.twig
+++ b/src/bundle/Resources/views/RichText/embed/content.html.twig
@@ -5,7 +5,8 @@
 {% if embedParams.link is defined  %}
     {% set params = params|merge( { "linkParameters": embedParams.link } ) %}
 {% endif %}
-<div class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
+
+<div {% if embedParams.anchor is defined %}id="{{ embedParams.anchor }}"{% endif %} class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
     {{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
     {{
         render(
diff --git a/src/bundle/Resources/views/RichText/embed/location.html.twig b/src/bundle/Resources/views/RichText/embed/location.html.twig
index 93ed0199..368e2448 100644
--- a/src/bundle/Resources/views/RichText/embed/location.html.twig
+++ b/src/bundle/Resources/views/RichText/embed/location.html.twig
@@ -5,7 +5,8 @@
 {% if embedParams.link is defined  %}
     {% set params = params|merge( { "linkParameters": embedParams.link } ) %}
 {% endif %}
-<div class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
+
+<div {% if embedParams.anchor is defined %}id="{{ embedParams.anchor }}"{% endif %} class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
     {{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
     {{
         render(
diff --git a/src/lib/eZ/RichText/Converter/Render/Embed.php b/src/lib/eZ/RichText/Converter/Render/Embed.php
index 41c50859..8ab02ce4 100644
--- a/src/lib/eZ/RichText/Converter/Render/Embed.php
+++ b/src/lib/eZ/RichText/Converter/Render/Embed.php
@@ -122,6 +122,7 @@ protected function extractParameters(DOMElement $embed, $tagName)
 
         $class = $embed->getAttribute('ezxhtml:class');
         $align = $embed->getAttribute('ezxhtml:align');
+        $anchor = $embed->getAttribute('xml:id');
         $linkParameters = $this->extractLinkParameters($embed);
         $configuration = $this->extractConfiguration($embed);
 
@@ -130,6 +131,10 @@ protected function extractParameters(DOMElement $embed, $tagName)
             'viewType' => $viewType,
         ];
 
+        if (!empty($anchor)) {
+            $parameters['anchor'] = $anchor;
+        }
+
         if (!empty($class)) {
             $parameters['class'] = $class;
         }
diff --git a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
index bd43cef7..0b4631b7 100644
--- a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
+++ b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
@@ -26,6 +26,11 @@
 
   <xsl:template match="docbook:para">
     <xsl:element name="p" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -42,6 +47,11 @@
 
   <xsl:template match="docbook:programlisting">
     <xsl:element name="pre" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -235,6 +245,11 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:element name="{$headingTag}" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -251,6 +266,11 @@
 
   <xsl:template match="docbook:orderedlist">
     <xsl:element name="ol" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -262,6 +282,11 @@
 
   <xsl:template match="docbook:itemizedlist">
     <xsl:element name="ul" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -284,6 +309,11 @@
 
   <xsl:template match="docbook:table | docbook:informaltable">
     <xsl:element name="table" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="class">
           <xsl:value-of select="@class"/>
diff --git a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl
index a9b98f4c..4c6c1cee 100644
--- a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl
+++ b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl
@@ -20,6 +20,11 @@
 
   <xsl:template match="docbook:programlisting">
     <xsl:element name="pre" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -43,6 +48,11 @@
 
   <xsl:template match="docbook:para">
     <xsl:element name="p" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -247,6 +257,11 @@
           <xsl:value-of select="@ezxhtml:class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:textalign">
         <xsl:attribute name="style">
           <xsl:value-of select="concat( 'text-align:', @ezxhtml:textalign, ';' )"/>
@@ -258,6 +273,11 @@
 
   <xsl:template match="docbook:orderedlist">
     <xsl:element name="ol" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -269,6 +289,11 @@
 
   <xsl:template match="docbook:itemizedlist">
     <xsl:element name="ul" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@ezxhtml:class">
         <xsl:attribute name="class">
           <xsl:value-of select="@ezxhtml:class"/>
@@ -291,6 +316,11 @@
 
   <xsl:template match="docbook:table | docbook:informaltable">
     <xsl:element name="table" namespace="{$outputNamespace}">
+      <xsl:if test="@xml:id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@xml:id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="class">
           <xsl:value-of select="@class"/>
diff --git a/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl b/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
index 8570f452..93c2761a 100644
--- a/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
+++ b/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
@@ -48,6 +48,11 @@
 
   <xsl:template match="ezxhtml5:p">
     <para>
+      <xsl:if test="@id">
+        <xsl:attribute name="xml:id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="ezxhtml:class">
           <xsl:value-of select="@class"/>
@@ -90,6 +95,11 @@
 
   <xsl:template match="ezxhtml5:pre">
     <xsl:element name="programlisting">
+      <xsl:if test="@id">
+        <xsl:attribute name="xml:id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="ezxhtml:class">
           <xsl:value-of select="@class"/>
@@ -247,6 +257,11 @@
           <xsl:value-of select="@class"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:if test="@id">
+        <xsl:attribute name="xml:id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="contains( @style, 'text-align:' )">
         <xsl:variable name="textAlign">
           <xsl:call-template name="extractStyleValue">
@@ -266,6 +281,11 @@
 
   <xsl:template match="ezxhtml5:ol">
     <orderedlist>
+      <xsl:if test="@id">
+        <xsl:attribute name="xml:id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="ezxhtml:class">
           <xsl:value-of select="@class"/>
@@ -277,6 +297,11 @@
 
   <xsl:template match="ezxhtml5:ul">
     <itemizedlist>
+      <xsl:if test="@id">
+        <xsl:attribute name="xml:id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="ezxhtml:class">
           <xsl:value-of select="@class"/>
@@ -311,6 +336,11 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:element name="{$tablename}" namespace="http://docbook.org/ns/docbook">
+      <xsl:if test="@id">
+        <xsl:attribute name="xml:id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="@class">
         <xsl:attribute name="class">
           <xsl:value-of select="@class"/>
diff --git a/tests/lib/eZ/RichText/Converter/Render/EmbedTest.php b/tests/lib/eZ/RichText/Converter/Render/EmbedTest.php
index 9146d38e..f7b0df76 100644
--- a/tests/lib/eZ/RichText/Converter/Render/EmbedTest.php
+++ b/tests/lib/eZ/RichText/Converter/Render/EmbedTest.php
@@ -87,6 +87,7 @@ public function providerForTestConvert()
                             ],
                             'class' => 'embed-class',
                             'align' => 'left',
+                            'anchor' => 'embed-id-1',
                         ],
                     ],
                 ],
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/002-para.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/002-para.xml
index d717b1d5..e1c83208 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/002-para.xml
+++ b/tests/lib/eZ/RichText/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 xml:id="para-id">This is a paragraph with id</para>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/008-orderedList.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/008-orderedList.xml
index 8e9d8ae8..8acdc7b6 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/008-orderedList.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/008-orderedList.xml
@@ -4,7 +4,7 @@
          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">
-  <orderedlist ezxhtml:class="orderedListClass">
+  <orderedlist xml:id="orderedlist-id" ezxhtml:class="orderedListClass">
     <listitem ezxhtml:class="listItemClass"><para>This is a list item.</para></listitem>
   </orderedlist>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml
index 11559d6a..a87817ed 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/009-itemizedList.xml
@@ -4,7 +4,7 @@
          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">
-  <itemizedlist ezxhtml:class="itemizedListClass">
+  <itemizedlist xml:id="itemizedlist-id" ezxhtml:class="itemizedListClass">
     <listitem ezxhtml:class="listItemClass"><para>This is a list item.</para></listitem>
   </itemizedlist>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml
index 01cd6f14..793a12c4 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/010-htmlInformaltable.xml
@@ -4,7 +4,7 @@
          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">
-  <informaltable class="tableClass" width="24" title="tableTitle" border="1" style="border-width:42px;">
+  <informaltable xml:id="informaltable-id" class="tableClass" width="24" title="tableTitle" border="1" style="border-width:42px;">
     <tbody>
       <tr class="rowClass1">
         <th class="headingClass1" ezxhtml:width="102" valign="top" colspan="1" rowspan="5" abbr="XSLT" scope="col">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml
index 3875abf8..362d3323 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/011-htmlTable.xml
@@ -4,7 +4,7 @@
          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 class="tableClass" width="24%" title="tableTitle">
+  <table xml:id="table-id" class="tableClass" width="24%" title="tableTitle">
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/033-programlisting.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/033-programlisting.xml
index 0e8f4e6e..44b852be 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/033-programlisting.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/033-programlisting.xml
@@ -17,4 +17,5 @@
     thisIsSomePHPCode();
     return 0;
 }</programlisting>
+    <programlisting xml:id="programlisting-id"><![CDATA[Literal with CNAME end sequence here : ]]]]><![CDATA[> and some more text here]]></programlisting>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/002-para.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/002-para.xml
index 7650b233..66524b6b 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/002-para.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/002-para.xml
@@ -6,4 +6,5 @@
   <p style="text-align:center;">This is a centered paragraph.</p>
   <p style="text-align:right;">This is a right aligned paragraph.</p>
   <p style="text-align:justify;">This is a justified paragraph.</p>
+  <p id="para-id">This is a paragraph with id</p>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/008-orderedList.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/008-orderedList.xml
index 5242b7f1..d2241c1f 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/008-orderedList.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/008-orderedList.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-  <ol class="orderedListClass">
+  <ol id="orderedlist-id" class="orderedListClass">
     <li class="listItemClass">This is a list item.</li>
   </ol>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/009-itemizedList.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/009-itemizedList.xml
index 075ab479..832bec2a 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/009-itemizedList.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/009-itemizedList.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-  <ul class="itemizedListClass">
+  <ul id="itemizedlist-id" class="itemizedListClass">
     <li class="listItemClass">This is a list item.</li>
   </ul>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/010-htmlInformaltable.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/010-htmlInformaltable.xml
index 3c32cf24..7eb5442b 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/010-htmlInformaltable.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/010-htmlInformaltable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-  <table class="tableClass" border="1" title="tableTitle" style="width:24px;border-width:42px;">
+  <table id="informaltable-id" class="tableClass" border="1" title="tableTitle" style="width:24px;border-width:42px;">
     <tbody>
       <tr class="rowClass1">
         <th class="headingClass1" colspan="1" rowspan="5" abbr="XSLT" scope="col" style="width:102px;vertical-align:top;">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/011-htmlTable.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/011-htmlTable.xml
index c661a7d6..b7db0ece 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/011-htmlTable.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/011-htmlTable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-  <table class="tableClass" title="tableTitle" style="width:24%;">
+  <table id="table-id" class="tableClass" title="tableTitle" style="width:24%;">
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/033-programlisting.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/033-programlisting.xml
index 4de9a8a5..7c8eb4fb 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/033-programlisting.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/033-programlisting.xml
@@ -18,4 +18,5 @@
     thisIsSomePHPCode();
     return 0;
 }</pre>
+  <pre id="programlisting-id">Literal with CNAME end sequence here : ]]&gt; and some more text here</pre>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/002-para.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/002-para.xml
index fa242002..f139ec59 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/002-para.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/002-para.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5">
-  <h2>This is a heading.</h2>
-  <p class="paraClass">This is a paragraph.</p>
-  <p class="paraClass2" style="text-align:left;">This is a left aligned paragraph.</p>
-  <p style="text-align:center;">This is a centered paragraph.</p>
-  <p style="text-align:right;">This is a right aligned paragraph.</p>
-  <p style="text-align:justify;">This is a justified paragraph.</p>
+    <h2>This is a heading.</h2>
+    <p class="paraClass">This is a paragraph.</p>
+    <p class="paraClass2" style="text-align:left;">This is a left aligned paragraph.</p>
+    <p style="text-align:center;">This is a centered paragraph.</p>
+    <p style="text-align:right;">This is a right aligned paragraph.</p>
+    <p style="text-align:justify;">This is a justified paragraph.</p>
+    <p id="para-id">This is a paragraph with id</p>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/008-orderedList.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/008-orderedList.xml
index 020cab1e..a8717e20 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/008-orderedList.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/008-orderedList.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5">
-  <ol class="orderedListClass">
+  <ol id="orderedlist-id" class="orderedListClass">
     <li class="listItemClass">This is a list item.</li>
   </ol>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/009-itemizedList.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/009-itemizedList.xml
index 4e16208e..52fd7485 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/009-itemizedList.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/009-itemizedList.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5">
-  <ul class="itemizedListClass">
+  <ul id="itemizedlist-id" class="itemizedListClass">
     <li class="listItemClass">This is a list item.</li>
   </ul>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/010-htmlInformaltable.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/010-htmlInformaltable.xml
index 4a595668..e9dfa97a 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/010-htmlInformaltable.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/010-htmlInformaltable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5">
-  <table class="tableClass" border="1" title="tableTitle" style="width:24px;border-width:42px;">
+  <table id="informaltable-id" class="tableClass" border="1" title="tableTitle" style="width:24px;border-width:42px;">
     <tbody>
       <tr class="rowClass1">
         <th class="headingClass1" colspan="1" rowspan="5" abbr="XSLT" scope="col" style="width:102px;vertical-align:top;">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/011-htmlTable.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/011-htmlTable.xml
index 64385b79..78525d93 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/011-htmlTable.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/011-htmlTable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5">
-  <table class="tableClass" title="tableTitle" style="width:24%;">
+  <table id="table-id" class="tableClass" title="tableTitle" style="width:24%;">
     <caption>Table caption.</caption>
     <tbody>
       <tr class="rowClass1">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/033-programlisting.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/033-programlisting.xml
index 245340a4..4c740349 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/033-programlisting.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/output/033-programlisting.xml
@@ -18,4 +18,5 @@
     thisIsSomePHPCode();
     return 0;
 }</pre>
+  <pre id="programlisting-id">Literal with CNAME end sequence here : ]]&gt; and some more text here</pre>
 </section>