diff --git a/borg/remote.py b/borg/remote.py
index c9d8145ba..8001abe2c 100644
--- a/borg/remote.py
+++ b/borg/remote.py
@@ -133,7 +133,7 @@ class RemoteRepository:
         # safe.
         if location.host == '__testsuite__':
             args = [sys.executable, '-m', 'borg.archiver', 'serve' ] + self.extra_test_args
-        else:
+        else:  # pragma: no cover
             args = self.ssh_cmd()
         self.p = Popen(args, bufsize=0, stdin=PIPE, stdout=PIPE)
         self.stdin_fd = self.p.stdin.fileno()
diff --git a/borg/testsuite/repository.py b/borg/testsuite/repository.py
index 5a1524ed9..2b99b83d6 100644
--- a/borg/testsuite/repository.py
+++ b/borg/testsuite/repository.py
@@ -328,6 +328,9 @@ class RemoteRepositoryTestCase(RepositoryTestCase):
     def test_ssh_cmd(self):
         assert self.repository.umask is not None
         assert self.repository.ssh_cmd(Location('example.com:foo')) == ['ssh', 'example.com', 'borg', 'serve'] + self.repository.umask_flag()
+        assert self.repository.ssh_cmd(Location('ssh://example.com/foo')) == ['ssh', 'example.com', 'borg', 'serve'] + self.repository.umask_flag()
+        assert self.repository.ssh_cmd(Location('ssh://user@example.com/foo')) == ['ssh', 'user@example.com', 'borg', 'serve'] + self.repository.umask_flag()
+        assert self.repository.ssh_cmd(Location('ssh://user@example.com:1234/foo')) == ['ssh', '-p', '1234', 'user@example.com', 'borg', 'serve'] + self.repository.umask_flag()
         os.environ['BORG_RSH'] = 'ssh --foo'
         assert self.repository.ssh_cmd(Location('example.com:foo')) == ['ssh', '--foo', 'example.com', 'borg', 'serve'] + self.repository.umask_flag()