diff --git a/phpdotnet/phd/Package/Generic/XHTML.php b/phpdotnet/phd/Package/Generic/XHTML.php
index 0b5fb7fd..6b84ce8b 100644
--- a/phpdotnet/phd/Package/Generic/XHTML.php
+++ b/phpdotnet/phd/Package/Generic/XHTML.php
@@ -294,8 +294,6 @@ abstract class Package_Generic_XHTML extends Format_Abstract_XHTML {
         'simplesect'            => 'div',
         'simpara'               => array(
             /* DEFAULT */          'p',
-            'note'              => 'span',
-            'listitem'          => 'span',
             'entry'             => 'span',
             'example'           => 'format_example_content',
         ),
diff --git a/tests/package/generic/003.phpt b/tests/package/generic/003.phpt
index 3143628f..bafdc1c4 100644
--- a/tests/package/generic/003.phpt
+++ b/tests/package/generic/003.phpt
@@ -191,29 +191,29 @@ Content:
      <td rowspan="2" style="vertical-align: middle;">
       <ul class="itemizedlist">
        <li class="listitem">
-        <span class="simpara">
+        <p class="simpara">
           Returns 0 if parentheses surround the quantity and currency_symbol.
-        </span>
+        </p>
        </li>
        <li class="listitem">
-        <span class="simpara">
+        <p class="simpara">
          Returns 1 if the sign string precedes the quantity and currency_symbol.
-        </span>
+        </p>
        </li>
        <li class="listitem">
-        <span class="simpara">
+        <p class="simpara">
          Returns 2 if the sign string follows the quantity and currency_symbol.
-        </span>
+        </p>
        </li>
        <li class="listitem">
-        <span class="simpara">
+        <p class="simpara">
          Returns 3 if the sign string immediately precedes the currency_symbol.
-        </span>
+        </p>
        </li>
        <li class="listitem">
-        <span class="simpara">
+        <p class="simpara">
          Returns 4 if the sign string immediately follows the currency_symbol.
-        </span>
+        </p>
        </li>
       </ul>
      </td>
diff --git a/tests/package/php/class_rendering_001.phpt b/tests/package/php/class_rendering_001.phpt
index 0448efcf..895d6fc9 100644
--- a/tests/package/php/class_rendering_001.phpt
+++ b/tests/package/php/class_rendering_001.phpt
@@ -116,9 +116,9 @@ Content:
     
      <dt id="classname.constants.first-constant"><strong><code>ClassName::FIRST_CONSTANT</code></strong></dt>
      <dd>
-      <span class="simpara">
+      <p class="simpara">
        The description of the class constant.
-      </span>
+      </p>
      </dd>
     
    </dl>
diff --git a/tests/package/php/class_rendering_002.phpt b/tests/package/php/class_rendering_002.phpt
index 302dbe6f..c50dd41d 100644
--- a/tests/package/php/class_rendering_002.phpt
+++ b/tests/package/php/class_rendering_002.phpt
@@ -116,9 +116,9 @@ Content:
     
      <dt id="classname.constants.first-constant"><strong><code>ClassName::FIRST_CONSTANT</code></strong></dt>
      <dd>
-      <span class="simpara">
+      <p class="simpara">
        The description of the class constant.
-      </span>
+      </p>
      </dd>
     
    </dl>
diff --git a/tests/package/php/variablelist_rendering_001.phpt b/tests/package/php/variablelist_rendering_001.phpt
index 4f4d45d8..7eb07269 100644
--- a/tests/package/php/variablelist_rendering_001.phpt
+++ b/tests/package/php/variablelist_rendering_001.phpt
@@ -26,9 +26,9 @@ Content:
    
     <dt id="constant.variablelist-test-constant"><strong><code>VARIABLELIST_TEST_CONSTANT</code></strong></dt>
     <dd>
-     <span class="simpara">
+     <p class="simpara">
       Description of constant
-     </span>
+     </p>
     </dd>
    
   </dl>
@@ -44,17 +44,17 @@ Content:
    <tr>
     <td id="constant.variablelist-test-constant-in-constant-list"><strong><code>VARIABLELIST_TEST_CONSTANT_IN_CONSTANT_LIST</code></strong></td>
     <td>
-     <span class="simpara">
+     <p class="simpara">
       <code class="literal">literal</code> will add its own &quot;role&quot;
-     </span>
+     </p>
     </td>
    </tr>
    <tr>
     <td id="constant.variablelist-test-constant-in-constant-list2"><strong><code>VARIABLELIST_TEST_CONSTANT_IN_CONSTANT_LIST2</code></strong></td>
     <td>
-     <span class="simpara">
+     <p class="simpara">
       Role should have not been overwritten by literal
-     </span>
+     </p>
     </td>
    </tr>
   </table>