diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index 4d67e0c..d0cd0c4 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,4 +1,16 @@
-task :default => [:test, :cucumber, :selenium]
+Rake::Task[:test].clear
+
+task :test do
+  errors = %w(test:units test:functionals test:integration cucumber selenium).collect do |task|
+    begin
+      Rake::Task[task].invoke
+      nil
+    rescue => e
+      task
+    end
+  end.compact
+  abort "Errors running #{errors.to_sentence}!" if errors.any?
+end
 
 desc 'Runs Seleniun acceptance tests'
 task :selenium do
--
libgit2 0.21.2