diff --git a/tools/server-setup.sh b/tools/server-setup.sh
index 0724c87..f63b091 100755
--- a/tools/server-setup.sh
+++ b/tools/server-setup.sh
@@ -23,6 +23,13 @@ rm /tmp/$$-ssh-output
 
 set -e
 
+for s in tools/server-setup.d/*; do
+    echo "running $s..."
+    $s | while read line; do
+    echo "$s: $line"
+    done
+done
+
 if [ -d "servers/$HOSTNAME/setup.d" ]; then
     echo "running server specific setup scripts..."
     cd servers/$HOSTNAME
@@ -34,10 +41,3 @@ if [ -d "servers/$HOSTNAME/setup.d" ]; then
     done
     cd -
 fi
-
-for s in tools/server-setup.d/*; do
-    echo "running $s..."
-    $s | while read line; do
-    echo "$s: $line"
-    done
-done