diff --git a/rakefile.rb b/rakefile.rb
index c0a5ad9..b3ad09c 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -19,7 +19,7 @@ task :app do
   build_application('Main')
 end
 
-namespace :tests do
+namespace :test do
 
   desc "Run unit and system tests"
   task :all => [:clean, :units, :system, :app]
@@ -36,4 +36,16 @@ namespace :tests do
     report_summary
   end
   
+  get_unit_test_files.each do |test_file|
+    file_name = File.basename(test_file)
+    module_name = file_name.sub(/Test/,'')
+    task file_name do
+      run_systests(test_file)
+    end
+    desc "Test #{module_name}"
+    task module_name do
+      run_systests(test_file)
+    end
+  end
+  
 end
\ No newline at end of file