diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 779a0a5a..059bcdf5 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -14,7 +14,7 @@
 #   -g/--debug       Build a debug version
 #
 
-PYTHON_BUILD_VERSION="20160130"
+PYTHON_BUILD_VERSION="20160602"
 
 OLDIFS="$IFS"
 
@@ -1831,8 +1831,16 @@ fi
 #fi
 
 if [ -z "$MAKE" ]; then
-  if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
-    export MAKE="gmake"
+  if [ "FreeBSD" = "$(uname -s)" ]; then
+#   if [ $(echo $1 | sed 's/-.*$//') = "jruby" ]; then
+#     export MAKE="gmake"
+#   else
+      if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
+        export MAKE="gmake"
+      else
+        export MAKE="make"
+      fi
+#   fi
   else
     export MAKE="make"
   fi
diff --git a/plugins/python-build/test/checksum.bats b/plugins/python-build/test/checksum.bats
index 7cbc1af8..04973a97 100644
--- a/plugins/python-build/test/checksum.bats
+++ b/plugins/python-build/test/checksum.bats
@@ -5,6 +5,10 @@ export PYTHON_BUILD_SKIP_MIRROR=1
 export PYTHON_BUILD_CACHE_PATH=
 export PYTHON_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/plugins/python-build/test/hooks.bats b/plugins/python-build/test/hooks.bats
index c055171d..1b045d53 100644
--- a/plugins/python-build/test/hooks.bats
+++ b/plugins/python-build/test/hooks.bats
@@ -3,7 +3,6 @@
 load test_helper
 
 setup() {
-  ensure_not_found_in_path aria2c
   export PYENV_ROOT="${TMP}/pyenv"
   export HOOK_PATH="${TMP}/i has hooks"
   mkdir -p "$HOOK_PATH"
diff --git a/plugins/python-build/test/mirror.bats b/plugins/python-build/test/mirror.bats
index c7035b80..038a920a 100644
--- a/plugins/python-build/test/mirror.bats
+++ b/plugins/python-build/test/mirror.bats
@@ -6,6 +6,10 @@ export PYTHON_BUILD_CACHE_PATH=
 export PYTHON_BUILD_MIRROR_URL=http://mirror.example.com
 export PYTHON_BUILD_CURL_OPTS=
 
+setup() {
+  ensure_not_found_in_path aria2c
+}
+
 
 @test "package URL without checksum bypasses mirror" {
   stub shasum true
diff --git a/plugins/python-build/test/pyenv.bats b/plugins/python-build/test/pyenv.bats
index 39d8d140..8ed63207 100644
--- a/plugins/python-build/test/pyenv.bats
+++ b/plugins/python-build/test/pyenv.bats
@@ -4,7 +4,6 @@ load test_helper
 export PYENV_ROOT="${TMP}/pyenv"
 
 setup() {
-  ensure_not_found_in_path aria2c
   stub pyenv-hooks 'install : true'
   stub pyenv-rehash 'true'
 }
diff --git a/plugins/python-build/test/test_helper.bash b/plugins/python-build/test/test_helper.bash
index 8dbd47cc..7f55cd5d 100644
--- a/plugins/python-build/test/test_helper.bash
+++ b/plugins/python-build/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:?}"/*
 }