diff --git a/test/models/contact_test.rb b/test/models/contact/contact_test.rb
similarity index 100%
rename from test/models/contact_test.rb
rename to test/models/contact/contact_test.rb
diff --git a/test/models/contact_transfer_test.rb b/test/models/contact/contact_transfer_test.rb
similarity index 100%
rename from test/models/contact_transfer_test.rb
rename to test/models/contact/contact_transfer_test.rb
diff --git a/test/models/domain_test.rb b/test/models/domain/domain_test.rb
similarity index 100%
rename from test/models/domain_test.rb
rename to test/models/domain/domain_test.rb
diff --git a/test/models/domain_transfer_test.rb b/test/models/domain/domain_transfer_test.rb
similarity index 97%
rename from test/models/domain_transfer_test.rb
rename to test/models/domain/domain_transfer_test.rb
index 2b119aa93..84eede7d0 100644
--- a/test/models/domain_transfer_test.rb
+++ b/test/models/domain/domain_transfer_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DomainTest < ActiveSupport::TestCase
+class DomainTransferTest < ActiveSupport::TestCase
   def setup
     @domain = domains(:shop)
   end