diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index fcd56f93..ffa070d3 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -25,15 +25,24 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
+# Add `share/python-build/` directory from each pyenv plugin to the list of
+# paths where build definitions are looked up.
+shopt -s nullglob
+for plugin_path in "$PYENV_ROOT"/plugins/*/share/python-build; do
+  PYTHON_BUILD_DEFINITIONS="${PYTHON_BUILD_DEFINITIONS}:${plugin_path}"
+done
+export PYTHON_BUILD_DEFINITIONS
+shopt -u nullglob
+
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
   exec python-build --definitions
 fi
 
-if [ -z "$PYENV_ROOT" ]; then
-  PYENV_ROOT="${HOME}/.pyenv"
-fi
-
 # Load shared library functions
 eval "$(python-build --lib)"
 
@@ -221,17 +230,25 @@ python-build $KEEP $VERBOSE $HAS_PATCH $DEBUG "$DEFINITION" "$PREFIX" || STATUS=
 # Display a more helpful message if the definition wasn't found.
 if [ "$STATUS" == "2" ]; then
   { candidates="$(definitions "$DEFINITION")"
+    here="$(dirname "${0%/*}")"
     if [ -n "$candidates" ]; then
       echo
       echo "The following versions contain \`$DEFINITION' in the name:"
       echo "$candidates" | indent
     fi
     echo
-    echo "You can list all available versions with \`pyenv install --list'."
+    echo "See all available versions with \`pyenv install --list'."
     echo
-    echo "If the version you're looking for is not present, first try upgrading"
-    echo "pyenv. If it's still missing, open a request on the pyenv"
-    echo "issue tracker: https://github.com/yyuu/pyenv/issues"
+    echo -n "If the version you need is missing, try upgrading python-build"
+    if [ "$here" != "${here#$(brew --prefix 2>/dev/null)}" ]; then
+      printf ":\n\n"
+      echo "  brew update && brew upgrade pyenv"
+    elif [ -d "${here}/.git" ]; then
+      printf ":\n\n"
+      echo "  cd ${here} && git pull"
+    else
+      printf ".\n"
+    fi
   } >&2
 fi
 
diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 78816b2a..ae23f9c4 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PYTHON_BUILD_VERSION="20140524"
+PYTHON_BUILD_VERSION="20141028"
 
 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -71,17 +71,42 @@ colorize() {
   fi
 }
 
+os_information() {
+  if type -p lsb_release >/dev/null; then
+    lsb_release -sir | xargs echo
+  elif type -p sw_vers >/dev/null; then
+    echo "OS X $(sw_vers -productVersion)"
+  elif [ -r /etc/os-release ]; then
+    source /etc/os-release
+    echo "$NAME" $VERSION_ID
+  else
+    local os="$(cat /etc/{centos,redhat,fedora,system}-release /etc/debian_version 2>/dev/null | head -1)"
+    echo "${os:-$(uname -sr)}"
+  fi
+}
+
+#  9.1  -> 901
+# 10.9  -> 1009
+# 10.10 -> 1010
+osx_version() {
+  local ver="$(sw_vers -productVersion)"
+  local major="${ver%.*}"
+  local minor="${ver#*.}"
+  echo $(( major*100 + minor ))
+}
+
 build_failed() {
   { echo
-    echo "BUILD FAILED"
+    colorize 1 "BUILD FAILED"
+    echo " ($(os_information) using $(version))"
     echo
 
     if ! rmdir "${BUILD_PATH}" 2>/dev/null; then
       echo "Inspect or clean up the working tree at ${BUILD_PATH}"
 
       if file_is_not_empty "$LOG_PATH"; then
-        echo "Results logged to ${LOG_PATH}"
-        echo
+        colorize 33 "Results logged to ${LOG_PATH}"
+        printf "\n\n"
         echo "Last 10 log lines:"
         tail -n 10 "$LOG_PATH"
       fi
@@ -103,13 +128,16 @@ file_is_not_empty() {
 }
 
 num_cpu_cores() {
-  local num=""
-  if [ "Darwin" = "$(uname -s)" ]; then
+  local num
+  case "$(uname -s)" in
+  Darwin | *BSD )
     num="$(sysctl -n hw.ncpu 2>/dev/null || true)"
-  elif [ -r /proc/cpuinfo ]; then
-    num="$(grep ^processor /proc/cpuinfo | wc -l)"
-    [ "$num" -gt 0 ] || num=""
-  fi
+    ;;
+  * )
+    num="$(grep ^processor /proc/cpuinfo 2>/dev/null | wc -l | xargs)"
+    num="${num#0}"
+    ;;
+  esac
   echo "${num:-2}"
 }
 
@@ -190,7 +218,8 @@ compute_sha2() {
     output="$(shasum -a 256 -b)" || return 1
     echo "${output% *}"
   elif type openssl &>/dev/null; then
-    output="$(openssl dgst -sha256)" || return 1
+    local openssl="$(command -v "$(brew --prefix openssl 2>/dev/null)"/bin/openssl openssl | head -1)"
+    output="$("$openssl" dgst -sha256 2>/dev/null)" || return 1
     echo "${output##* }"
   elif type sha256sum &>/dev/null; then
     output="$(sha256sum --quiet)" || return 1
@@ -295,7 +324,7 @@ fetch_tarball() {
     fi
   fi
 
-  local tar_args="xzvf"
+  local tar_args="xzf"
   local package_filename="${package_name}.tar.gz"
 
   if [ "$package_url" != "${package_url%tgz}" ]; then
@@ -607,6 +636,9 @@ build_package_standard() {
   ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then
       export CFLAGS="$CFLAGS ${!PACKAGE_CFLAGS}"
     fi
+    if [ -z "$CC" ] && [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
+      export CC=clang
+    fi
     ${!PACKAGE_CONFIGURE:-./configure} --prefix="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}" \
                                        --libdir="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}/lib" \
                                        $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}"
@@ -659,8 +691,12 @@ build_package_ree_installer() {
 build_package_rbx() {
   local package_name="$1"
 
-  { bundle --path=vendor/bundle
-    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS
+  { [ ! -e "Gemfile" ] || bundle --path=vendor/bundle
+    if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then
+      mkdir -p vendor
+      ln -s "$RUBY_BUILD_CACHE_PATH" vendor/prebuilt
+    fi
+    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS "${RUBY_CONFIGURE_OPTS_ARRAY[@]}"
     rake install
     fix_rbx_gem_binstubs "$PREFIX_PATH"
     fix_rbx_irb "$PREFIX_PATH"
@@ -909,7 +945,7 @@ fix_rbx_gem_binstubs() {
   local bindir="${prefix}/bin"
   local file binstub
   # Symlink Rubinius' `gems/bin/` into `bin/`
-  if [ -d "$gemdir" ]; then
+  if [ -d "$gemdir" ] && [ ! -L "$gemdir" ]; then
     for file in "$gemdir"/*; do
       binstub="${bindir}/${file##*/}"
       rm -f "$binstub"
