diff --git a/actionview/Rakefile b/actionview/Rakefile
index 8e980df7fc..e98a020f42 100644
--- a/actionview/Rakefile
+++ b/actionview/Rakefile
@@ -7,14 +7,7 @@ task :default => :test
 # Run the unit tests
 
 desc "Run all unit tests"
-task :test => [:test_action_view, :test_active_record_integration]
-
-Rake::TestTask.new(:test_action_view) do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob('test/template/**/*_test.rb').sort
-  t.warning = true
-  t.verbose = true
-end
+task :test => ["test:template", "test:integration:active_record"]
 
 namespace :test do
   task :isolated do
@@ -25,16 +18,20 @@ namespace :test do
 
   Rake::TestTask.new(:template) do |t|
     t.libs << 'test'
-    t.pattern = 'test/template/**/*.rb'
+    t.test_files = Dir.glob('test/template/**/*_test.rb').sort
+    t.warning = true
+    t.verbose = true
   end
-end
 
-desc 'ActiveRecord Integration Tests'
-Rake::TestTask.new(:test_active_record_integration) do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob("test/activerecord/*_test.rb")
-  t.warning = true
-  t.verbose = true
+  namespace :integration do
+    desc 'ActiveRecord Integration Tests'
+    Rake::TestTask.new(:active_record) do |t|
+      t.libs << 'test'
+      t.test_files = Dir.glob("test/activerecord/*_test.rb")
+      t.warning = true
+      t.verbose = true
+    end
+  end
 end
 
 spec = eval(File.read('actionview.gemspec'))