diff --git a/salt/loader/__init__.py b/salt/loader/__init__.py
index 6bee7e55692..160fe8e60d0 100644
--- a/salt/loader/__init__.py
+++ b/salt/loader/__init__.py
@@ -890,7 +890,9 @@ def log_handlers(opts, loaded_base_name=None):
     return FilterDictWrapper(ret, ".setup_handlers")
 
 
-def ssh_wrapper(opts, functions=None, context=None, loaded_base_name=None):
+def ssh_wrapper(
+    opts, functions=None, context=None, file_client=None, loaded_base_name=None
+):
     """
     Returns the custom logging handler modules
 
@@ -908,7 +910,11 @@ def ssh_wrapper(opts, functions=None, context=None, loaded_base_name=None):
         ),
         opts,
         tag="wrapper",
-        pack={"__salt__": functions, "__context__": context},
+        pack={
+            "__salt__": functions,
+            "__context__": context,
+            "__file_client__": file_client,
+        },
         loaded_base_name=loaded_base_name,
     )
 
diff --git a/tests/conftest.py b/tests/conftest.py
index fbadf272263..b25db4172e8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -23,7 +23,6 @@ import salt
 import salt._logging
 import salt._logging.mixins
 import salt.config
-import salt.loader
 import salt.utils.files
 import salt.utils.path
 import salt.utils.platform