diff --git a/middleman-core/features/helpers_select_tag.feature b/middleman-core/features/helpers_select_tag.feature
index 54bf1e54..fff51c74 100644
--- a/middleman-core/features/helpers_select_tag.feature
+++ b/middleman-core/features/helpers_select_tag.feature
@@ -9,11 +9,9 @@ Feature: select_tag helper
"""
And the Server is running at "indexable-app"
When I go to "/select_tag.html"
- Then I should see:
- """
-
- """
+ Then I should see ''
diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb
index 8eb3a868..fc75a4e8 100644
--- a/middleman-core/lib/middleman-core/renderers/haml.rb
+++ b/middleman-core/lib/middleman-core/renderers/haml.rb
@@ -1,6 +1,9 @@
# Require gem
require 'haml'
+# Require padrino-helpers now so that we get a chance to replace their renderer with ours in Tilt.
+require 'padrino-helpers'
+
module SafeTemplate
def render(*)
super.html_safe
@@ -41,7 +44,7 @@ module Middleman
class << self
# Once registered
def registered(_)
- ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, 'haml')
+ ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
# Add haml helpers to context
::Middleman::TemplateContext.send :include, ::Haml::Helpers