diff --git a/PHP Markdown Extra.mdtest/Fenced Code Blocks.text b/PHP Markdown Extra.mdtest/Fenced Code Blocks.text
index 07dd3f0..bd7956b 100644
--- a/PHP Markdown Extra.mdtest/Fenced Code Blocks.text	
+++ b/PHP Markdown Extra.mdtest/Fenced Code Blocks.text	
@@ -85,3 +85,31 @@ Indented code block of a fenced code block:
     ~~~
 	haha!
 	~~~
+
+With class:
+  
+~~~~~html
+<b>bold</b>
+~~~~~
+  
+~~~~~ html
+<b>bold</b>
+~~~~~
+  
+~~~~~.html
+<b>bold</b>
+~~~~~
+  
+~~~~~ .html
+<b>bold</b>
+~~~~~
+
+With extra attribute block:
+
+~~~~~{.html}
+<b>bold</b>
+~~~~~
+  
+~~~~~ {.html #codeid}
+<b>bold</b>
+~~~~~
diff --git a/PHP Markdown Extra.mdtest/Fenced Code Blocks.xhtml b/PHP Markdown Extra.mdtest/Fenced Code Blocks.xhtml
index 58c01ae..685ea81 100644
--- a/PHP Markdown Extra.mdtest/Fenced Code Blocks.xhtml	
+++ b/PHP Markdown Extra.mdtest/Fenced Code Blocks.xhtml	
@@ -79,3 +79,25 @@ LD_PRELOAD=libusb-driver.so $0.bin $*
 haha!
 ~~~
 </code></pre>
+  
+<p>With class:</p>
+  
+<pre><code class="html">&lt;b>bold&lt;/b>
+</code></pre>
+  
+<pre><code class="html">&lt;b>bold&lt;/b>
+</code></pre>
+  
+<pre><code class="html">&lt;b>bold&lt;/b>
+</code></pre>
+  
+<pre><code class="html">&lt;b>bold&lt;/b>
+</code></pre>
+
+<p>With extra attribute block:</p>
+  
+<pre><code class="html">&lt;b>bold&lt;/b>
+</code></pre>
+  
+<pre><code class="html" id="codeid">&lt;b>bold&lt;/b>
+</code></pre>