@@ -985,6 +1021,9 @@ require_gcc() {
   fi
 
   export CC="$gcc"
+  if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
+    export MACOSX_DEPLOYMENT_TARGET=10.9
+  fi
 }
 
 locate_gcc() {
@@ -1023,7 +1062,7 @@ verify_gcc() {
     return 1
   fi
 
-  local version="$("$gcc" --version || true)"
+  local version="$("$gcc" --version 2>/dev/null || true)"
   if [ -z "$version" ]; then
     return 1
   fi
@@ -1035,6 +1074,15 @@ verify_gcc() {
   echo "$gcc"
 }
 
+require_llvm() {
+  local llvm_version="$1"
+  if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
+    if [[ "$PYTHON_CONFIGURE_OPTS" != *--llvm-* ]]; then
+      package_option python configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2"
+    fi
+  fi
+}
+
 require_cc() {
   local cc="$(command -v "$CC" || command -v "cc" || true)"
 
@@ -1087,6 +1135,7 @@ require_java() {
 }
 
 needs_yaml() {
+  [[ "$RUBY_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&
   ! use_homebrew_yaml
 }
 
@@ -1136,7 +1185,8 @@ use_homebrew_readline() {
 
 has_broken_mac_openssl() {
   [ "$(uname -s)" = "Darwin" ] &&
-  [[ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&
+  [[ "$(/usr/bin/openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&
+  [[ "$RUBY_CONFIGURE_OPTS" != *--with-openssl-dir=* ]] &&
   ! use_homebrew_openssl
 }
 
@@ -1166,7 +1216,7 @@ build_package_mac_openssl() {
   OPENSSL_CONFIGURE="${OPENSSL_CONFIGURE:-./config}"
 
   # Compile a shared lib with zlib dynamically linked, no kerberos.
-  package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-krb5 shared
+  package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-ssl2 no-ssl3 no-krb5 shared
 
   # Default MAKE_OPTS are -j 2 which can confuse the build. Thankfully, make
   # gives precedence to the last -j option, so we can override that.
@@ -1185,7 +1235,11 @@ build_package_verify_openssl() {
   "$RUBY_BIN" -e 'begin
     require "openssl"
   rescue LoadError
-    abort "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?"
+    $stderr.puts "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?"
+    $stderr.puts "Configure options used:"
+    require "rbconfig"; require "shellwords"
+    RbConfig::CONFIG.fetch("configure_args").shellsplit.each { |arg| $stderr.puts "  #{arg}" }
+    exit 1
   end' >&4 2>&1
 }
 
@@ -1449,7 +1503,13 @@ build_package_ensurepip() {
 }
 
 version() {
-  echo "python-build ${PYTHON_BUILD_VERSION}"
+  local git_revision
+  # Read the revision from git if the remote points to "python-build" repository
+  if GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git remote -v 2>/dev/null | grep -q /python-build; then
+    git_revision="$(GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git describe --tags HEAD 2>/dev/null || true)"
+    git_revision="${git_revision#v}"
+  fi
+  echo "python-build ${git_revision:-$PYTHON_BUILD_VERSION}"
 }
 
 usage() {
@@ -1464,20 +1524,29 @@ usage() {
 }
 
 list_definitions() {
-  { for definition in "${PYTHON_BUILD_ROOT}/share/python-build/"*; do
-      [ -f "${definition}" ] && echo "${definition##*/}"
+  { for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do
+      [ -d "$DEFINITION_DIR" ] && ls "$DEFINITION_DIR"
     done
-  } | sort
+  } | sort_versions | uniq
 }
 
+sort_versions() {
+  sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' | \
+    LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}'
+}
 
 
 unset VERBOSE
 unset KEEP_BUILD_PATH
 unset HAS_PATCH
-PYTHON_BUILD_ROOT="$(abs_dirname "$0")/.."
 unset DEBUG
 
+PYTHON_BUILD_INSTALL_PREFIX="$(abs_dirname "$0")/.."
+
+OLDIFS="$IFS"
+IFS=: PYTHON_BUILD_DEFINITIONS=($PYTHON_BUILD_DEFINITIONS ${PYTHON_BUILD_ROOT:-$PYTHON_BUILD_INSTALL_PREFIX}/share/python-build)
+IFS="$OLDIFS"
+
 parse_options "$@"
 
 for option in "${OPTIONS[@]}"; do
@@ -1521,10 +1590,14 @@ DEFINITION_PATH="${ARGUMENTS[0]}"
 if [ -z "$DEFINITION_PATH" ]; then
   usage
 elif [ ! -f "$DEFINITION_PATH" ]; then
-  BUILTIN_DEFINITION_PATH="${PYTHON_BUILD_ROOT}/share/python-build/${DEFINITION_PATH}"
-  if [ -e "$BUILTIN_DEFINITION_PATH" ]; then
-    DEFINITION_PATH="$BUILTIN_DEFINITION_PATH"
-  else
+  for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do
+    if [ -f "${DEFINITION_DIR}/${DEFINITION_PATH}" ]; then
+      DEFINITION_PATH="${DEFINITION_DIR}/${DEFINITION_PATH}"
+      break
+    fi
+  done
+
+  if [ ! -f "$DEFINITION_PATH" ]; then
     echo "python-build: definition not found: ${DEFINITION_PATH}" >&2
     exit 2
   fi
@@ -1543,10 +1616,25 @@ else
   TMP="${TMPDIR%/}"
 fi
 
-if [ ! -w "$TMP" ] || [ ! -x "$TMP" ]; then
+# Check if TMPDIR is accessible and can hold executables.
+tmp_executable="${TMP}/python-build-test.$$"
+noexec=""
+if mkdir -p "$TMP" && touch "$tmp_executable" 2>/dev/null; then
+  cat > "$tmp_executable" <<-EOF
+	#!${BASH}
+	exit 0
+	EOF
+  chmod +x "$tmp_executable"
+else
   echo "python-build: TMPDIR=$TMP is set to a non-accessible location" >&2
   exit 1
 fi
+"$tmp_executable" 2>/dev/null || noexec=1
+rm -f "$tmp_executable"
+if [ -n "$noexec" ]; then
+  echo "python-build: TMPDIR=$TMP cannot hold executables (partition possibly mounted with \`noexec\`)" >&2
+  exit 1
+fi
 
 # Work around warnings building Ruby 2.0 on Clang 2.x:
 # pass -Wno-error=shorten-64-to-32 if the compiler accepts it.
@@ -1559,7 +1647,7 @@ fi
 #fi
 
 if [ -z "$MAKE" ]; then
-  if [[ "FreeBSD" = "$(uname -s)" ]]; then
+  if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
     export MAKE="gmake"
   else
     export MAKE="make"
@@ -1593,7 +1681,6 @@ if echo test | compute_md5 >/dev/null; then
   HAS_MD5_SUPPORT=1
 else
   unset HAS_MD5_SUPPORT
-  unset PYTHON_BUILD_MIRROR_URL
 fi
 
 # Add an option to build a debug version of Python (#11)
@@ -1668,18 +1755,18 @@ if [ -n "${PIP_VERSION}" ]; then
   GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
 fi
 
-# Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220)
-if [[ "Darwin" == "$(uname -s)" ]]; then
-  MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)"
-  MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ })
-  if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then
-    export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}"
-  else
-    { colorize 1 "WARNING"
-      echo ": Could not detect the product version of OS X for MACOSX_DEPLOYMENT_TARGET. Use default setting."
-    } >&2
-  fi
-fi
+## Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220)
+#if [[ "Darwin" == "$(uname -s)" ]]; then
+#  MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)"
+#  MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ })
+#  if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then
+#    export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}"
+#  else
+#    { colorize 1 "WARNING"
+#      echo ": Could not detect the product version of OS X for MACOSX_DEPLOYMENT_TARGET. Use default setting."
+#    } >&2
+#  fi
+#fi
 
 python_bin_suffix() {
   local version_name version_info
diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index 5cab04b1..210a91b7 100644
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@@ -264,6 +264,31 @@ make install
 OUT
 }
 
+@test "number of CPU cores is detected on FreeBSD" {
+  cached_tarball "Python-3.2.1"
+
+  stub uname '-s : echo FreeBSD'
+  stub sysctl '-n hw.ncpu : echo 1'
+  stub_make_install
+
+  export -n MAKE_OPTS
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub uname
+  unstub sysctl
+  unstub make
+
+  assert_build_log <<OUT
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 1
+make install
+OUT
+}
+
 @test "setting PYTHON_MAKE_INSTALL_OPTS to a multi-word string" {
   cached_tarball "Python-3.2.1"
 
@@ -315,11 +340,10 @@ OUT
   assert [ -x ./here/bin/package ]
 }
 
-@test "make on FreeBSD defaults to gmake" {
+@test "make on FreeBSD 9 defaults to gmake" {
   cached_tarball "Python-3.2.1"
 
-  stub uname "-s : echo FreeBSD"
-  stub uname "-s : echo FreeBSD"
+  stub uname "-s : echo FreeBSD" "-r : echo 9.1"
   MAKE=gmake stub_make_install
 
   MAKE= install_fixture definitions/vanilla-python
@@ -329,6 +353,18 @@ OUT
   unstub uname
 }
 
+@test "make on FreeBSD 10" {
+  cached_tarball "Python-3.2.1"
+
+  stub uname "-s : echo FreeBSD" "-r : echo 10.0-RELEASE"
+  stub_make_install
+
+  MAKE= install_fixture definitions/vanilla-python
+  assert_success
+
+  unstub uname
+}
+
 @test "can use PYTHON_CONFIGURE to apply a patch" {
   cached_tarball "Python-3.2.1"
 
diff --git a/plugins/python-build/test/compiler.bats b/plugins/python-build/test/compiler.bats
new file mode 100644
index 00000000..505566b3
--- /dev/null
+++ b/plugins/python-build/test/compiler.bats
@@ -0,0 +1,85 @@
+#!/usr/bin/env bats
+
+load test_helper
+export MAKE=make
+export MAKE_OPTS='-j 2'
+export -n CFLAGS
+export -n CC
+
+@test "require_gcc on OS X 10.9" {
+  stub uname '-s : echo Darwin'
+  stub sw_vers '-productVersion : echo 10.9'
+  stub gcc '--version : echo 4.2.1'
+
+  run_inline_definition <<DEF
+require_gcc
+echo CC=\$CC
+echo MACOSX_DEPLOYMENT_TARGET=\${MACOSX_DEPLOYMENT_TARGET-no}
+DEF
+  assert_success
+  assert_output <<OUT
+CC=${TMP}/bin/gcc
+MACOSX_DEPLOYMENT_TARGET=no
+OUT
+}
+
+@test "require_gcc on OS X 10.10" {
+  stub uname '-s : echo Darwin'
+  stub sw_vers '-productVersion : echo 10.10'
+  stub gcc '--version : echo 4.2.1'
+
+  run_inline_definition <<DEF
+require_gcc
+echo CC=\$CC
+echo MACOSX_DEPLOYMENT_TARGET=\${MACOSX_DEPLOYMENT_TARGET-no}
+DEF
+  assert_success
+  assert_output <<OUT
+CC=${TMP}/bin/gcc
+MACOSX_DEPLOYMENT_TARGET=10.9
+OUT
+}
+
+@test "require_gcc silences warnings" {
+  stub gcc '--version : echo warning >&2; echo 4.2.1'
+
+  run_inline_definition <<DEF
+require_gcc
+echo \$CC
+DEF
+  assert_success "${TMP}/bin/gcc"
+}
+
+@test "CC=clang by default on OS X 10.10" {
+  mkdir -p "$INSTALL_ROOT"
+  cd "$INSTALL_ROOT"
+
+  stub uname '-s : echo Darwin'
+  stub sw_vers '-productVersion : echo 10.10'
+  stub cc 'false'
+  stub brew 'false'
+  stub make \
+    'echo make $@' \
+    'echo make $@'
+
+  cat > ./configure <<CON
+#!${BASH}
+echo ./configure "\$@"
+echo CC=\$CC
+echo CFLAGS=\${CFLAGS-no}
+CON
+  chmod +x ./configure
+
+  run_inline_definition <<DEF
+exec 4<&1
+build_package_standard python
+DEF
+  assert_success
+  assert_output <<OUT
+./configure --prefix=$INSTALL_ROOT
+CC=clang
+CFLAGS=no
+make -j 2
+make install
+OUT
+}
diff --git a/plugins/python-build/test/definitions.bats b/plugins/python-build/test/definitions.bats
new file mode 100644
index 00000000..1d1ad957
--- /dev/null
+++ b/plugins/python-build/test/definitions.bats
@@ -0,0 +1,112 @@
+#!/usr/bin/env bats
+
+load test_helper
+NUM_DEFINITIONS="$(ls "$BATS_TEST_DIRNAME"/../share/python-build | wc -l)"
+
+@test "list built-in definitions" {
+  run python-build --definitions
+  assert_success
+  assert_output_contains "2.7.8"
+  assert_output_contains "jython-2.5.3"
+  assert [ "${#lines[*]}" -eq "$NUM_DEFINITIONS" ]
+}
+
+@test "custom PYTHON_BUILD_ROOT: nonexistent" {
+  export PYTHON_BUILD_ROOT="$TMP"
+  assert [ ! -e "${PYTHON_BUILD_ROOT}/share/python-build" ]
+  run python-build --definitions
+  assert_success ""
+}
+
+@test "custom PYTHON_BUILD_ROOT: single definition" {
+  export PYTHON_BUILD_ROOT="$TMP"
+  mkdir -p "${PYTHON_BUILD_ROOT}/share/python-build"
+  touch "${PYTHON_BUILD_ROOT}/share/python-build/2.7.8-test"
+  run python-build --definitions
+  assert_success "2.7.8-test"
+}
+
+@test "one path via PYTHON_BUILD_DEFINITIONS" {
+  export PYTHON_BUILD_DEFINITIONS="${TMP}/definitions"
+  mkdir -p "$PYTHON_BUILD_DEFINITIONS"
+  touch "${PYTHON_BUILD_DEFINITIONS}/2.7.8-test"
+  run python-build --definitions
+  assert_success
+  assert_output_contains "2.7.8-test"
+  assert [ "${#lines[*]}" -eq "$((NUM_DEFINITIONS + 1))" ]
+}
+
+@test "multiple paths via PYTHON_BUILD_DEFINITIONS" {
+  export PYTHON_BUILD_DEFINITIONS="${TMP}/definitions:${TMP}/other"
+  mkdir -p "${TMP}/definitions"
+  touch "${TMP}/definitions/2.7.8-test"
+  mkdir -p "${TMP}/other"
+  touch "${TMP}/other/3.4.2-test"
+  run python-build --definitions
+  assert_success
+  assert_output_contains "2.7.8-test"
+  assert_output_contains "3.4.2-test"
+  assert [ "${#lines[*]}" -eq "$((NUM_DEFINITIONS + 2))" ]
+}
+
+@test "installing definition from PYTHON_BUILD_DEFINITIONS by priority" {
+  export PYTHON_BUILD_DEFINITIONS="${TMP}/definitions:${TMP}/other"
+  mkdir -p "${TMP}/definitions"
+  echo true > "${TMP}/definitions/2.7.8-test"
+  mkdir -p "${TMP}/other"
+  echo false > "${TMP}/other/2.7.8-test"
+  run bin/python-build "2.7.8-test" "${TMP}/install"
+  assert_success ""
+}
+
+@test "installing nonexistent definition" {
+  run python-build "nonexistent" "${TMP}/install"
+  assert [ "$status" -eq 2 ]
+  assert_output "python-build: definition not found: nonexistent"
+}
+
+@test "sorting Python versions" {
+  export PYTHON_BUILD_ROOT="$TMP"
+  mkdir -p "${PYTHON_BUILD_ROOT}/share/python-build"
+  expected="2.7-dev
+2.7.8-preview1
+2.7.8-rc1
+2.7.8-p0
+2.7.8-p125
+3.4.0
+3.4.0-rc1
+3.4.1
+3.4.2
+3.4-dev
+2.2.0-dev
+jython-2.5.0
+jython-2.5.1
+jython-2.5.2
+jython-2.5.3
+jython-2.5.4-rc1
+jython-2.5-dev
+jython-2.7-beta1
+jython-2.7-beta2
+jython-2.7-beta3
+jython-dev"
+  for ver in "$expected"; do
+    touch "${PYTHON_BUILD_ROOT}/share/python-build/$ver"
+  done
+  run python-build --definitions
+  assert_success "$expected"
+}
+
+@test "removing duplicate Python versions" {
+  export PYTHON_BUILD_ROOT="$TMP"
+  export PYTHON_BUILD_DEFINITIONS="${PYTHON_BUILD_ROOT}/share/python-build"
+  mkdir -p "$PYTHON_BUILD_DEFINITIONS"
+  touch "${PYTHON_BUILD_DEFINITIONS}/2.7.8"
+  touch "${PYTHON_BUILD_DEFINITIONS}/3.4.2"
+
+  run python-build --definitions
+  assert_success
+  assert_output <<OUT
+2.7.8
+3.4.2
+OUT
+}
diff --git a/plugins/python-build/test/installer.bats b/plugins/python-build/test/installer.bats
index d0ba5054..ebb158d6 100644
--- a/plugins/python-build/test/installer.bats
+++ b/plugins/python-build/test/installer.bats
@@ -22,7 +22,7 @@ load test_helper
   PREFIX="${PWD}/usr" run "${BATS_TEST_DIRNAME}/../install.sh"
   assert_success ""
 
-  run $BASH -c 'ls -l usr/share/python-build | tail -2 | cut -d" " -f1'
+  run $BASH -c 'ls -l usr/share/python-build | tail -2 | cut -c1-10'
   assert_output <<OUT
 -rw-r--r--
 -rw-r--r--
diff --git a/plugins/python-build/test/pyenv.bats b/plugins/python-build/test/pyenv.bats
new file mode 100644
index 00000000..e92cf361
--- /dev/null
+++ b/plugins/python-build/test/pyenv.bats
@@ -0,0 +1,148 @@
+#!/usr/bin/env bats
+
+load test_helper
+export PYENV_ROOT="${TMP}/pyenv"
+
+setup() {
+  stub pyenv-hooks 'install : true'
+  stub pyenv-rehash 'true'
+}
+
+stub_python_build() {
+  stub python-build "--lib : $BATS_TEST_DIRNAME/../bin/python-build --lib" "$@"
+}
+
+@test "install proper" {
+  stub_python_build 'echo python-build "$@"'
+
+  run pyenv-install 3.4.2
+  assert_success "python-build 3.4.2 ${PYENV_ROOT}/versions/3.4.2"
+
+  unstub python-build
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+}
+
+@test "install pyenv local version by default" {
+  stub_python_build 'echo python-build "$1"'
+  stub pyenv-local 'echo 3.4.2'
+
+  run pyenv-install
+  assert_success "python-build 3.4.2"
+
+  unstub python-build
+  unstub pyenv-local
+}
+
+@test "list available versions" {
+  stub_python_build \
+    "--definitions : echo 2.6.9 2.7.9-rc1 2.7.9-rc2 3.4.2 | tr ' ' $'\\n'"
+
+  run pyenv-install --list
+  assert_success
+  assert_output <<OUT
+Available versions:
+  2.6.9
+  2.7.9-rc1
+  2.7.9-rc2
+  3.4.2
+OUT
+
+  unstub python-build
+}
+
+@test "nonexistent version" {
+  stub brew false
+  stub_python_build 'echo ERROR >&2 && exit 2' \
+    "--definitions : echo 2.6.9 2.7.9-rc1 2.7.9-rc2 3.4.2 | tr ' ' $'\\n'"
+
+  run pyenv-install 2.7.9
+  assert_failure
+  assert_output <<OUT
+ERROR
+
+The following versions contain \`2.7.9' in the name:
+  2.7.9-rc1
+  2.7.9-rc2
+
+See all available versions with \`pyenv install --list'.
+
+If the version you need is missing, try upgrading python-build:
+
+  cd ${BATS_TEST_DIRNAME}/.. && git pull
+OUT
+
+  unstub python-build
+}
+
+@test "Homebrew upgrade instructions" {
+  stub brew "--prefix : echo '${BATS_TEST_DIRNAME%/*}'"
+  stub_python_build 'echo ERROR >&2 && exit 2' \
+    "--definitions : true"
+
+  run pyenv-install 1.9.3
+  assert_failure
+  assert_output <<OUT
+ERROR
+
+See all available versions with \`pyenv install --list'.
+
+If the version you need is missing, try upgrading python-build:
+
+  brew update && brew upgrade pyenv
+OUT
+
+  unstub brew
+  unstub python-build
+}
+
+@test "no build definitions from plugins" {
+  assert [ ! -e "${PYENV_ROOT}/plugins" ]
+  stub_python_build 'echo $PYTHON_BUILD_DEFINITIONS'
+
+  run pyenv-install 3.4.2
+  assert_success ""
+}
+
+@test "some build definitions from plugins" {
+  mkdir -p "${PYENV_ROOT}/plugins/foo/share/python-build"
+  mkdir -p "${PYENV_ROOT}/plugins/bar/share/python-build"
+  stub_python_build "echo \$PYTHON_BUILD_DEFINITIONS | tr ':' $'\\n'"
+
+  run pyenv-install 3.4.2
+  assert_success
+  assert_output <<OUT
+
+${PYENV_ROOT}/plugins/bar/share/python-build
+${PYENV_ROOT}/plugins/foo/share/python-build
+OUT
+}
+
+@test "list build definitions from plugins" {
+  mkdir -p "${PYENV_ROOT}/plugins/foo/share/python-build"
+  mkdir -p "${PYENV_ROOT}/plugins/bar/share/python-build"
+  stub_python_build "--definitions : echo \$PYTHON_BUILD_DEFINITIONS | tr ':' $'\\n'"
+
+  run pyenv-install --list
+  assert_success
+  assert_output <<OUT
+Available versions:
+  
+  ${PYENV_ROOT}/plugins/bar/share/python-build
+  ${PYENV_ROOT}/plugins/foo/share/python-build
+OUT
+}
+
+@test "completion results include build definitions from plugins" {
+  mkdir -p "${PYENV_ROOT}/plugins/foo/share/python-build"
+  mkdir -p "${PYENV_ROOT}/plugins/bar/share/python-build"
+  stub python-build "--definitions : echo \$PYTHON_BUILD_DEFINITIONS | tr ':' $'\\n'"
+
+  run pyenv-install --complete
+  assert_success
+  assert_output <<OUT
+
+${PYENV_ROOT}/plugins/bar/share/python-build
+${PYENV_ROOT}/plugins/foo/share/python-build
+OUT
+}
diff --git a/plugins/python-build/test/version.bats b/plugins/python-build/test/version.bats
new file mode 100644
index 00000000..35260f01
--- /dev/null
+++ b/plugins/python-build/test/version.bats
@@ -0,0 +1,39 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+bats_bin="${BATS_TEST_DIRNAME}/../bin/python-build"
+static_version="$(grep VERSION "$bats_bin" | head -1 | cut -d'"' -f 2)"
+
+@test "python-build static version" {
+  stub git 'echo "ASPLODE" >&2; exit 1'
+  run python-build --version
+  assert_success "python-build ${static_version}"
+  unstub git
+}
+
+@test "python-build git version" {
+  stub git \
+    'remote -v : echo origin https://github.com/yyuu/pyenv.git' \
+    "describe --tags HEAD : echo v1984-12-gSHA"
+  run python-build --version
+  assert_success "python-build 1984-12-gSHA"
+  unstub git
+}
+
+@test "git describe fails" {
+  stub git \
+    'remote -v : echo origin https://github.com/yyuu/pyenv.git' \
+    "describe --tags HEAD : echo ASPLODE >&2; exit 1"
+  run python-build --version
+  assert_success "python-build ${static_version}"
+  unstub git
+}
+
+@test "git remote doesn't match" {
+  stub git \
+    'remote -v : echo origin https://github.com/Homebrew/homebrew.git' \
+    "describe --tags HEAD : echo v1984-12-gSHA"
+  run python-build --version
+  assert_success "python-build ${static_version}"
+}