diff --git a/avocado/utils/ssh.py b/avocado/utils/ssh.py
index 2d1aa541f21d47d852489a821f0136781d52eba0..898932551dcd6bf054bd42ce542fa5bde68c2a5a 100644
--- a/avocado/utils/ssh.py
+++ b/avocado/utils/ssh.py
@@ -8,7 +8,8 @@ class Session(object):
     """
 
     DEFAULT_OPTIONS = (('StrictHostKeyChecking', 'no'),
-                       ('UpdateHostKeys', 'no'))
+                       ('UpdateHostKeys', 'no'),
+                       ('ControlPath', '~/.ssh/avocado-master-%r@%h:%p'))
 
     MASTER_OPTIONS = (('ControlMaster', 'yes'),
                       ('ControlPersist', 'yes'))
@@ -76,7 +77,7 @@ class Session(object):
             if not master.exit_status == 0:
                 return False
             self._connection = master
-        return True
+        return self._check()
 
     def cmd(self, command):
         """