diff --git a/lib/tasks/metrics.rake b/lib/tasks/metrics.rake
new file mode 100644
index 000000000..214cc996e
--- /dev/null
+++ b/lib/tasks/metrics.rake
@@ -0,0 +1,6 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  # Metric-fu not installed
+  # http://metric-fu.rubyforge.org/
+end
diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index da832b3e7..b9e2283af 100644
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -29,48 +29,3 @@ namespace :test do
     end
   end
 end
-
-### Inspired by http://blog.labratz.net/articles/2006/12/2/a-rake-task-for-rcov
-begin
-  require 'rcov/rcovtask'
-
-  rcov_options = "--rails --aggregate test/coverage.data --exclude '/gems/'"
-
-  namespace :test do 
-    desc "Aggregate code coverage for all tests"
-    Rcov::RcovTask.new('coverage') do |t|
-      t.libs << 'test'
-      t.test_files = FileList['test/{unit,integration,functional}/*_test.rb']
-      t.verbose = true
-      t.rcov_opts << rcov_options
-    end
-
-    namespace :coverage do
-      desc "Delete coverage test data"
-      task :clean do
-        rm_f "test/coverage.data"
-        rm_rf "test/coverage"
-      end
-
-      desc "Aggregate code coverage for all tests with HTML output"
-      Rcov::RcovTask.new('html') do |t|
-        t.libs << 'test'
-        t.test_files = FileList['test/{unit,integration,functional}/*_test.rb']
-        t.output_dir = "test/coverage"
-        t.verbose = true
-        t.rcov_opts << rcov_options
-      end
-    
-      desc "Open the HTML coverage report"
-      task :show_results do
-        system "open test/coverage/index.html"
-      end
-
-      task :full => "test:coverage:clean"
-      task :full => "test:coverage:html"
-      task :full => "test:coverage:show_results"
-    end
-  end
-rescue LoadError
-  # rcov not available
-end