diff --git a/cross-os-tests/.run b/cross-os-tests/.run
index e2d3ff4..74c1e7f 100755
--- a/cross-os-tests/.run
+++ b/cross-os-tests/.run
@@ -1,22 +1,13 @@
 params="$(basename "${0}")"
 
-fullhost="$(echo "${params}" | cut -d\  -f1)"
+hostname="$(echo "${params}" | cut -d\  -f1)"
 if echo "${params}" | grep -q \ ; then
   flags="$(echo "${params}" | cut -d\  -f2)"
 fi
 
-hostname="$(echo "${fullhost}" | cut -d: -f1)"
-if echo "${fullhost}" | grep -q : ; then
-  port="$(echo "${fullhost}" | cut -d: -f2)"
-else
-  port=22
-fi
-
-echo $port
-exit
 urchin_dir=.urchin-cross-shell-test
 
-rsync --archive -e "ssh ${params}" \
-  ../urchin ../tests "${host}":"${urchin_dir}"
-ssh -p "${port}" "${host}" \
+rsync --archive -e "ssh ${flags}" \
+  ../urchin ../tests "${hostname}":"${urchin_dir}"
+ssh "${hostname}" ${flags} \
   "cd ${urchin_dir} && ./urchin --run-in-series tests"