diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index b9aafea44..c2a7897a0 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -112,7 +112,8 @@ end
 And /^I follow the "([^\"]*)" link from the last sent email$/ do |link_text|
   email_text = Devise.mailer.deliveries.first.body.to_s
   email_text = Devise.mailer.deliveries.first.html_part.body.raw_source if email_text.blank?
-  doc = Nokogiri(email_text)
+  doc = Nokogiri("<div>" + email_text + "</div>")
+
   links = doc.css('a')
   link = links.detect{ |link| link.text == link_text }
   link = links.detect{ |link| link.attributes["href"].value.include?(link_text)} unless link