diff --git a/dev/tests/conf/local.conf b/dev/tests/conf/local.conf
index 1eea9ad..b9a7f8d 100644
--- a/dev/tests/conf/local.conf
+++ b/dev/tests/conf/local.conf
@@ -72,6 +72,8 @@ SSH_COMPRESSION=true
 
 ## Ignore ssh known hosts. DANGER WILL ROBINSON DANGER ! This can lead to security issues. Only enable this if you know what you're doing.
 SSH_IGNORE_KNOWN_HOSTS=false
+SSH_CONTROLMASTER=false
+
 
 ## Check for connectivity to remote host before launching remote sync task. Be sure the hosts responds to ping. Failing to ping will stop sync.
 REMOTE_HOST_PING=false
diff --git a/dev/tests/conf/remote.conf b/dev/tests/conf/remote.conf
index f3d10cc..256cc5d 100644
--- a/dev/tests/conf/remote.conf
+++ b/dev/tests/conf/remote.conf
@@ -16,7 +16,7 @@ INITIATOR_SYNC_DIR="${HOME}/osync-tests/initiator"
 
 ## Target is the system osync synchronizes to (can be the same system as the initiator in case of local sync tasks). The target directory can be a local or remote path.
 #TARGET_SYNC_DIR="${HOME}/osync-tests/target"
-TARGET_SYNC_DIR="ssh://root@localhost:22/${HOME}/osync-tests/target"
+TARGET_SYNC_DIR="ssh://root@localhost:44999/${HOME}/osync-tests/target"
 
 ## If the target system is remote, you can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
 SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa_local"
@@ -72,6 +72,8 @@ SSH_COMPRESSION=true
 
 ## Ignore ssh known hosts. DANGER WILL ROBINSON DANGER ! This can lead to security issues. Only enable this if you know what you're doing.
 SSH_IGNORE_KNOWN_HOSTS=false
+SSH_CONTROLMASTER=false
+
 
 ## Check for connectivity to remote host before launching remote sync task. Be sure the hosts responds to ping. Failing to ping will stop sync.
 REMOTE_HOST_PING=true