diff --git a/test/models/compute_resources/ovirt_test.rb b/test/models/compute_resources/ovirt_test.rb
index 886e4fdbdaac..289d5ff4cce7 100644
--- a/test/models/compute_resources/ovirt_test.rb
+++ b/test/models/compute_resources/ovirt_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'
-require 'models/compute_resources/compute_resource_test_helpers'
 
-class Foreman::Model:: OvirtTest < ActiveSupport::TestCase
+class Foreman::Model::OvirtTest < ActiveSupport::TestCase
   include ComputeResourceTestHelpers
 
   should validate_presence_of(:url)
@@ -50,8 +49,6 @@ class Foreman::Model:: OvirtTest < ActiveSupport::TestCase
   end
 
   describe "associating operating system" do
-    require 'fog/ovirt/models/compute/operating_system'
-
     setup do
       operating_systems_xml = Nokogiri::XML(File.read('test/fixtures/ovirt_operating_systems.xml'))
       @ovirt_oses = operating_systems_xml.xpath('/operating_systems/operating_system').map do |os|
@@ -105,8 +102,6 @@ class Foreman::Model:: OvirtTest < ActiveSupport::TestCase
   end
 
   describe 'APIv4 support' do
-    require 'fog/ovirt/models/compute/quota'
-
     before do
       @compute_resource = FactoryBot.build(:ovirt_cr)
       @quota = Fog::Ovirt::Compute::Quota.new({ :id => '1', :name => "Default" })
@@ -122,8 +117,6 @@ class Foreman::Model:: OvirtTest < ActiveSupport::TestCase
   end
 
   describe 'quota validation and name-id substitution' do
-    require 'fog/ovirt/models/compute/quota'
-
     before do
       @compute_resource = FactoryBot.build(:ovirt_cr)
       @quota = Fog::Ovirt::Compute::Quota.new({ :id => '1', :name => 'Default' })
diff --git a/test/unit/plugin/plugin_migration_test.rb b/test/unit/plugin/plugin_migration_test.rb
index cca8c6828fb5..d3ef978df2e2 100644
--- a/test/unit/plugin/plugin_migration_test.rb
+++ b/test/unit/plugin/plugin_migration_test.rb
@@ -2,7 +2,7 @@
 require 'generators/plugin/migration_generator'
 
 class PluginMigrationTest < Rails::Generators::TestCase
-  tests Plugin::MigrationGenerator
+  tests Generators::Plugin::MigrationGenerator
 
   destination File.join(Dir.tmpdir, "/migration_generator_test/core")
 
diff --git a/test/unit/shared/access_permissions_test_base.rb b/test/unit/shared/access_permissions_test_base.rb
index 319ea2dead36..d4cfd0ecbbdb 100644
--- a/test/unit/shared/access_permissions_test_base.rb
+++ b/test/unit/shared/access_permissions_test_base.rb
@@ -1,6 +1,3 @@
-require 'foreman/access_control'
-require 'foreman/access_permissions'
-
 module AccessPermissionsTestBase
   extend ActiveSupport::Concern