diff --git a/changelog/61650.fixed b/changelog/61650.fixed
new file mode 100644
index 00000000000..c60f78baa95
--- /dev/null
+++ b/changelog/61650.fixed
@@ -0,0 +1 @@
+Fix ssh config roster to correctly parse the ssh config files that contain spaces.
diff --git a/tests/pytests/unit/roster/test_ssh_config.py b/tests/pytests/unit/roster/test_ssh_config.py
index 84b697eeb6e..cdf761c3c5f 100644
--- a/tests/pytests/unit/roster/test_ssh_config.py
+++ b/tests/pytests/unit/roster/test_ssh_config.py
@@ -68,7 +68,7 @@ def mock_fp():
         IdentityFile ~/.ssh/id_rsa_abc
 
     Host def*
-        IdentityFile ~/.ssh/id_rsa_def
+        IdentityFile  ~/.ssh/id_rsa_def
 
     Host abc.asdfgfdhgjkl.com
         HostName 123.123.123.123
@@ -77,7 +77,7 @@ def mock_fp():
         HostName 123.123.123.124
 
     Host def.asdfgfdhgjkl.com
-        HostName 234.234.234.234
+        HostName      234.234.234.234
     """
     )