diff --git a/Gemfile b/Gemfile
index e07742080..17520b8c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,28 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "rake", "< 11.0" if RUBY_VERSION < '1.9.3'
-
-gem "treetop", "~> 1.4.10"
-gem "mime-types", "~> 1.16"
+gem 'activesupport', '>= 2.3.6' if RUBY_VERSION >= '1.9.3'
+gem 'activesupport', '>= 2.3.6', '< 4.0.0' if RUBY_VERSION < '1.9.3'
 gem "tlsmail" if RUBY_VERSION <= '1.8.6'
+gem "mime-types", "~> 1.16"
+gem "treetop", "~> 1.4.10"
 
 gem 'jruby-openssl', :platform => :jruby
 
 # For gems not required to run tests
 group :local_development, :test do
+  gem 'rake', '> 0.8.7' if RUBY_VERSION >= '1.9.3'
+  gem 'rake', '> 0.8.7', '< 11.0.1' if RUBY_VERSION < '1.9.3'
+  gem 'rdoc', '< 5' if RUBY_VERSION < '1.9'
+  gem "rspec",      "~> 2.8.0"
+  case
+  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    # Skip it
+  when RUBY_PLATFORM == 'java'
+    # Skip it
+  when RUBY_VERSION < '1.9'
+    gem "ruby-debug"
+  else
+    # Skip it
+  end
 end
diff --git a/spec/mail/message_spec.rb b/spec/mail/message_spec.rb
index 5df7dd5bd..1412145bc 100644
--- a/spec/mail/message_spec.rb
+++ b/spec/mail/message_spec.rb
@@ -131,6 +131,10 @@ def basic_email
 
     describe "YAML serialization" do
       before(:each) do
+        # Ensure specs don't randomly fail due to messages being generated 1 second apart
+        time = DateTime.now
+        DateTime.stub(:now).and_return(time)
+
         @yaml_mail = Mail::Message.new(:to => 'someone@somewhere.com',
                                   :cc => 'someoneelse@somewhere.com',
                                   :bcc => 'someonesecret@somewhere.com',