diff --git a/app/views/spree/shipment_mailer/shipped_email.html.haml b/app/views/spree/shipment_mailer/shipped_email.html.haml
new file mode 100644
index 0000000000..96aa8403db
--- /dev/null
+++ b/app/views/spree/shipment_mailer/shipped_email.html.haml
@@ -0,0 +1,19 @@
+= Spree.t('shipment_mailer.shipped_email.dear_customer')
+
+= Spree.t('shipment_mailer.shipped_email.instructions')
+
+= "============================================================"
+= Spree.t('shipment_mailer.shipped_email.shipment_summary')
+= "============================================================"
+- @shipment.manifest.each do |item|
+  = item.variant.sku
+  = item.variant.product.name
+  = item.variant.options_text
+= "============================================================"
+
+- if @shipment.tracking
+  = Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking)
+- if @shipment.tracking_url
+  = Spree.t('shipment_mailer.shipped_email.track_link', url: @shipment.tracking_url)
+
+= Spree.t('shipment_mailer.shipped_email.thanks')
diff --git a/app/views/spree/shipment_mailer/shipped_email.text.erb b/app/views/spree/shipment_mailer/shipped_email.text.erb
deleted file mode 100644
index 425df7aef2..0000000000
--- a/app/views/spree/shipment_mailer/shipped_email.text.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
-
-<%= Spree.t('shipment_mailer.shipped_email.instructions') %>
-
-============================================================
-<%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
-============================================================
-<% @shipment.manifest.each do |item| %>
-  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
-<% end %>
-============================================================
-
-<%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
-<%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
-
-<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
diff --git a/app/views/spree/test_mailer/test_email.html.haml b/app/views/spree/test_mailer/test_email.html.haml
new file mode 100644
index 0000000000..024e6cab4c
--- /dev/null
+++ b/app/views/spree/test_mailer/test_email.html.haml
@@ -0,0 +1,4 @@
+= t('test_mailer.test_email.greeting')
+= "================"
+
+= t('test_mailer.test_email.message')
diff --git a/app/views/spree/test_mailer/test_email.text.erb b/app/views/spree/test_mailer/test_email.text.erb
deleted file mode 100644
index 9944b6faef..0000000000
--- a/app/views/spree/test_mailer/test_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= t('test_mailer.test_email.greeting') %>
-================
-
-<%= t('test_mailer.test_email.message') %>