diff --git a/Rakefile b/Rakefile
index f7af3fcc..8a1f1e9e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList['test/**/*_test.rb']
   t.ruby_opts = ['-r./test/test_helper.rb']
   t.verbose = true
 end
diff --git a/test/attributes_test.rb b/test/serializers/attributes_test.rb
similarity index 100%
rename from test/attributes_test.rb
rename to test/serializers/attributes_test.rb
diff --git a/test/generators_test.rb b/test/serializers/generators_test.rb
similarity index 100%
rename from test/generators_test.rb
rename to test/serializers/generators_test.rb