diff --git a/middleman-more/features/markdown_redcarpet_in_haml.feature b/middleman-more/features/markdown_redcarpet_in_haml.feature
new file mode 100644
index 00000000..1f40ecb7
--- /dev/null
+++ b/middleman-more/features/markdown_redcarpet_in_haml.feature
@@ -0,0 +1,42 @@
+@nojava
+Feature: Markdown support in Haml
+  In order to test support of the Haml markdown filter
+
+  Scenario: Markdown filter in Haml works
+    Given a fixture app "markdown-in-haml-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :directory_indexes
+      """
+    And a file named "source/markdown_filter.html.haml" with:
+      """
+      :markdown
+        # H1
+
+        paragraph
+      """
+    Given the Server is running at "markdown-in-haml-app"
+    When I go to "/markdown_filter/"
+    Then I should see "<h1>H1</h1>"
+    Then I should see "<p>paragraph</p>"
+
+
+  Scenario: Markdown filter in Haml uses our link_to and image_tag helpers
+    Given a fixture app "markdown-in-haml-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :directory_indexes
+      """
+    And a file named "source/link_and_image.html.haml" with:
+      """
+      :markdown
+        [A link](/link_target.html)
+
+        ![image](blank.gif)
+      """
+    Given the Server is running at "markdown-in-haml-app"
+    When I go to "/link_and_image/"
+    Then I should see "/link_target/"
+    Then I should see 'src="/images/blank.gif"'
diff --git a/middleman-more/fixtures/markdown-in-haml-app/config.rb b/middleman-more/fixtures/markdown-in-haml-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-more/fixtures/markdown-in-haml-app/source/images/blank.gif b/middleman-more/fixtures/markdown-in-haml-app/source/images/blank.gif
new file mode 100755
index 00000000..2498f1aa
Binary files /dev/null and b/middleman-more/fixtures/markdown-in-haml-app/source/images/blank.gif differ
diff --git a/middleman-more/fixtures/markdown-in-haml-app/source/link_target.html.markdown b/middleman-more/fixtures/markdown-in-haml-app/source/link_target.html.markdown
new file mode 100755
index 00000000..4f970c47
--- /dev/null
+++ b/middleman-more/fixtures/markdown-in-haml-app/source/link_target.html.markdown
@@ -0,0 +1,4 @@
+---
+layout: false
+---
+Hello World
\ No newline at end of file