diff --git a/testsuite/wanted-results/test18 b/testsuite/wanted-results/test18
index e310b759..e04554c3 100644
--- a/testsuite/wanted-results/test18
+++ b/testsuite/wanted-results/test18
@@ -79,15 +79,15 @@ parallel: Warning: --cleanup ignored as there are no remote --sshlogin.
 10
 ### Check forced number of CPUs being respected
 hk
-vm1
-vm1
-vm1
-vm1
-vm1
-vm1
-vm1
-vm1
-vm1
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
+redhat9.tange.dk
 hk
 hk
 hk
diff --git a/testsuite/wanted-results/test23 b/testsuite/wanted-results/test23
index c47d982f..eaecb8aa 100644
--- a/testsuite/wanted-results/test23
+++ b/testsuite/wanted-results/test23
@@ -13,9 +13,9 @@ script2 run 4
 script1 run 5
 script2 run 5
 good if no file
-ls: cannot access script1: No such file or directory
+ls: script1: No such file or directory
 OK
-ls: cannot access script2: No such file or directory
+ls: script2: No such file or directory
 OK
 ### Test --basefile + --sshlogin :
 1
diff --git a/testsuite/wanted-results/test60 b/testsuite/wanted-results/test60
index 2480891d..3da516b3 100644
--- a/testsuite/wanted-results/test60
+++ b/testsuite/wanted-results/test60
@@ -50,16 +50,16 @@
 3
 3
 ### Test --nonall
-vm1
-vm10
-### Test --nonall -u
-vm10
-vm1
-vm10
-vm1
+centos3.tange.dk
+redhat9.tange.dk
+### Test --nonall -u - should be interleaved x y x y
+centos3.tange.dk
+redhat9.tange.dk
+centos3.tange.dk
+redhat9.tange.dk
 ### Test read sshloginfile from STDIN
-vm1
-vm1
+redhat9.tange.dk
+redhat9.tange.dk
 ### Test --nonall --basefile
 /tmp/nonall--basefile
 /tmp/nonall--basefile
diff --git a/testsuite/wanted-results/test61 b/testsuite/wanted-results/test61
index 0dc8c46d..c9c90a24 100644
--- a/testsuite/wanted-results/test61
+++ b/testsuite/wanted-results/test61
@@ -1,5 +1,5 @@
 ### Test --return of weirdly named file
-ssh parallel@parallel-server3  'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null  && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\;  setenv PARALLEL_PID '$PARALLEL_PID'  || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\;  PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;'  echo\ \>aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b;_EXIT_status=$?; rsync -rlDzR -essh  parallel@parallel-server3:././aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b ./; exit $_EXIT_status;
+ssh parallel@parallel-server3  'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null  && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\;  setenv PARALLEL_PID '$PARALLEL_PID'  || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\;  PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;'  echo\ \>aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b;_EXIT_status=$?; rsync --rsync-path=cd\ .\;\ rsync -rlDzR -essh parallel@parallel-server3:aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b ./; exit $_EXIT_status;
 ### Test if remote login shell is csh
 ssh csh@localhost  'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null  && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\;  setenv PARALLEL_PID '$PARALLEL_PID'  || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\;  PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;'  echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ a\|\ wc\ -w;
 3