diff --git a/rakefile b/rakefile
index fcc516752..d690a4cfc 100644
--- a/rakefile
+++ b/rakefile
@@ -17,15 +17,15 @@
 @msf_process_id = nil;
 
 desc "Run quick unit tests"
-task :quick_unit_tests do
-  sh "cd test/unit/;ruby ts_beef.rb no_msf"
+task :quick do
+  sh "cd test/unit/;ruby -W0 ts_beef.rb no_msf"
 end
 
 desc "Run all unit tests"
-task :all_unit_tests => ["install", "msf_install"]  do
+task :all => ["install", "msf_install"]  do
   Rake::Task['msf_update'].invoke
   Rake::Task['msf_start'].invoke
-  sh "cd test/unit/;ruby ts_beef.rb"
+  sh "cd test/unit/;ruby -W0 ts_beef.rb"
   Rake::Task['msf_stop'].invoke
 end
 
@@ -34,7 +34,7 @@ task :install do
 end
 
 task :no_msf_tests do
-  sh "cd test/unit/;ruby ts_beef.rb no_msf"
+  sh "cd test/unit/;ruby -W0 ts_beef.rb no_msf"
 end
 
 task :msf_start => 'test/msf-test/msfconsole' do
@@ -65,4 +65,4 @@ file 'test/msf-test/msfconsole' do
   sh "cd test;git clone https://github.com/rapid7/metasploit-framework.git msf-test"
 end
 
-task :default => ["all_unit_tests"]
+task :default => ["quick"]