diff --git a/test/test_tags.rb b/test/test_tags.rb
new file mode 100644
index 00000000..bdf6b858
--- /dev/null
+++ b/test/test_tags.rb
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestTags < Test::Unit::TestCase
+  
+  def setup
+    @content = <<CONTENT
+---
+layout: post
+title: This is a test
+
+---
+This document results in a markdown error with maruku
+{% highlight ruby %}
+puts "hi"
+
+puts "bye"
+{% endhighlight %}
+
+CONTENT
+  end  
+  
+  def test_markdown_with_pygments_line_handling
+    Jekyll.pygments = true
+    
+    result = Liquid::Template.parse(@content).render({}, [Jekyll::Filters])
+    result = Jekyll.markdown_proc.call(result)
+    assert_no_match(/markdown\-html\-error/,result)
+  end
+  
+end