diff --git a/lib/spring/test/application.rb b/lib/spring/test/application.rb
index b174dd33..9a00618e 100644
--- a/lib/spring/test/application.rb
+++ b/lib/spring/test/application.rb
@@ -3,7 +3,7 @@
 module Spring
   module Test
     class Application
-      DEFAULT_TIMEOUT = ENV['CI'] ? 30 : 10
+      DEFAULT_TIMEOUT = ENV['CI'] ? 300 : 10
 
       attr_reader :root, :spring_env
 
diff --git a/lib/spring/test/application_generator.rb b/lib/spring/test/application_generator.rb
index 7a5ac70e..6565a215 100644
--- a/lib/spring/test/application_generator.rb
+++ b/lib/spring/test/application_generator.rb
@@ -97,6 +97,10 @@ def install_spring
           append_to_file(application.gemfile, "gem 'nokogiri', '~> 1.6.8'")
         end
 
+        if RUBY_VERSION < "1.9"
+          append_to_file(application.gemfile, "gem 'rake', '12.2.1'")
+        end
+
         application.bundle
 
         FileUtils.rm_rf application.path("bin")