diff --git a/gemfiles/Gemfile.legacy b/gemfiles/Gemfile.legacy
index f937265..aa42134 100644
--- a/gemfiles/Gemfile.legacy
+++ b/gemfiles/Gemfile.legacy
@@ -10,7 +10,9 @@ group :test do
   gem 'rspec-its', '~> 1.2'
   gem 'fakeweb', :git => 'https://github.com/chrisk/fakeweb.git'
   gem 'fakeweb-matcher'
+  gem 'mail', '~> 2.7.0'
   gem 'mime-types', '~> 1.25.1'
+  gem 'mini_mime', '< 1.1.4'
   gem 'activesupport', '~> 3.2.0'
   gem 'i18n', '~> 0.6.0'
   gem 'yajl-ruby', '~> 1.0', '< 1.4.0', :platforms => [:mingw, :mswin, :ruby]
diff --git a/postmark.gemspec b/postmark.gemspec
index 4e6bb01..4cbeb5c 100644
--- a/postmark.gemspec
+++ b/postmark.gemspec
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
 
-  s.add_development_dependency "mail", "~> 2.7.0" # https://github.com/mikel/mail/pull/1539
-  s.add_development_dependency "mini_mime", "< 1.1.4"
+  s.add_development_dependency "mail"
   s.add_development_dependency "rake"
 end
diff --git a/spec/unit/postmark/mail_message_converter_spec.rb b/spec/unit/postmark/mail_message_converter_spec.rb
index 031c530..cae9ee4 100644
--- a/spec/unit/postmark/mail_message_converter_spec.rb
+++ b/spec/unit/postmark/mail_message_converter_spec.rb
@@ -118,8 +118,8 @@
       from "sheldon@bigbangtheory.com"
       to "lenard@bigbangtheory.com"
       subject "Hello!"
-      body "Hello Sheldon!"
       add_file empty_gif_path
+      body "Hello Sheldon!"
     end
   end