diff --git a/Rakefile b/Rakefile
index bfa55ec..17d0ecc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,7 @@ require 'rake/testtask'
 
 task :default => ["display:notice"]
 
-ADAPTERS = %w(mysql postgresql sqlite3 oracle)
+ADAPTERS = %w(mysql postgresql sqlite3)
 
 namespace :display do
   task :notice do
@@ -12,18 +12,11 @@ namespace :display do
   end
 end
 
-desc "Runs generic database tests."
-Rake::TestTask.new("test") { |t|
-  t.test_files = FileList["test/*_test.rb", "test/#{ENV['ARE_DB']}/**/*_test.rb"]
-}
-
 ADAPTERS.each do |adapter|
   namespace :test do
-    desc "Runs unit tests for #{adapter} specific functionality"
-    task adapter do
-      ENV["ARE_DB"] = adapter
-      exec "rake test"
-      # exec replaces the current process, never gets here
+    desc "Runs #{adapter} database tests."
+    Rake::TestTask.new(adapter) do |t|
+      t.test_files = FileList["test/adapters/#{adapter}.rb", "test/*_test.rb", "test/#{adapter}/**/*_test.rb"]
     end
   end
 end
diff --git a/test/adapters/mysql.rb b/test/adapters/mysql.rb
new file mode 100644
index 0000000..59777b6
--- /dev/null
+++ b/test/adapters/mysql.rb
@@ -0,0 +1 @@
+ENV["ARE_DB"] = "mysql"
\ No newline at end of file
diff --git a/test/adapters/postgresql.rb b/test/adapters/postgresql.rb
new file mode 100644
index 0000000..fee702b
--- /dev/null
+++ b/test/adapters/postgresql.rb
@@ -0,0 +1 @@
+ENV["ARE_DB"] = "postgresql"
\ No newline at end of file
diff --git a/test/adapters/sqlite3.rb b/test/adapters/sqlite3.rb
new file mode 100644
index 0000000..8e4d641
--- /dev/null
+++ b/test/adapters/sqlite3.rb
@@ -0,0 +1 @@
+ENV["ARE_DB"] = "sqlite3"
\ No newline at end of file
diff --git a/test/database.yml b/test/database.yml
index b89291d..73d5df9 100644
--- a/test/database.yml
+++ b/test/database.yml
@@ -3,7 +3,7 @@ common: &common
   password: 
   encoding: utf8
   host:     localhost
-  database: aroptests
+  database: activerecord_import_test
 
 mysql:
   <<: *common