diff --git a/Gemfile b/Gemfile
index c6ca5e84f..980fef30b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ group :development, :test do
   gem "vcr"
   gem "webmock"
   gem "timecop"
-  gem "coveralls"
+  gem "coveralls", require: false
   gem "rspec-rails"
   gem "dotenv-rails"
   gem "database_cleaner"
diff --git a/Rakefile b/Rakefile
index e85f91391..abf35c9d0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,5 +2,9 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require_relative 'config/application'
+require 'coveralls/rake/task'
 
 Rails.application.load_tasks
+Coveralls::RakeTask.new
+
+task :default => [:spec, :features, 'coveralls:push']
\ No newline at end of file
diff --git a/features/support/env.rb b/features/support/env.rb
index 64ddf6108..deff5cb65 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear_merged!('rails')
+
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
 # It is recommended to regenerate this file in the future when you upgrade to a
 # newer version of cucumber-rails. Consider adding your own code to a new file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d697b5e53..c5a218282 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,10 +19,10 @@
 
 require 'vcr'
 require 'timecop'
-require 'coveralls'
 require 'database_cleaner'
 
-Coveralls.wear!
+require 'coveralls'
+Coveralls.wear_merged!('rails')
 
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures/cassettes'