diff --git a/test/test_helper.rb b/test/test_helper.rb
index 183015216..8bdbb3dcc 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,7 +5,7 @@ require 'cache'
 require 'simplecov'
 require 'simplecov-rcov'
 require 'coveralls'
-Coveralls.wear!('rails')
+Coveralls.wear!
 
 #ActiveSupport::TestCase.test_order = :sorted
 
@@ -20,6 +20,7 @@ class ActiveSupport::TestCase
     SimpleCov::Formatter::RcovFormatter,
     Coveralls::SimpleCov::Formatter
   ]
+  merge_timeout = 3600
   SimpleCov.start
   fixtures :all