diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6fe16007e8f..ae8cf0bd621 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -12,7 +12,6 @@
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Eager load currently cannot be set due to: https://projects.theforeman.org/issues/31977
   config.eager_load = true
 
   # Configure static asset server for tests with Cache-Control for performance.
diff --git a/config/initializers/6_preload_stis.rb b/config/initializers/6_preload_stis.rb
index f66da3566db..53fceaa1543 100644
--- a/config/initializers/6_preload_stis.rb
+++ b/config/initializers/6_preload_stis.rb
@@ -3,5 +3,5 @@
   # E.g. Base.register_type(BMC)
   # Some constants that use such classes may be defined before all the related classes/models are loaded and registered
   # E.g. InterfaceTypeMapper::ALLOWED_TYPE_NAMES
-  Rails.autoloaders.main.eager_load_dir("#{Rails.root}/app/models/nic")
+  Rails.autoloaders.main.eager_load_dir(Rails.root.join('app', 'models', 'nic'))
 end