diff --git a/bin/ruby-build b/bin/ruby-build
index 1f950f69..5f9e96f2 100755
--- a/bin/ruby-build
+++ b/bin/ruby-build
@@ -1222,9 +1222,9 @@ if [ -z "$MAKE" ]; then
       export MAKE="gmake"
     else
       if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
-	export MAKE="gmake"
+        export MAKE="gmake"
       else
-	export MAKE="make"
+        export MAKE="make"
       fi
     fi
   else
diff --git a/test/checksum.bats b/test/checksum.bats
index cf277ce2..749c6fdf 100644
--- a/test/checksum.bats
+++ b/test/checksum.bats
@@ -5,6 +5,10 @@ export RUBY_BUILD_SKIP_MIRROR=1
 export RUBY_BUILD_CACHE_PATH=
 export RUBY_BUILD_CURL_OPTS=
 
+setup() {
+  ensure_not_found_in_path aria2c
+}
+
 
 @test "package URL without checksum" {
   stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"
diff --git a/test/hooks.bats b/test/hooks.bats
index 4aaba2f6..fa6f9951 100644
--- a/test/hooks.bats
+++ b/test/hooks.bats
@@ -3,7 +3,6 @@
 load test_helper
 
 setup() {
-  ensure_not_found_in_path aria2c
   export RBENV_ROOT="${TMP}/rbenv"
   export HOOK_PATH="${TMP}/i has hooks"
   mkdir -p "$HOOK_PATH"
diff --git a/test/mirror.bats b/test/mirror.bats
index e071ddbc..055538e5 100755
--- a/test/mirror.bats
+++ b/test/mirror.bats
@@ -6,6 +6,10 @@ export RUBY_BUILD_CACHE_PATH=
 export RUBY_BUILD_MIRROR_URL=http://mirror.example.com
 export RUBY_BUILD_CURL_OPTS=
 
+setup() {
+  ensure_not_found_in_path aria2c
+}
+
 
 @test "package URL without checksum bypasses mirror" {
   stub shasum true
diff --git a/test/rbenv.bats b/test/rbenv.bats
index 47cdb7de..2d8c95ff 100644
--- a/test/rbenv.bats
+++ b/test/rbenv.bats
@@ -4,7 +4,6 @@ load test_helper
 export RBENV_ROOT="${TMP}/rbenv"
 
 setup() {
-  ensure_not_found_in_path aria2c
   stub rbenv-hooks 'install : true'
   stub rbenv-rehash 'true'
 }
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 301030f4..d6e0737e 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -38,10 +38,6 @@ ensure_not_found_in_path() {
   done
 }
 
-setup() {
-  ensure_not_found_in_path aria2c
-}
-
 teardown() {
   rm -fr "${TMP:?}"/*
 }