1 files changed, 23 insertions, 1 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 3c1e76e8772..a90e3fff355 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3762,7 +3762,29 @@ process sentinels.  They shall not disturb each other."
         (mapconcat 'shell-quote-argument load-path " -L ")
         (shell-quote-argument code)))))))
 
-(ert-deftest tramp-test38-unload ()
+(ert-deftest tramp-test38-remote-load-path ()
+  "Check that Tramp autoloads its packages with remote `load-path'."
+  ;; `tramp-cleanup-all-connections' is autoloaded from tramp-cmds.el.
+  ;; It shall still work, when a remote file name is in the
+  ;; `load-path'.
+  (let ((code
+         "(let ((force-load-messages t)\
+                (load-path (cons \"/foo:bar:\" load-path)))\
+            (tramp-cleanup-all-connections))"))
+    (should
+     (string-match
+      (format
+       "Loading %s"
+       (expand-file-name
+        "tramp-cmds" (file-name-directory (locate-library "tramp"))))
+      (shell-command-to-string
+       (format
+        "%s -batch -Q -L %s -l tramp-sh --eval %s"
+        (expand-file-name invocation-name invocation-directory)
+        (mapconcat 'shell-quote-argument load-path " -L ")
+        (shell-quote-argument code)))))))
+
+(ert-deftest tramp-test39-unload ()
   "Check that Tramp and its subpackages unload completely.
 Since it unloads Tramp, it shall be the last test to run."
   ;; Mark as failed until all symbols are unbound.