diff --git a/lib/bolt/catalog.rb b/lib/bolt/catalog.rb
index <HASH>..<HASH> 100644
--- a/lib/bolt/catalog.rb
+++ b/lib/bolt/catalog.rb
@@ -23,6 +23,10 @@ module Bolt
           cli << "--#{setting}" << dir
         end
         Puppet.settings.send(:clear_everything_for_tests)
+        # Override module locations, Bolt includes vendored modules in its internal modulepath.
+        Puppet.settings.override_default(:basemodulepath, '')
+        Puppet.settings.override_default(:vendormoduledir, '')
+
         Puppet.initialize_settings(cli)
         Puppet.settings[:hiera_config] = hiera_config
(maint) Fix an occasional test failure on Windows

Bolt tests periodically fail when run on Windows in
`spec/bolt/catalog_spec.rb:<I>`. This test compiles a small catalog. The
test would fail when it encountered recursion resolving the
`env_windows_installdir` fact.

We shouldn't be looking up that fact during compilation anyway because
Bolt does its own vendoring. Override the setting so we don't attempt to
set it (and avoid looking up unnecessary facts).