diff --git a/scripts/riot b/scripts/riot
index 01a80c5..db6e00a 100755
--- a/scripts/riot
+++ b/scripts/riot
@@ -87,7 +87,7 @@ parse_remote() {
     if [[ "$RIOT_TRUST_CLIENT" == "1" ]]; then
         SSH_OPTIONS='-o PermitLocalCommand=yes'
         if [[ "$(get_os_type)" != "msys" ]]; then
-            mkdir -p ~/.ssh/master-socket
+            test "$DFS_DRY_RUN" = "1" || mkdir -p ~/.ssh/master-socket
             SSH_OPTIONS="$SSH_OPTIONS -o ControlMaster=auto -o ControlPath=~/.ssh/master-socket/%C"
         fi
     fi
diff --git a/tools/test.zsh b/tools/test.zsh
index 8a02ef6..8e98efe 100644
--- a/tools/test.zsh
+++ b/tools/test.zsh
@@ -43,10 +43,6 @@ test $(echo | tools/common.sh ask_for_Yn "test") = "1"
 test $(DFS_QUIET=1 tools/common.sh ask_for_Yn "test") = "1"
 test "$(DFS_TRUST=1 riot time@is.impt:2222/yes@you-r.right/you@are.really.recht./ibd./try@it,another@host scp /tmp/ ./tmp -D 2>/dev/null)" = 'scp -P 12022 -o PermitLocalCommand=yes -o ControlMaster=auto -o ControlPath=~/.ssh/master-socket/%C -o ProxyJump=time@is.impt:2222,yes@you-r.right,you@are.really.recht.,root@ibd. -r try@it.ibd.ink:"/tmp/" "./tmp"
 scp -P 12022 -o PermitLocalCommand=yes -o ControlMaster=auto -o ControlPath=~/.ssh/master-socket/%C -o ForwardX11=yes -o ForwardAgent=yes -r another@host.ibd.ink:"/tmp/" "./tmp"'
-if [[ "$(tools/common.sh get_os_type)" != "msys" ]]; then
-    test -d ~/.ssh/master-socket
-fi
-
 
 # check alias
 alias p114