diff --git a/ssh/tailssh/incubator.go b/ssh/tailssh/incubator.go
index f55dcbe45..e809e9185 100644
--- a/ssh/tailssh/incubator.go
+++ b/ssh/tailssh/incubator.go
@@ -1096,8 +1096,8 @@ func (ia *incubatorArgs) loginArgs(loginCmdPath string) []string {
 
 func shellArgs(isShell bool, cmd string) []string {
 	if isShell {
-		if runtime.GOOS == freebsd {
-			// freebsd's shells don't support the "-l" option, so we can't run as a login shell
+		if runtime.GOOS == freebsd || runtime.GOOS == openbsd {
+			// bsd shells don't support the "-l" option, so we can't run as a login shell
 			return []string{}
 		}
 		return []string{"-l"}