diff --git a/test/fixtures/forum_post_votes.yml b/test/fixtures/forum_post_votes.yml
deleted file mode 100644
index 19da71734..000000000
--- a/test/fixtures/forum_post_votes.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
-  forum_post_id: 1
-  creator_id: 1
-  score: 1
-
-two:
-  forum_post_id: 1
-  creator_id: 1
-  score: 1
diff --git a/test/models/super_voter_test.rb b/test/unit/super_voter_test.rb
similarity index 100%
rename from test/models/super_voter_test.rb
rename to test/unit/super_voter_test.rb
diff --git a/test/models/tag_autocomplete_test.rb b/test/unit/tag_autocomplete_test.rb
similarity index 100%
rename from test/models/tag_autocomplete_test.rb
rename to test/unit/tag_autocomplete_test.rb
diff --git a/test/models/tag_relationship_retirement_service_test.rb b/test/unit/tag_relationship_retirement_service_test.rb
similarity index 100%
rename from test/models/tag_relationship_retirement_service_test.rb
rename to test/unit/tag_relationship_retirement_service_test.rb
diff --git a/test/models/upload_service_test.rb b/test/unit/upload_service_test.rb
similarity index 100%
rename from test/models/upload_service_test.rb
rename to test/unit/upload_service_test.rb