diff --git a/tools/setup.sh b/tools/setup.sh
index 889c5fc6..195ff5a2 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-if ! $(dirname $0)/test-autoconf.sh
-then
-    echo Building autoconf...
-    $(dirname $0)/setup-autoconf.sh
-fi
-
 if ! $(dirname $0)/test-binutils.sh
 then
     echo Building Binutils...
@@ -15,6 +9,12 @@ fi
 
 if ! $(dirname $0)/test-gcc.sh
 then
+    if ! $(dirname $0)/test-autoconf.sh
+    then
+        echo Building autoconf...
+        $(dirname $0)/setup-autoconf.sh
+    fi
+
     echo Building GCC..
     $(dirname $0)/setup-gcc.sh
 fi