diff --git a/Rakefile b/Rakefile
index 78902b3d..c447182f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,9 +55,8 @@ end
 
 desc "Generate RCov test coverage and open in your browser"
 task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
+  ENV['COVERAGE'] = 'true'
+  Rake::Task['test'].invoke
   sh "open coverage/index.html"
 end
 
diff --git a/god.gemspec b/god.gemspec
index 402d285e..1df2980e 100644
--- a/god.gemspec
+++ b/god.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('prowly', '~> 0.3')
   s.add_development_dependency('xmpp4r', '~> 0.5')
   s.add_development_dependency('dike', '~> 0.0.3')
- # s.add_development_dependency('rcov', '~> 0.9')
+  s.add_development_dependency('simplecov', '~> 0.9.1')
   s.add_development_dependency('daemons', '~> 1.1')
   s.add_development_dependency('mocha', '~> 0.10')
   s.add_development_dependency('gollum', '~> 1.3.1')
diff --git a/test/helper.rb b/test/helper.rb
index 44878157..c4bd6b45 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,3 +1,8 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 $:.unshift File.expand_path('../../lib', __FILE__) # For use/testing when no gem is installed
 
 # Use this flag to actually load all of the god infrastructure