v1.1.3

Automate release
v1.1.2
2025-11-08 11:33:55 -05:00 · 2018-05-24 12:28:04 +00:00 · 2018-05-24 12:27:02 +00:00 · 2018-05-18 00:59:28 +00:00 · 2018-03-29 12:20:50 +09:00 · 2018-03-29 03:17:49 +00:00
37 changed files with 2502 additions and 1053 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,9 @@ language: c
 notifications:
  email:
    on_success: never
+deploy:
+  provider: releases
+  api_key:
+    secure: DsGAt0UmTSGVfsNJ6LmM+LvsV6FYmvX4FcET82XrskPiQW+N8+8JZR8WuZxfmwdJZu+dkkdoq6gYgL2xF7m4LxRG7aw3B5TtbMTrJQeW0hdtCSBwbbYyvwcp2m7ywE8lGAfZQITaGj1R6f2Cgh8cgtcrErjcF0KJsYlVlgNv+/M=
+  on:
+    tags: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,64 @@
 ## Version History

+#### 1.1.2
+
+* Use custom get-pip URL based on the target version (#253, #254, #255)
+* Source conda 4.4.4 shell files (#251)
+* Evaluate force flag before testing if venv exists (#232)
+
+#### 1.1.1
+
+* Set `CONDA_PREFIX` to make is useable in conda activate/deactivate scripts (#224)
+* Generate `pydoc` executable after creating new virtualenv (#197, #230)
+
+#### 1.1.0
+
+* fish: use "set -gx" instead of "setenv" (#215, #216, #217, #218)
+
+#### 1.0.0
+
+* Use similar versioning scheme as pyenv; YYYYMMDD -> X.Y.Z
+
+#### 20160716
+
+* Suppress activate/deactivate messages by default (#169, #170, #171)
+* Source conda package activate/deactivat scripts if exist (#173)
+* Use `source` in favor of `.` for `fish` (#175)
+* Use `python -m venv` instead of `pyvenv` due to deprecation of `pyvenv` after 3.6 (#184, #185)
+
+#### 20160315
+
+* Evaluate `${PATH}` when outputted code is eval'd. (#154)
+* Set proper `CONDA_DEFAULT_ENV` for shorter name (#160)
+
+#### 20160202
+
+* Install virtualenv 13.1.2 for CPython/Stackless 3.2.x (yyuu/pyenv#531)
+
+#### 20160112
+
+* Fix problem with `virtualenv` to look up executables from source version with `--system-site-packages` (#62)
+
+#### 20151229
+
+* Fix `deactivate` error on `fish` (#136)
+
+#### 20151222
+
+* Improved interoperability with Anaconda/Miniconda (#103, #106, #107, #108)
+* Create `virtualenv` inside `envs` directory of source version, like Anaconda/Miniconda (#103, #107)
+* Rewrite `pyenv activate` and `pyenv deactivate` without using scripts provided by virtualenv and conda (#51, #69, #103, #104, #121)
+* Improve the `pyenv activate` behaviour on multiple versions (#105, #111)
+* Reject creating a virtualenv named `system` (yyuu/pyenv#475)
+* Add `--skip-aliases` to `pyenv virtualenvs` (#120)
+* Stop showing `version not installed` warning messages in precmd (#49)
+
+#### 20151103
+
+* Passing return value from executed command. (#100)
+* Add workaround for commands installed in a virtual environment created by `pyvenv` (#62)
+* init: zsh: prepend hook to `precmd_functions` (#101)
+
 #### 20151006

 * Ignore user's site-packages on ensurepip/get-pip (#89)
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013 Yamashita, Yuu
+Copyright (c) 2015 Yamashita, Yuu

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -1,13 +1,15 @@
 # pyenv-virtualenv

-[![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.svg)](https://travis-ci.org/yyuu/pyenv-virtualenv)
+[![Join the chat at https://gitter.im/yyuu/pyenv-virtualenv](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/yyuu/pyenv-virtualenv?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-pyenv-virtualenv is a [pyenv](https://github.com/yyuu/pyenv) plugin
+[![Build Status](https://travis-ci.org/pyenv/pyenv-virtualenv.svg?branch=master)](https://travis-ci.org/pyenv/pyenv-virtualenv)
+
+pyenv-virtualenv is a [pyenv](https://github.com/pyenv/pyenv) plugin
 that provides features to manage virtualenvs and conda environments
 for Python on UNIX-like systems.

 (NOTICE: If you are an existing user of [virtualenvwrapper](http://pypi.python.org/pypi/virtualenvwrapper)
-and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtualenvwrapper) may help you
+and you love it, [pyenv-virtualenvwrapper](https://github.com/pyenv/pyenv-virtualenvwrapper) may help you
 (additionally) to manage your virtualenvs.)

 ## Installation
@@ -15,7 +17,7 @@ and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtual
 ### Installing as a pyenv plugin

 This will install the latest development version of pyenv-virtualenv into
-the `~/.pyenv/plugins/pyenv-virtualenv` directory.
+the `$(pyenv root)/plugins/pyenv-virtualenv` directory.

 **Important note:**  If you installed pyenv into a non-standard directory, make
 sure that you clone this repo into the 'plugins' directory of wherever you
@@ -28,22 +30,29 @@ From inside that directory you can:

 1. **Check out pyenv-virtualenv into plugin directory**

-    ```
-    $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+    ```sh
+    $ git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv
    ```

-2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenv. This is entirely optional but pretty useful.
+2. (OPTIONAL) **Add `pyenv virtualenv-init` to your shell** to enable auto-activation of virtualenvs. This is entirely optional but pretty useful. See "Activate virtualenv" below.

-    ```
+    ```sh
    $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
    ```

+    **Fish shell note**:  Add this to your `~/.config/fish/config.fish`
+
+    ```sh
+    status --is-interactive; and source (pyenv virtualenv-init -|psub)
+    ```
+
    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
+    
    **Pyenv note**: You may also need to add `eval "$(pyenv init -)"` to your profile if you haven't done so already.

 3. **Restart your shell to enable pyenv-virtualenv**

-    ```
+    ```sh
    $ exec "$SHELL"
    ```

@@ -58,18 +67,18 @@ installed, you will also be able to use the `pyenv virtualenv` command.
 *This is the recommended method of installation if you installed pyenv
 with Homebrew.*

-```
+```sh
 $ brew install pyenv-virtualenv
 ```

 Or, if you would like to install the latest development release:

-```
+```sh
 $ brew install --HEAD pyenv-virtualenv
 ```

 After installation, you'll still need to add 
-```
+```sh
 eval "$(pyenv init -)"
 eval "$(pyenv virtualenv-init -)"
 ```
@@ -84,11 +93,11 @@ To create a virtualenv for the Python version used with pyenv, run
 `pyenv virtualenv`, specifying the Python version you want and the name
 of the virtualenv directory. For example,

-```
+```sh
 $ pyenv virtualenv 2.7.10 my-virtual-env-2.7.10
 ```

-will create a virtualenv based on Python 2.7.10 under `~/.pyenv/versions` in a
+will create a virtualenv based on Python 2.7.10 under `$(pyenv root)/versions` in a
 folder called `my-virtual-env-2.7.10`.


@@ -97,7 +106,7 @@ folder called `my-virtual-env-2.7.10`.
 If there is only one argument given to `pyenv virtualenv`, the virtualenv will
 be created with the given name based on the current pyenv Python version.

-```
+```sh
 $ pyenv version
 3.4.3 (set by /home/yyuu/.pyenv/version)
 $ pyenv virtualenv venv34
@@ -108,23 +117,26 @@ $ pyenv virtualenv venv34

 `pyenv virtualenvs` shows you the list of existing virtualenvs and `conda` environments.

-```
-$ pyenv shell venv27
+```sh
+$ pyenv shell venv34
 $ pyenv virtualenvs
  miniconda3-3.9.1 (created from /home/yyuu/.pyenv/versions/miniconda3-3.9.1)
  miniconda3-3.9.1/envs/myenv (created from /home/yyuu/.pyenv/versions/miniconda3-3.9.1)
-* venv27 (created from /home/yyuu/.pyenv/versions/2.7.10)
-  venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
+  2.7.10/envs/my-virtual-env-2.7.10 (created from /home/yyuu/.pyenv/versions/2.7.10)
+  3.4.3/envs/venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
+  my-virtual-env-2.7.10 (created from /home/yyuu/.pyenv/versions/2.7.10)
+* venv34 (created from /home/yyuu/.pyenv/versions/3.4.3)
 ```

+There are two entries for each virtualenv, and the shorter one is just a symlink.
+

 ### Activate virtualenv

 Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might
 require you to `activate` the virtualenv and `conda` environments.

-`pyenv-virtualenv` will automatically activate/deactivate the virtualenv if
-the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
+If `eval "$(pyenv virtualenv-init -)"` is configured in your shell, `pyenv-virtualenv` will automatically activate/deactivate virtualenvs on entering/leaving directories which contain a `.python-version` file that contains the name of a valid virtual environment as shown in the output of `pyenv virtualenvs` (e.g., `venv34` or `3.4.3/envs/venv34` in example above) . `.python-version` files are used by pyenv to denote local Python versions and can be created and deleted with the [`pyenv local`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-local) command.

 You can also activate and deactivate a pyenv virtualenv manually:

@@ -136,56 +148,67 @@ pyenv deactivate

 ### Delete existing virtualenv

-Removing the directory in `~/.pyenv/versions` will delete the virtualenv, or you can run:
+Removing the directories in `$(pyenv root)/versions` and `$(pyenv root)/versions/{version}/envs` will delete the virtualenv, or you can run:

 ```sh
 pyenv uninstall my-virtual-env
 ```


-### virtualenv and pyvenv
+### virtualenv and venv

 There is a [venv](http://docs.python.org/3/library/venv.html) module available
 for CPython 3.3 and newer.
-It provides a command-line tool `pyvenv` which is the successor of `virtualenv`
+It provides an executable module `venv` which is the successor of `virtualenv`
 and distributed by default.

-`pyenv-virtualenv` uses `pyvenv` if it is available and the `virtualenv`
+`pyenv-virtualenv` uses `python -m venv` if it is available and the `virtualenv`
 command is not available.


 ### Anaconda and Miniconda

-Because Anaconda and Miniconda may install standard commands (e.g. `curl`, `openssl`, `sqlite3`, etc.) into their prefix,
-we'd recommend you to install [pyenv-which-ext](https://github.com/yyuu/pyenv-which-ext).
-
-You can manage `conda` environments by `conda env` as same manner as standard Anaconda/Miniconda installations.
+You can manage `conda` environments by `conda create` as same manner as standard Anaconda/Miniconda installations.
 To use those environments, you can use `pyenv activate` and `pyenv deactivate`.

-```
-(root)$ pyenv version
+```sh
+$ pyenv version
 miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
-(root)$ conda env list
+$ conda env list
 # conda environments:
 #
 myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv
 root                  *  /home/yyuu/.pyenv/versions/miniconda3-3.9.1
-(root)$ pyenv activate myenv
+$ pyenv activate miniconda3-3.9.1/envs/myenv
 discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/bin from PATH
 prepending /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin to PATH
-(myenv)$ python --version
+$ python --version
 Python 3.4.3 :: Continuum Analytics, Inc.
-(myenv)$ pyenv deactivate
+$ pyenv deactivate
 discarding /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin from PATH
 ```

+If `conda` is available, `pyenv virtualenv` will use it to create environment by `conda create`.
+
+```sh
+$ pyenv version
+miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
+$ pyenv virtualenv myenv2
+$ conda env list
+# conda environments:
+#
+myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv
+myenv                    /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv2
+root                  *  /home/yyuu/.pyenv/versions/miniconda3-3.9.1
+```
+
 You can use version like `miniconda3-3.9.1/envs/myenv` to specify `conda` environment as a version in pyenv.

-```
-(root)$ pyenv version
+```sh
+$ pyenv version
 miniconda3-3.9.1 (set by /home/yyuu/.pyenv/version)
-(root)$ pyenv shell miniconda3-3.9.1/envs/myenv
-(myenv)$ which python
+$ pyenv shell miniconda3-3.9.1/envs/myenv
+$ which python
 /home/yyuu/.pyenv/versions/miniconda3-3.9.1/envs/myenv/bin/python
 ```

@@ -199,11 +222,11 @@ You can set certain environment variables to control pyenv-virtualenv.
 * `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install the desired
  version of virtualenv. If `virtualenv` has not been installed,
  pyenv-virtualenv will try to install the given version of virtualenv.
-* `GET_PIP`, if set and `pyvenv` is preferred over `virtualenv`,
+* `GET_PIP`, if set and `venv` is preferred over `virtualenv`,
  use `get_pip.py` from the specified location.
-* `GET_PIP_URL`, if set and `pyvenv` is preferred over
+* `GET_PIP_URL`, if set and `venv` is preferred over
  `virtualenv`, download `get_pip.py` from the specified URL.
-* `PIP_VERSION`, if set and `pyvenv` is preferred
+* `PIP_VERSION`, if set and `venv` is preferred
  over `virtualenv`, install the specified version of pip.


@@ -216,7 +239,7 @@ See [CHANGELOG.md](CHANGELOG.md).

 (The MIT License)

-* Copyright (c) 2013 Yamashita, Yuu
+* Copyright (c) 2015 Yamashita, Yuu

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -14,8 +14,16 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-unset NOERROR
-unset VERBOSE
+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+unset FORCE
+unset QUIET

 while [ $# -gt 0 ]; do
  case "$1" in
@@ -24,15 +32,18 @@ while [ $# -gt 0 ]; do
    echo --unset
    exec pyenv-virtualenvs --bare
    ;;
-  "--no-error" )
-    NOERROR=1
+  "-f" | "--force" )
+    FORCE=1
+    ;;
+  "-q" | "--quiet" )
+    QUIET=1
    ;;
  "--unset" )
-    echo "pyenv deactivate"
-    exit
+    exec pyenv-sh-deactivate
    ;;
-  "--verbose" )
-    VERBOSE=1
+  "-v" | "--verbose" )
+    unset QUIET
+    PYENV_VIRTUALENV_VERBOSE_ACTIVATE=1
    ;;
  * )
    break
@@ -46,7 +57,7 @@ versions=("$@")
 if [ -z "${versions}" ]; then
  no_shell=1
  OLDIFS="$IFS"
-  IFS=: versions=($(pyenv-version-name))
+  IFS=: versions=($(pyenv-version-name 2>/dev/null))
  IFS="$OLDIFS"
 fi

@@ -56,97 +67,192 @@ if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
  no_shell=
 fi

-if [ "${#versions[@]}" -gt 1 ]; then
-  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
-  echo "false"
-  exit 1
+venv="${versions}"
+
+if [ -n "${VIRTUAL_ENV}" ]; then
+  # exit as success if some virtualenv is already activated outside from pyenv-virtualenv
+  if [ -z "${PYENV_VIRTUAL_ENV}" ]; then
+    if [ -z "${FORCE}" ]; then
+      if [ -z "${QUIET}" ]; then
+        echo "pyenv-virtualenv: virtualenv \`${VIRTUAL_ENV}' is already activated" 1>&2
+      fi
+      echo "true"
+      exit 0
+    fi
+  fi
 fi

-if pyenv-prefix "${versions}" 1>/dev/null 2>&1; then
-  if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
-    echo "false"
-    exit 1
-  fi
-else
-  version="$(pyenv-version-name)"
-  if [[ "${versions}" == "root" ]]; then
-    versions="${version%/envs/*}"
+if ! pyenv-virtualenv-prefix "${venv}" 1>/dev/null 2>&1; then
+  # fallback to virtualenv of current version
+  OLDIFS="$IFS"
+  IFS=: current_versions=($(pyenv-version-name))
+  IFS="$OLDIFS"
+  new_venv="${current_versions%/envs/*}/envs/${venv}"
+  if pyenv-virtualenv-prefix "${new_venv}" 1>/dev/null 2>&1; then
+    venv="${new_venv}"
+    versions[0]="${new_venv}"
  else
-    versions="${version%/envs/*}/envs/${versions}"
-  fi
-  if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not an environment of anaconda/miniconda" 1>&2
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: version \`${venv}' is not a virtualenv" 1>&2
+    fi
    echo "false"
    exit 1
  fi
 fi

+# exit as error if there are multiple virtualenvs
+# https://github.com/yyuu/pyenv-virtualenv/issues/105
+for version in "${versions[@]}"; do
+  if [[ "${version}" != "${venv}" ]]; then
+    if pyenv-virtualenv-prefix "${version}" 1>/dev/null 2>&1; then
+      if [ -z "${QUIET}" ]; then
+        echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+      fi
+      echo "false"
+      exit 1
+    fi
+  fi
+done
+
 shell="${PYENV_SHELL:-${SHELL##*/}}"
-prefix="$(pyenv-prefix "${versions}")"
+prefix="$(pyenv-prefix "${venv}")"

-unset conda_env
+if [ -L "${prefix}" ]; then
+  prefix="$(resolve_link "${prefix}" 2>/dev/null)"
+fi

-if [ -f "${prefix}/bin/conda" ]; then
-  if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]]; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda" 1>&2
-    echo "false"
-    exit 1
-  fi
-  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
-    conda_env="${prefix##*/envs/}"
-  else
-    conda_env="root"
+# exit as success if the virtualenv is already activated
+if [[ "${VIRTUAL_ENV}" == "${prefix}" ]]; then
+  if [ -z "${FORCE}" ]; then
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: version \`${venv}' is already activated" 1>&2
+    fi
+    echo "true"
+    exit 0
  fi
 fi

-# Display setup instruction, if pyenv-virtualenv has not been initialized.
-# if 'pyenv virtualenv-init -' is not found in "$profile"
-if [ -z "$PYENV_VIRTUALENV_INIT" ]; then
-  pyenv-virtualenv-init >&2 || true
-fi
+pyenv-sh-deactivate --force --quiet || true

-if [ -n "$VERBOSE" ]; then
-  echo "pyenv-virtualenv: activate ${versions}" 1>&2
+if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then
+  echo "pyenv-virtualenv: activate ${venv}" 1>&2
 fi

 if [ -z "$no_shell" ]; then
-  echo "pyenv shell \"${versions}\";"
  # shell version set in pyenv-sh-activate should be unset
  # https://github.com/yyuu/pyenv-virtualenv/issues/61
+  OLDIFS="$IFS"
+  IFS=:
  case "$shell" in
  fish )
-    echo "setenv PYENV_ACTIVATE_SHELL 1;"
+    cat <<EOS
+set -gx PYENV_VERSION "${versions[*]}";
+set -gx PYENV_ACTIVATE_SHELL 1;
+EOS
    ;;
  * )
-    echo "export PYENV_ACTIVATE_SHELL=1;"
+    cat <<EOS
+export PYENV_VERSION="${versions[*]}";
+export PYENV_ACTIVATE_SHELL=1;
+EOS
+    ;;
+  esac
+  IFS="$OLDIFS"
+fi
+
+# virtualenv/venv
+case "${shell}" in
+fish )
+  cat <<EOS
+set -gx PYENV_VIRTUAL_ENV "${prefix}";
+set -gx VIRTUAL_ENV "${prefix}";
+EOS
+  ;;
+* )
+  cat <<EOS
+export PYENV_VIRTUAL_ENV="${prefix}";
+export VIRTUAL_ENV="${prefix}";
+EOS
+  ;;
+esac
+
+# anaconda/miniconda
+if [ -x "${prefix}/bin/conda" ]; then
+  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
+    CONDA_DEFAULT_ENV="${venv##*/envs/}"
+  else
+    CONDA_DEFAULT_ENV="root"
+  fi
+  case "${shell}" in
+  fish )
+    echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
+    ;;
+  * )
+    echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
    ;;
  esac
 fi

-if [ -n "${conda_env}" ]; then
-  # anaconda/miniconda
-  cat <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${prefix}";
-. "${prefix%/envs/*}/bin/activate" "${conda_env}";
-EOS
-else
-  # virtualenv/pyvenv
-  case "$shell" in
+if [ -n "${PYTHONHOME}" ]; then
+  case "${shell}" in
  fish )
    cat <<EOS
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${prefix}";
-. "${prefix}/bin/activate.fish";
+set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
+set -e PYTHONHOME;
 EOS
-   ;;
-  *    )
+    ;;
+  * )
    cat <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${prefix}";
-. "${prefix}/bin/activate";
+export _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME}";
+unset PYTHONHOME;
 EOS
    ;;
  esac
 fi
+
+PYENV_VIRTUALENV_DISABLE_PROMPT="${PYENV_VIRTUALENV_DISABLE_PROMPT:-${PYENV_VIRTUAL_ENV_DISABLE_PROMPT}}"
+PYENV_VIRTUALENV_DISABLE_PROMPT="${PYENV_VIRTUALENV_DISABLE_PROMPT:-${VIRTUAL_ENV_DISABLE_PROMPT}}"
+
+if [ -z "${PYENV_VIRTUALENV_DISABLE_PROMPT}" ]; then
+  case "${shell}" in
+  fish )
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: prompt changing not working for fish." 1>&2
+    fi
+    ;;
+  * )
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior." 1>&2
+    fi
+    cat <<EOS
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(${venv}) \${PS1}";
+EOS
+    ;;
+  esac
+fi
+
+# conda package anaconda/miniconda scripts (#173)
+if [ -x "${prefix}/bin/conda" ]; then
+  shopt -s nullglob
+  case "${shell}" in
+  fish )
+    # conda 4.4 and above
+    for script in "${prefix}/etc/fish/conf.d"/*.fish; do
+      echo "source \"${script}\";"
+    done
+    ;;
+  * )
+    CONDA_PREFIX="$prefix"
+    echo "export CONDA_PREFIX=\"${CONDA_PREFIX}\";"
+    for script in "${prefix}/etc/conda/activate.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
+    # conda 4.4 and above
+    for script in "${prefix}/etc/profile.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
+    ;;
+  esac
+  shopt -u nullglob
+fi
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -9,16 +9,24 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-unset NOERROR
-unset VERBOSE
+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
+unset FORCE
+unset QUIET

 while [ $# -gt 0 ]; do
  case "$1" in
-  "--no-error" )
-    NOERROR=1
+  "-f" | "--force" )
+    FORCE=1
    ;;
-  "--verbose" )
-    VERBOSE=1
+  "-q" | "--quiet")
+    QUIET=1
+    ;;
+  "-v" | "--verbose" )
+    unset QUIET
+    PYENV_VIRTUALENV_VERBOSE_ACTIVATE=1
    ;;
  * )
    break
@@ -27,94 +35,158 @@ while [ $# -gt 0 ]; do
  shift 1
 done

-shell="$(basename "${PYENV_SHELL:-$SHELL}")"
-prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
-
-unset conda_env
-
-if [ -f "${prefix}/bin/conda" ]; then
-  if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]]; then
-    [ -n "$NOERROR" ] || echo "pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda" 1>&2
+if [ -z "${VIRTUAL_ENV}" ]; then
+  if [ -z "${FORCE}" ]; then
+    if [ -z "${QUIET}" ]; then
+      echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2
+    fi
    echo "false"
    exit 1
  fi
-  if [[ "${prefix}" != "${prefix%/envs/*}" ]]; then
-    conda_env="${prefix##*/envs/}"
-  else
-    conda_env="root"
-  fi
 fi

-if [ -n "${conda_env}" ]; then
-  echo "if [ -f \"${prefix%/envs/*}/bin/deactivate\" ]; then"
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"
+prefix="${VIRTUAL_ENV}"
+
+if [[ "${prefix%/*/envs/*}" == "${PYENV_ROOT}/versions" ]]; then
+  venv="${prefix#${PYENV_ROOT}/versions/}"
 else
-  case "$shell" in
+  venv="${prefix##*/}"
+fi
+
+if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then
+  echo "pyenv-virtualenv: deactivate ${venv}" 1>&2
+fi
+
+# conda package anaconda/miniconda scripts (#173)
+if [ -x "${prefix}/bin/conda" ]; then
+  shopt -s nullglob
+  case "${shell}" in
  fish )
-    echo "if functions -q deactivate;"
+    : # conda doesn't support fish
    ;;
-  *    )
-    echo "if declare -f deactivate 1>/dev/null 2>&1; then"
+  * )
+    for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
+    echo "unset CONDA_PREFIX"
    ;;
  esac
-fi
-
-if [ -n "$VERBOSE" ]; then
-  echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
+  shopt -u nullglob
 fi

 if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
  # shell version set in pyenv-sh-activate should be unset
  # https://github.com/yyuu/pyenv-virtualenv/issues/61
-  echo "  pyenv shell --unset;"
  case "$shell" in
  fish )
-    echo "  set -e PYENV_ACTIVATE_SHELL;"
+    cat <<EOS
+set -e PYENV_VERSION;
+set -e PYENV_ACTIVATE_SHELL;
+EOS
    ;;
  * )
-    echo "  unset PYENV_ACTIVATE_SHELL;"
-    ;;
-  esac
-fi
-
-if [ -n "${conda_env}" ]; then
-  cat <<EOS
-  export PYENV_DEACTIVATE="$prefix";
-  unset PYENV_ACTIVATE;
-  . "${prefix%/envs/*}/bin/deactivate";
-else
-EOS
-else
-  case "$shell" in
-  fish )
    cat <<EOS
-  setenv PYENV_DEACTIVATE "$prefix";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-EOS
-    ;;
-  *    )
-    cat <<EOS
-  export PYENV_DEACTIVATE="$prefix";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
+unset PYENV_VERSION;
+unset PYENV_ACTIVATE_SHELL;
 EOS
    ;;
  esac
 fi

-if [ -z "$NOERROR" ]; then
-  echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
-fi
-
-echo "  false;"
-
-case "$shell" in
+# virtualenv/venv
+case "${shell}" in
 fish )
-  echo "end;"
+  cat <<EOS
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+EOS
  ;;
-*    )
-  echo "fi;"
+* )
+  cat <<EOS
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+EOS
+  ;;
+esac
+
+# anaconda/miniconda
+if [ -n "${CONDA_DEFAULT_ENV}" ]; then
+  case "${shell}" in
+  fish )
+    echo "set -e CONDA_DEFAULT_ENV;"
+    ;;
+  * )
+    echo "unset CONDA_DEFAULT_ENV;"
+    ;;
+  esac
+fi
+
+case "${shell}" in
+fish )
+  cat <<EOS
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+EOS
+  ;;
+* )
+  cat <<EOS
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+EOS
+  ;;
+esac
+
+case "${shell}" in
+fish )
+  cat <<EOS
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+EOS
+  ;;
+* )
+  cat <<EOS
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+EOS
+  ;;
+esac
+
+case "${shell}" in
+fish )
+  :
+  ;;
+* )
+  cat <<EOS
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+EOS
+  ;;
+esac
+
+case "${shell}" in
+fish )
+  cat <<EOS
+if functions -q deactivate;
+  functions -e deactivate;
+end;
+EOS
+  ;;
+* )
+  cat <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
+fi;
+EOS
  ;;
 esac
--- a/bin/pyenv-virtualenv
+++ b/bin/pyenv-virtualenv
@@ -9,20 +9,20 @@
 #   -f/--force       Install even if the version appears to be installed already
 #

-PYENV_VIRTUALENV_VERSION="20151006"
+PYENV_VIRTUALENV_VERSION="1.1.3"

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
  exec pyenv-versions --bare
 fi

-if [ -z "$PYENV_ROOT" ]; then
-  PYENV_ROOT="${HOME}/.pyenv"
-fi
-
 unset PIP_REQUIRE_VENV
 unset PIP_REQUIRE_VIRTUALENV

@@ -103,45 +103,55 @@ http_get_wget() {
 version() {
  detect_venv
  local version
-  if [ -n "$USE_PYVENV" ]; then
-    version="$(pyenv-which pyvenv 2>/dev/null || true)"
-    version="${version#$(pyenv-root)/versions/}"
-    version="${version%/bin/pyvenv}"
-    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv ${version:-unknown})"
+  if [ -n "${USE_CONDA}" ]; then
+    version="$(pyenv-exec conda --version 2>/dev/null || true)"
+    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (conda ${version:-unknown})"
  else
-    version="$(venv --version 2>/dev/null || true)"
-    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
+    if [ -n "$USE_M_VENV" ]; then
+      echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (python -m venv)"
+    else
+      version="$(pyenv-exec virtualenv --version 2>/dev/null || true)"
+      echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
+    fi
  fi
 }

 usage() {
  # We can remove the sed fallback once pyenv 0.2.0 is widely available.
  pyenv-help virtualenv 2>/dev/null || sed -ne '/^#/!q;s/.//;s/.//;1,4d;p' < "$0"
-  venv --help 2>/dev/null || true
+  if [ -n "${USE_CONDA}" ]; then
+    pyenv-exec conda create --help 2>/dev/null || true
+  else
+    if [ -n "${USE_M_VENV}" ]; then
+      pyenv-exec python -m venv --help 2>/dev/null || true
+    else
+      pyenv-exec virtualenv --help 2>/dev/null || true
+    fi
+  fi
  [ -z "$1" ] || exit "$1"
 }

 detect_venv() {
  # Check the existence of executables as a workaround for the issue with pyenv-which-ext
  # https://github.com/yyuu/pyenv-virtualenv/issues/26
-  if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
-    HAS_VIRTUALENV=1
-  fi
-  if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
-    HAS_PYVENV=1
-  fi
-  # Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given
-  if [ -n "${HAS_PYVENV}" ] && [ -z "${HAS_VIRTUALENV}" ] && [ -z "${VIRTUALENV_PYTHON}" ]; then
-    USE_PYVENV=1
-  fi
-}
-
-venv() {
-  local args=("$@")
-  if [ -n "${USE_PYVENV}" ]; then
-    pyenv-exec pyvenv "${args[@]}"
+  local prefix="$(pyenv-prefix)"
+  if [ -x "${prefix}/bin/conda" ]; then
+    HAS_CONDA=1
  else
-    pyenv-exec virtualenv "${args[@]}"
+    if [ -x "${prefix}/bin/virtualenv" ]; then
+      HAS_VIRTUALENV=1
+    fi
+    if pyenv-exec python -m venv --help 1>/dev/null 2>&1; then
+      HAS_M_VENV=1
+    fi
+  fi
+  # Use `python -m venv` only if there is venv available, virtualenv is not installed, and `-p` not given
+  if [ -n "${HAS_CONDA}" ]; then
+    USE_CONDA=1
+  else
+    if [ -n "${HAS_M_VENV}" ] && [ -z "${HAS_VIRTUALENV}" ] && [ -z "${VIRTUALENV_PYTHON}" ]; then
+      USE_M_VENV=1
+    fi
  fi
 }

@@ -152,7 +162,7 @@ build_package_ez_setup() {
      echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
      cat "${EZ_SETUP}"
    else
-      [ -n "${EZ_SETUP_URL}" ] || EZ_SETUP_URL="https://bootstrap.pypa.io/ez_setup.py"
+      [ -n "${EZ_SETUP_URL}" ]
      echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
      http get "${EZ_SETUP_URL}"
    fi
@@ -170,7 +180,7 @@ build_package_get_pip() {
      echo "Installing pip from ${GET_PIP}..." 1>&2
      cat "${GET_PIP}"
    else
-      [ -n "${GET_PIP_URL}" ] || GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
+      [ -n "${GET_PIP_URL}" ]
      echo "Installing pip from ${GET_PIP_URL}..." 1>&2
      http get "${GET_PIP_URL}"
    fi
@@ -215,10 +225,11 @@ fi
 VIRTUALENV_OPTIONS=()

 unset FORCE
-unset VIRTUALENV_PYTHON
+unset NO_ENSUREPIP
 unset QUIET
 unset UPGRADE
 unset VERBOSE
+unset VIRTUALENV_PYTHON

 parse_options "$@"
 for option in "${OPTIONS[@]}"; do
@@ -229,6 +240,14 @@ for option in "${OPTIONS[@]}"; do
  "h" | "help" )
    usage 0
    ;;
+  "no-pip" )
+    NO_ENSUREPIP=1
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    ;;
+  "no-setuptools" )
+    NO_ENSUREPIP=1
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    ;;
  "p" | "python" )
    VIRTUALENV_PYTHON="${ARGUMENTS[0]}"
    ARGUMENTS=("${ARGUMENTS[@]:1}") # shift 1
@@ -246,6 +265,10 @@ for option in "${OPTIONS[@]}"; do
    version
    exit 0
    ;;
+  "without-pip" )
+    NO_ENSUREPIP=1
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    ;;
  * ) # virtualenv long options
    if [[ "$option" == "python="* ]]; then
      VIRTUALENV_PYTHON="${option#python=}"
@@ -261,28 +284,43 @@ if [[ "${#ARGUMENTS[@]}" == 0 ]]; then
  exit 1
 elif [[ "${#ARGUMENTS[@]}" == 1 ]]; then
  # If only one argument given, use current version as source version
-  VERSION_NAME="$(pyenv-version-name)"
+  OLDIFS="${IFS}"
+  IFS=:
+  VERSION_NAMES=($(pyenv-version-name))
+  IFS="${OLDIFS}"
+  VERSION_NAME="${VERSION_NAMES}"
  VIRTUALENV_NAME="${ARGUMENTS[0]}"
 else
  # Otherwise, use former as source version, and latter as virtualenv version
  VERSION_NAME="${ARGUMENTS[0]}"
-  VIRTUALENV_NAME="${ARGUMENTS[1]##*/}"
+  VIRTUALENV_NAME="${ARGUMENTS[1]}"
 fi

 if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
  usage 1
 fi

+if [[ "${VIRTUALENV_NAME##*/}" == "system" ]]; then
+  echo "pyenv-virtualenv: \`system' is not allowed as virtualenv name." 1>&2
+  exit 1
+fi
+
 if [ "$VIRTUALENV_NAME" != "${VIRTUALENV_NAME%[[:space:]]*}" ]; then
  echo "pyenv-virtualenv: no whitespace allowed in virtualenv name." 1>&2
  exit 1
 fi

+if [ "${VIRTUALENV_NAME}" != "${VIRTUALENV_NAME%/*}" ] && [[ "${VIRTUALENV_NAME}" != "${VERSION_NAME%%/*}/envs/${VIRTUALENV_NAME##*/}" ]] ; then
+  echo "pyenv-virtualenv: no slash allowed in virtualenv name." 1>&2
+  exit 1
+fi
+
 # Set VERSION_NAME as default version in this script
 export PYENV_VERSION="${VERSION_NAME}"

 # Source version must exist before creating virtualenv.
-if ! pyenv-prefix 1>/dev/null 2>&1; then
+PREFIX="$(pyenv-prefix 2>/dev/null || true)"
+if [ ! -d "${PREFIX}" ]; then
  echo "pyenv-virtualenv: \`${PYENV_VERSION}' is not installed in pyenv." 1>&2
  exit 1
 fi
@@ -293,11 +331,36 @@ else
  TMP="${TMPDIR%/}"
 fi

+# Not create `system/envs` directory even if source version is `system`
+if [[ "${VERSION_NAME%/envs/*}" == "system" ]]; then
+  VIRTUALENV_NAME="${VIRTUALENV_NAME##*/}"
+else
+  VIRTUALENV_PREFIX="$(pyenv-virtualenv-prefix 2>/dev/null || true)"
+  if [[ "${VIRTUALENV_PREFIX%/*}" == "${PYENV_ROOT}/versions" ]]; then
+    VIRTUALENV_NAME="${VIRTUALENV_PREFIX#${PYENV_ROOT}/versions/}/envs/${VIRTUALENV_NAME##*/}"
+  else
+    VIRTUALENV_NAME="${VERSION_NAME}/envs/${VIRTUALENV_NAME##*/}"
+  fi
+fi
+
 VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
+if [[ "${VIRTUALENV_PATH/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then
+  COMPAT_VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME##*/}"
+fi
+
+if [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
+  if [ -z ${FORCE} ]; then
+    if [ -e "${COMPAT_VIRTUALENV_PATH}" ] || [ -L "${COMPAT_VIRTUALENV_PATH}" ]; then
+      echo "pyenv-virtualenv: \`${COMPAT_VIRTUALENV_PATH}' already exists." 1>&2
+      exit 1
+    fi
+  fi
+fi

 unset HAS_VIRTUALENV
-unset HAS_PYVENV
-unset USE_PYVENV
+unset HAS_M_VENV
+unset USE_CONDA
+unset USE_M_VENV
 detect_venv

 SEED="$(date "+%Y%m%d%H%M%S").$$"
@@ -307,44 +370,76 @@ REQUIREMENTS="${TMP}/requirements.${SEED}.txt"
 # Upgrade existing virtualenv
 if [ -n "$UPGRADE" ]; then
  FORCE=1
-  # pyvenv has `--upgrade` by default
-  if [ -n "${USE_PYVENV}" ]; then
+  # `python -m venv` has `--upgrade` by default
+  if [ -n "${USE_M_VENV}" ]; then
    unset UPGRADE
    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--upgrade"
  fi
 fi

-if [ -n "${USE_PYVENV}" ]; then
-  # Unset some arguments not supported by pyvenv
-  unset QUIET
-  unset VERBOSE
+if [ -z "${VIRTUALENV_VERSION}" ]; then
+  case "${PYENV_VERSION}" in
+  "3.0"* )
+    NO_ENSUREPIP=1
+    ;;
+  "3.1"* )
+    NO_ENSUREPIP=1
+    ;;
+  "3.2"* | "stackless-3.2"* )
+    # pip 8.x (bundled with virtualenv 14+) doesn't support 3.2 anymore
+    # https://github.com/yyuu/pyenv/issues/531
+    VIRTUALENV_VERSION="13.1.2"
+    NO_ENSUREPIP=1
+    ;;
+  esac
+fi
+
+if [ -n "${USE_CONDA}" ]; then
+  # e.g. `conda create -n py35 python=3.5 anaconda`
  if [ -n "${VIRTUALENV_PYTHON}" ]; then
-    echo "pyenv-virtualenv: \`--python=${VIRTUALENV_PYTHON}' is not supported by pyvenv." 1>&2
-    exit 1
+    VIRTUALENV_PYTHON="${VIRTUALENV_PYTHON##*/}"
+    VIRTUALENV_PYTHON="${VIRTUALENV_PYTHON#python}"
+    if [ -n "${VIRTUALENV_PYTHON}" ]; then
+      VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="python=${VIRTUALENV_PYTHON}"
+    fi
  fi
 else
-  if [ -n "${VIRTUALENV_PYTHON}" ]; then
-    if [[ "${VIRTUALENV_PYTHON}" == "${VIRTUALENV_PYTHON##*/}" ]] || [[ "${VIRTUALENV_PYTHON}" == "${PYENV_ROOT}/shims/"* ]]; then
-      python="$(pyenv-which "${VIRTUALENV_PYTHON##*/}" 2>/dev/null || true)"
-      if [ -x "${python}" ]; then
-        VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${python}"
-      else
-        python="$(PYENV_VERSION="$(pyenv-whence "${VIRTUALENV_PYTHON##*/}" 2>/dev/null | tail -n 1 || true)" pyenv-which "${VIRTUALENV_PYTHON##*/}" 2>/dev/null || true)"
+  if [ -n "${USE_M_VENV}" ]; then
+    # Unset some arguments not supported by `python -m venv`
+    unset QUIET
+    unset VERBOSE
+    if [ -n "${VIRTUALENV_PYTHON}" ]; then
+      echo "pyenv-virtualenv: \`--python=${VIRTUALENV_PYTHON}' is not supported by \`python -m venv'." 1>&2
+      exit 1
+    fi
+  else
+    if [ -n "${VIRTUALENV_PYTHON}" ]; then
+      if [[ "${VIRTUALENV_PYTHON}" == "${VIRTUALENV_PYTHON##*/}" ]] || [[ "${VIRTUALENV_PYTHON}" == "${PYENV_ROOT}/shims/"* ]]; then
+        python="$(pyenv-which "${VIRTUALENV_PYTHON##*/}" 2>/dev/null || true)"
        if [ -x "${python}" ]; then
          VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${python}"
        else
-          echo "pyenv-virtualenv: \`${VIRTUALENV_PYTHON##*/}' is not installed in pyenv." 1>&2
-          exit 1
+          python="$(PYENV_VERSION="$(pyenv-whence "${VIRTUALENV_PYTHON##*/}" 2>/dev/null | tail -n 1 || true)" pyenv-which "${VIRTUALENV_PYTHON##*/}" 2>/dev/null || true)"
+          if [ -x "${python}" ]; then
+            VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${python}"
+          else
+            echo "pyenv-virtualenv: \`${VIRTUALENV_PYTHON##*/}' is not installed in pyenv." 1>&2
+            exit 1
+          fi
        fi
+      else
+        VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${VIRTUALENV_PYTHON}"
      fi
-    else
-      VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${VIRTUALENV_PYTHON}"
    fi
-  fi
-  if [ -z "${HAS_VIRTUALENV}" ]; then
-    VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
-    pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
-    HAS_VIRTUALENV=1
+    if [ -z "${HAS_VIRTUALENV}" ]; then
+      if [ -n "${VIRTUALENV_VERSION}" ]; then
+        virtualenv_spec="virtualenv==${VIRTUALENV_VERSION}"
+      else
+        virtualenv_spec="virtualenv"
+      fi
+      pyenv-exec pip install $QUIET $VERBOSE "${virtualenv_spec}"
+      HAS_VIRTUALENV=1
+    fi
  fi
 fi

@@ -354,11 +449,39 @@ unset VIRTUALENV_VERSION


 # Download specified version of ez_setup.py/get-pip.py.
-if [ -n "${SETUPTOOLS_VERSION}" ]; then
-  EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+if [ -z "${EZ_SETUP_URL}" ]; then
+  if [ -n "${SETUPTOOLS_VERSION}" ]; then
+    EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+    unset SETUPTOOLS_VERSION
+  else
+    EZ_SETUP_URL="https://bootstrap.pypa.io/ez_setup.py"
+  fi
 fi
-if [ -n "${PIP_VERSION}" ]; then
-  GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+if [ -z "${GET_PIP_URL}" ]; then
+  if [ -n "${PIP_VERSION}" ]; then
+    { colorize 1 "WARNING"
+      echo ": Setting PIP_VERSION=${PIP_VERSION} is no longer supported and may cause failures during the install process."
+    } 1>&2
+    GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+    # Unset `PIP_VERSION` from environment before invoking `get-pip.py` to deal with "ValueError: invalid truth value" (pypa/pip#4528)
+    unset PIP_VERSION
+  else
+    # Use custom get-pip URL based on the target version (#1127)
+    case "${PYENV_VERSION}" in
+    2.6 | 2.6.* )
+      GET_PIP_URL="https://bootstrap.pypa.io/2.6/get-pip.py"
+      ;;
+    3.2 | 3.2.* )
+      GET_PIP_URL="https://bootstrap.pypa.io/3.2/get-pip.py"
+      ;;
+    3.3 | 3.3.* )
+      GET_PIP_URL="https://bootstrap.pypa.io/3.3/get-pip.py"
+      ;;
+    * )
+      GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
+      ;;
+    esac
+  fi
 fi


@@ -400,7 +523,12 @@ if [ -d "${VIRTUALENV_PATH}/bin" ]; then
  fi

  if [ -n "$UPGRADE" ]; then
-    PYENV_VERSION="${VIRTUALENV_NAME}" prepare_requirements
+    if [ -n "${NO_ENSUREPIP}" ]; then
+      echo "pyenv-virtualenv: upgrading will not work with --no-setuptools or --no-pip" 1>&2
+      exit 1
+    else
+      PYENV_VERSION="${VIRTUALENV_NAME}" prepare_requirements
+    fi
  fi
 fi

@@ -420,13 +548,39 @@ STATUS=0
 # Change to cache directory to reuse them between invocations.
 mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
-venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
+if [ -n "${USE_CONDA}" ]; then
+  pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" python || STATUS="$?"
+else
+  if [ -n "${USE_M_VENV}" ]; then
+    pyenv-exec python -m venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
+  else
+    pyenv-exec virtualenv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
+  fi
+fi

-## Install setuptools and pip.
-PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
+## Create symlink in the `versions` directory for backward compatibility
+if [ -d "${VIRTUALENV_PATH}" ] && [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
+  ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
+fi

-## Migrate previously installed packages from requirements.txt.
-PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
+if [ ! -e "${VIRTUALENV_PATH}/bin/pydoc" ]; then
+  mkdir -p "${VIRTUALENV_PATH}/bin"
+  cat <<EOS > "${VIRTUALENV_PATH}/bin/pydoc"
+#!${VIRTUALENV_PATH}/bin/python
+import pydoc
+if __name__ == '__main__':
+      pydoc.cli()
+EOS
+  chmod +x "${VIRTUALENV_PATH}/bin/pydoc"
+fi
+
+if [ -z "${NO_ENSUREPIP}" ]; then
+  ## Install setuptools and pip.
+  PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
+
+  ## Migrate previously installed packages from requirements.txt.
+  PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
+fi

 # Execute `after_virtualenv` hooks.
 for hook in "${after_hooks[@]}"; do eval "$hook"; done
--- a/bin/pyenv-virtualenv-delete
+++ b/bin/pyenv-virtualenv-delete
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+#
+# Summary: Uninstall a specific Python virtualenv
+#
+# Usage: pyenv virtualenv-delete [-f|--force] <virtualenv>
+#
+#    -f  Attempt to remove the specified virtualenv without prompting
+#        for confirmation. If the virtualenv does not exist, do not
+#        display an error message.
+#
+# See `pyenv virtualenvs` for a complete list of installed versions.
+#
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+if [ -z "${PYENV_ROOT}" ]; then
+  PYENV_ROOT="$(pyenv-root)"
+fi
+
+# Provide pyenv completions
+if [ "$1" = "--complete" ]; then
+  exec pyenv virtualenvs --bare
+fi
+
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+usage() {
+  pyenv-help virtualenv-delete 2>/dev/null
+  [ -z "$1" ] || exit "$1"
+}
+
+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+  usage 0
+fi
+
+unset FORCE
+if [ "$1" = "-f" ] || [ "$1" = "--force" ]; then
+  FORCE=true
+  shift
+fi
+
+[ "$#" -eq 1 ] || usage 1 >&2
+
+DEFINITION="$1"
+case "$DEFINITION" in
+"" | -* )
+  usage 1 >&2
+  ;;
+esac
+
+VERSION_NAME="${DEFINITION##*/}"
+COMPAT_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
+
+if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
+  PREFIX="${PYENV_ROOT}/versions/${DEFINITION}"
+  if [ -L "${COMPAT_PREFIX}" ]; then
+    if [[ "${PREFIX}" != "$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)" ]]; then
+      unset COMPAT_PREFIX
+    fi
+  fi
+else
+  if [ -L "${COMPAT_PREFIX}" ]; then
+    PREFIX="$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)"
+    if [[ "${PREFIX%/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then
+      echo "pyenv-virtualenv: \`${COMPAT_PREFIX}' is a symlink for unknown location." 1>&2
+      exit 1
+    fi
+  else
+    if pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then
+      PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
+      unset COMPAT_PREFIX
+    else
+      echo "pyenv-virtualenv: \`${DEFINITION}' is not a virtualenv." 1>&2
+      exit 1
+    fi
+  fi
+fi
+
+if [ -z "$FORCE" ]; then
+  if [ ! -d "$PREFIX" ]; then
+    echo "pyenv-virtualenv: virtualenv \`$VERSION_NAME' not installed" >&2
+    exit 1
+  fi
+
+  read -p "pyenv-virtualenv: remove $PREFIX? "
+  case "$REPLY" in
+  y* | Y* ) ;;
+  * ) exit 1 ;;
+  esac
+fi
+
+if [ -d "$PREFIX" ]; then
+  rm -rf "$PREFIX"
+  if [ -L "$COMPAT_PREFIX" ]; then
+    rm -rf "$COMPAT_PREFIX"
+  fi
+  pyenv-rehash
+fi
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -9,6 +9,26 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+abs_dirname() {
+  local cwd="$(pwd)"
+  local path="$1"
+
+  while [ -n "$path" ]; do
+    cd "${path%/*}"
+    local name="${path##*/}"
+    path="$(resolve_link "$name" || true)"
+  done
+
+  pwd
+  cd "$cwd"
+}
+
+PYENV_VIRTUALENV_INSTALL_PREFIX="$(dirname "$(abs_dirname "$0")")"
+
 print=""
 for args in "$@"
 do
@@ -51,7 +71,7 @@ if [ -z "$print" ]; then
    echo
    case "$shell" in
    fish )
-      echo 'status --is-interactive; and . (pyenv virtualenv-init -|psub)'
+      echo 'status --is-interactive; and source (pyenv virtualenv-init -|psub)'
      ;;
    * )
      echo 'eval "$(pyenv virtualenv-init -)"'
@@ -65,10 +85,16 @@ fi

 case "$shell" in
 fish )
-  echo "setenv PYENV_VIRTUALENV_INIT 1;"
+  cat <<EOS
+set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
+EOS
  ;;
 * )
-  echo "export PYENV_VIRTUALENV_INIT=1;"
+  cat <<EOS
+export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
+export PYENV_VIRTUALENV_INIT=1;
+EOS
  ;;
 esac

@@ -76,26 +102,13 @@ case "$shell" in
 fish )
  cat <<EOS
 function _pyenv_virtualenv_hook --on-event fish_prompt;
-  set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
-  if [ -n "\$PYENV_ACTIVATE" ]
-    if [ (pyenv version-name 2>/dev/null; or true) = "system" ]
-      pyenv deactivate --no-error --verbose
-      set -e PYENV_DEACTIVATE
-      return 0
-    end
-    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
-      if pyenv deactivate --no-error --verbose
-        set -e PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
-    end
+  set -l ret \$status
+  if [ -n "\$VIRTUAL_ENV" ]
+    pyenv activate --quiet; or pyenv deactivate --quiet; or true
  else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
-      pyenv activate --no-error --verbose; or true
-    end
+    pyenv activate --quiet; or true
  end
+  return \$ret
 end
 EOS
 ;;
@@ -113,25 +126,13 @@ esac

 if [[ "$shell" != "fish" ]]; then
  cat <<EOS
-  if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
-      eval "\$(pyenv sh-deactivate --no-error --verbose)"
-      unset PYENV_DEACTIVATE
-      return 0
-    fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
-        unset PYENV_DEACTIVATE
-        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
-      else
-        eval "\$(pyenv sh-activate --no-error --verbose)"
-      fi
-    fi
+  local ret=\$?
+  if [ -n "\$VIRTUAL_ENV" ]; then
+    eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
  else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-activate --no-error --verbose)" || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
  fi
+  return \$ret
 };
 EOS

@@ -147,7 +148,7 @@ EOS
    cat <<EOS
 typeset -g -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
-  precmd_functions+=_pyenv_virtualenv_hook;
+  precmd_functions=(_pyenv_virtualenv_hook \$precmd_functions);
 fi
 EOS
    ;;
--- a/bin/pyenv-virtualenv-prefix
+++ b/bin/pyenv-virtualenv-prefix
@@ -19,45 +19,54 @@ else
  IFS=: versions=($(pyenv-version-name))
 fi

-real_prefix() { # virtualenv
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.real_prefix)' 2>/dev/null
-}
-
-base_prefix() { # pyvenv
-  # FIXME: non-pyvenv versions also have sys.base_prefix
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.base_prefix)' 2>/dev/null
-}
-
 VIRTUALENV_PREFIX_PATHS=()
-for version_string in "${versions[@]}"; do
-  version="${version_string%%/*}"
+for version in "${versions[@]}"; do
  if [ "$version" = "system" ]; then
    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
    exit 1
  fi
-  PREFIX="$(pyenv-prefix "${version}")"
-  if [ -f "${PREFIX}/bin/activate" ]; then
-    # Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
-    if [ -f "${PREFIX}/bin/conda" ]; then
-      if [[ "${version_string}" != "${version_string%/envs/*}" ]]; then
-        conda_env="${version_string##*/envs/}"
-        if [ -f "${PREFIX}/envs/${conda_env}/bin/conda" ]; then
-          VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
-        else
-          echo "pyenv-virtualenv: version \`${version_string}' is not an environment of anaconda/miniconda" 1>&2
-          exit 1
-        fi
+  PYENV_PREFIX_PATH="$(pyenv-prefix "${version}")"
+  if [ -x "${PYENV_PREFIX_PATH}/bin/python" ]; then
+    if [ -f "${PYENV_PREFIX_PATH}/bin/activate" ]; then
+      if [ -f "${PYENV_PREFIX_PATH}/bin/conda" ]; then
+        # conda
+        VIRTUALENV_PREFIX_PATH="${PYENV_PREFIX_PATH}"
      else
-        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
+        if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
+          # venv
+          virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+          VIRTUALENV_PREFIX_PATH="${virtualenv_binpath%/bin}"
+        else
+          # virtualenv
+          if [ -d "${PYENV_ROOT}/versions/${version}/Lib" ]; then
+            # jython
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/Lib"
+          else
+            if [ -d "${PYENV_ROOT}/versions/${version}/lib-python" ]; then
+              # pypy
+              virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib-python"
+            else
+              virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib"
+            fi
+          fi
+          virtualenv_orig_prefix="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "orig-prefix.txt" 2>/dev/null | head -1)"
+          if [ -f "${virtualenv_orig_prefix}" ]; then
+            VIRTUALENV_PREFIX_PATH="$(cat "${virtualenv_orig_prefix}" 2>/dev/null || true)"
+          fi
+        fi
+      fi
+      if [ -d "${VIRTUALENV_PREFIX_PATH}" ]; then
+        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${VIRTUALENV_PREFIX_PATH:-${PYENV_PREFIX_PATH}}")
+      else
+        echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+        exit 1
      fi
    else
-      VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-      VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
+      echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+      exit 1
    fi
  else
-    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+    echo "pyenv-virtualenv: \`python' not found in version \`${version}'" 1>&2
    exit 1
  fi
 done
--- a/bin/pyenv-virtualenvs
+++ b/bin/pyenv-virtualenvs
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 #
 # Summary: List all Python virtualenvs found in `$PYENV_ROOT/versions/*'.
+# Usage: pyenv virtualenvs [--bare] [--skip-aliases]
 #
-# Usage: pyenv virtualenvs [--bare]
-#
+# List all virtualenvs found in `$PYENV_ROOT/versions/*' and its `$PYENV_ROOT/versions/envs/*'.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -12,54 +12,124 @@ if [ -z "$PYENV_ROOT" ]; then
  PYENV_ROOT="${HOME}/.pyenv"
 fi

-if [ "$1" = "--bare" ]; then
+unset bare
+unset skip_aliases
+# Provide pyenv completions
+for arg; do
+  case "$arg" in
+  --complete )
+    echo --bare
+    echo --skip-aliases
+    exit ;;
+  --bare ) bare=1 ;;
+  --skip-aliases ) skip_aliases=1 ;;
+  * )
+    pyenv-help --usage virtualenvs >&2
+    exit 1
+    ;;
+  esac
+done
+
+versions_dir="${PYENV_ROOT}/versions"
+
+if ! enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev/null; then
+  if [ -n "$PYENV_NATIVE_EXT" ]; then
+    echo "pyenv: failed to load \`realpath' builtin" >&2
+    exit 1
+  fi
+
+  READLINK=$(type -p greadlink readlink | head -1)
+  if [ -z "$READLINK" ]; then
+    echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
+    exit 1
+  fi
+
+  resolve_link() {
+    $READLINK "$1"
+  }
+
+  realpath() {
+    local cwd="$PWD"
+    local path="$1"
+    local name
+
+    while [ -n "$path" ]; do
+      name="${path##*/}"
+      [ "$name" = "$path" ] || cd "${path%/*}"
+      path="$(resolve_link "$name" || true)"
+    done
+
+    echo "${PWD}/$name"
+    cd "$cwd"
+  }
+fi
+
+if [ -d "$versions_dir" ]; then
+  versions_dir="$(realpath "$versions_dir")"
+fi
+
+if [ -n "$bare" ]; then
  hit_prefix=""
  miss_prefix=""
  current_versions=()
-  print_origin=""
+  unset print_origin
+  include_system=""
 else
  hit_prefix="* "
  miss_prefix="  "
-  current_versions=($(IFS=:; for version in $(pyenv-version-name); do echo "$version"; done))
+  OLDIFS="$IFS"
+  IFS=: current_versions=($(pyenv-version-name || true))
+  IFS="$OLDIFS"
  print_origin="1"
+  include_system=""
 fi

-array_exists() {
-  local x car="$1"
+num_versions=0
+
+exists() {
+  local car="$1"
+  local cdar
  shift
-  for x in "$@"; do
-    [ "${x}" = "${car}" ] && return 0
+  for cdar in "$@"; do
+    if [ "${car}" == "${cdar}" ]; then
+      return 0
+    fi
  done
  return 1
 }

 print_version() {
-  if [ -n "${print_origin}" ]; then
-    local version_origin="$2"
+  if exists "$1" "${current_versions[@]}"; then
+    echo "${hit_prefix}${1}${print_origin+$2}"
  else
-    local version_origin=""
-  fi
-  if array_exists "$1" "${current_versions[@]}"; then
-    echo "${hit_prefix}${1}${version_origin}"
-  else
-    echo "${miss_prefix}${1}${version_origin}"
+    echo "${miss_prefix}${1}${print_origin+$2}"
  fi
+  num_versions=$((num_versions + 1))
 }

-for version in $(pyenv-versions --bare); do
-  if [[ "${version}" != "system" ]]; then
-    virtualenv_prefix="$(pyenv-virtualenv-prefix "${version}" 2>/dev/null || true)"
-    if [ -d "${virtualenv_prefix}" ]; then
-      print_version "${version}" " (created from ${virtualenv_prefix})"
-      prefix="$(pyenv-prefix "${version}")"
-      if [ -f "${prefix}/bin/conda" ]; then
-        # envs of anaconda/miniconda
-        shopt -s nullglob
-        for conda_env in "${prefix}/envs/"*; do
-          print_version "${version##*/}${conda_env#${prefix}}" " (created from ${prefix})"
-        done
-        shopt -u nullglob
-      fi
+shopt -s nullglob
+for path in "$versions_dir"/*; do
+  if [ -d "$path" ]; then
+    if [ -n "$skip_aliases" ] && [ -L "$path" ]; then
+      target="$(realpath "$path")"
+      [ "${target%/*/envs/*}" != "$versions_dir" ] || continue
    fi
+    virtualenv_prefix="$(pyenv-virtualenv-prefix "${path##*/}" 2>/dev/null || true)"
+    if [ -d "${virtualenv_prefix}" ]; then
+      print_version "${path##*/}" " (created from ${virtualenv_prefix})"
+    fi
+    for venv_path in "${path}/envs/"*; do
+      venv="${path##*/}/envs/${venv_path##*/}"
+      virtualenv_prefix="$(pyenv-virtualenv-prefix "${venv}" 2>/dev/null || true)"
+      if [ -d "${virtualenv_prefix}" ]; then
+        print_version "${venv}" " (created from ${virtualenv_prefix})"
+      fi
+    done
  fi
 done
+shopt -u nullglob
+
+if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
+  echo "Warning: no Python virtualenv detected on the system" >&2
+  exit 1
+fi
--- a/etc/pyenv.d/rehash/envs.bash
+++ b/etc/pyenv.d/rehash/envs.bash
@@ -0,0 +1,11 @@
+virtualenv_list_executable_names() {
+  local file
+  shopt -s nullglob
+  for file in "$PYENV_ROOT"/versions/*/envs/*/bin/*; do
+    echo "${file##*/}"
+  done
+  shopt -u nullglob
+}
+if declare -f make_shims 1>/dev/null 2>&1; then
+  make_shims $(virtualenv_list_executable_names | sort -u)
+fi
--- a/etc/pyenv.d/uninstall/envs.bash
+++ b/etc/pyenv.d/uninstall/envs.bash
@@ -0,0 +1,30 @@
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+if [ -n "${DEFINITION}" ]; then
+  if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
+    # Uninstall virtualenv by long name
+    exec pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}"
+    exit 128
+  else
+    VERSION_NAME="${VERSION_NAME:-${DEFINITION##*/}}"
+    PREFIX="${PREFIX:-${PYENV_ROOT}/versions/${VERSION_NAME}}"
+    if [ -L "${PREFIX}" ]; then
+      REAL_PREFIX="$(resolve_link "${PREFIX}" 2>/dev/null || true)"
+      REAL_DEFINITION="${REAL_PREFIX#${PYENV_ROOT}/versions/}"
+      if [[ "${REAL_DEFINITION}" != "${REAL_DEFINITION%/envs/*}" ]]; then
+        # Uninstall virtualenv by short name
+        exec pyenv-virtualenv-delete ${FORCE+-f} "${REAL_DEFINITION}"
+        exit 128
+      fi
+    else
+      # Uninstall all virtualenvs inside `envs` directory too
+      shopt -s nullglob
+      for virtualenv in "${PREFIX}/envs/"*; do
+        pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}/envs/${virtualenv##*/}"
+      done
+      shopt -u nullglob
+    fi
+  fi
+fi
--- a/etc/pyenv.d/which/python-config.bash
+++ b/etc/pyenv.d/which/python-config.bash
@@ -4,11 +4,40 @@
 # https://github.com/yyuu/pyenv/issues/397

 if [ ! -x "${PYENV_COMMAND_PATH}" ] && [[ "${PYENV_COMMAND_PATH##*/}" == "python"*"-config" ]]; then
-  virtualenv_prefix="$(pyenv-virtualenv-prefix 2>/dev/null || true)"
-  if [ -d "${virtualenv_prefix}" ]; then
-    virtualenv_command_path="${virtualenv_prefix}/bin/${PYENV_COMMAND_PATH##*/}"
-    if [ -x "${virtualenv_command_path}" ]; then
-      PYENV_COMMAND_PATH="${virtualenv_command_path}"
+  OLDIFS="${IFS}"
+  IFS=:
+  version="$(pyenv-version-name)"
+  IFS="${OLDIFS}"
+  if [ -f "${PYENV_ROOT}/versions/${version}/bin/activate" ]; then
+    if [ -f "${PYENV_ROOT}/versions/${version}/bin/conda" ]; then
+      : # do nothing for conda's environments
+    else
+      if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
+        # venv
+        virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+        virtualenv_prefix="${virtualenv_binpath%/bin}"
+      else
+        # virtualenv
+        if [ -d "${PYENV_ROOT}/versions/${version}/Lib" ]; then
+          # jython
+          virtualenv_libpath="${PYENV_ROOT}/versions/${version}/Lib"
+        else
+          if [ -d "${PYENV_ROOT}/versions/${version}/lib-python" ]; then
+            # pypy
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib-python"
+          else
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib"
+          fi
+        fi
+        virtualenv_orig_prefix="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "orig-prefix.txt" 2>/dev/null | head -1)"
+        if [ -f "${virtualenv_orig_prefix}" ]; then
+          virtualenv_prefix="$(cat "${virtualenv_orig_prefix}" 2>/dev/null || true)"
+        fi
+      fi
+      virtualenv_command_path="${virtualenv_prefix}/bin/${PYENV_COMMAND_PATH##*/}"
+      if [ -x "${virtualenv_command_path}" ]; then
+        PYENV_COMMAND_PATH="${virtualenv_command_path}"
+      fi
    fi
  fi
 fi
--- a/etc/pyenv.d/which/system-site-packages.bash
+++ b/etc/pyenv.d/which/system-site-packages.bash
@@ -4,16 +4,50 @@
 # https://github.com/yyuu/pyenv-virtualenv/issues/62

 if [ ! -x "${PYENV_COMMAND_PATH}" ]; then
-  virtualenv_prefix="$(pyenv-virtualenv-prefix 2>/dev/null || true)"
-  if [ -d "${virtualenv_prefix}" ]; then
-    shopt -s nullglob
-    no_global_site_packages="$(echo "$(pyenv-prefix)/lib/"*"/no-global-site-packages.txt")"
-    shopt -u nullglob
-    if [ ! -f "${no_global_site_packages}" ]; then
-      # virtualenv is created with `--system-site-packages`
-      virtualenv_command_path="${virtualenv_prefix}/bin/${PYENV_COMMAND_PATH##*/}"
-      if [ -x "${virtualenv_command_path}" ]; then
-        PYENV_COMMAND_PATH="${virtualenv_command_path}"
+  OLDIFS="${IFS}"
+  IFS=:
+  version="$(pyenv-version-name)"
+  IFS="${OLDIFS}"
+  if [ -f "${PYENV_ROOT}/versions/${version}/bin/activate" ]; then
+    unset include_system_site_packages
+    if [ -f "${PYENV_ROOT}/versions/${version}/bin/conda" ]; then
+      : # do nothing for conda's environments
+    else
+      if [ -f "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" ]; then
+        # venv
+        virtualenv_binpath="$(cut -b 1-1024 "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" | sed -n '/^ *home *= */s///p' || true)"
+        virtualenv_prefix="${virtualenv_binpath%/bin}"
+        if grep -q -i "include-system-site-packages *= *true" "${PYENV_ROOT}/versions/${version}/pyvenv.cfg" 1>/dev/null 2>&1; then
+          include_system_site_packages=1
+        fi
+      else
+        # virtualenv
+        if [ -d "${PYENV_ROOT}/versions/${version}/Lib" ]; then
+          # jython
+          virtualenv_libpath="${PYENV_ROOT}/versions/${version}/Lib"
+        else
+          if [ -d "${PYENV_ROOT}/versions/${version}/lib-python" ]; then
+            # pypy
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib-python"
+          else
+            virtualenv_libpath="${PYENV_ROOT}/versions/${version}/lib"
+          fi
+        fi
+        no_global_site_packages="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "no-global-site-packages.txt" 2>/dev/null | head -1)"
+        if [ ! -f "${no_global_site_packages}" ]; then
+          include_system_site_packages=1
+        fi
+        virtualenv_orig_prefix="$(find "${virtualenv_libpath}/" -maxdepth 2 -type f -and -name "orig-prefix.txt" 2>/dev/null | head -1)"
+        if [ -f "${virtualenv_orig_prefix}" ]; then
+          virtualenv_prefix="$(cat "${virtualenv_orig_prefix}" 2>/dev/null || true)"
+        fi
+      fi
+      if [ -n "${include_system_site_packages}" ] && [ -n "${virtualenv_prefix}" ]; then
+        # virtualenv is created with `--system-site-packages`
+        virtualenv_command_path="${virtualenv_prefix}/bin/${PYENV_COMMAND_PATH##*/}"
+        if [ -x "${virtualenv_command_path}" ]; then
+          PYENV_COMMAND_PATH="${virtualenv_command_path}"
+        fi
      fi
    fi
  fi
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,19 @@ if [ -z "${PREFIX}" ]; then
 fi

 BIN_PATH="${PREFIX}/bin"
+SHIMS_PATH="${PREFIX}/shims"
+HOOKS_PATH="${PREFIX}/etc/pyenv.d"

 mkdir -p "$BIN_PATH"
+mkdir -p "$SHIMS_PATH"
+mkdir -p "$HOOKS_PATH"

 install -p bin/* "$BIN_PATH"
+install -p shims/* "$SHIMS_PATH"
+for hook in etc/pyenv.d/*; do
+  if [ -d "$hook" ]; then
+    cp -RPp "$hook" "$HOOKS_PATH"
+  else
+    install -p -m 0644 "$hook" "$HOOKS_PATH"
+  fi
+done
--- a/shims/activate
+++ b/shims/activate
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [[ "$0" != "${BASH_SOURCE}" ]]; then
+  eval "$(pyenv sh-activate --verbose "$@" || true)"
+else
+  echo "pyenv-virtualenv: activate must be sourced. Run 'source activate envname' instead of 'activate envname'" 1>&2
+  false
+fi
--- a/shims/deactivate
+++ b/shims/deactivate
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [[ "$0" != "${BASH_SOURCE}" ]]; then
+  eval "$(pyenv sh-deactivate --verbose "$@" || true)"
+else
+  echo "pyenv-virtualenv: deactivate must be sourced. Run 'source deactivate' instead of 'deactivate'" 1>&2
+  false
+fi
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -5,6 +5,17 @@ load test_helper
 setup() {
  export HOME="${TMP}"
  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
 }

@test "activate virtualenv from current version" {
@@ -13,43 +24,77 @@ setup() {
  stub pyenv-version-name "echo venv"
  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv) \${PS1}";
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
-EOS
+  unstub pyenv-sh-deactivate
 }

-@test "activate virtualenv from current version (verbose)" {
+@test "activate virtualenv from current version (quiet)" {
  export PYENV_VIRTUALENV_INIT=1

  stub pyenv-version-name "echo venv"
  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

-  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --quiet
+
+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv) \${PS1}";
+EOS

  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+}
+
+@test "activate virtualenv from current version (verbose)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUALENV_VERBOSE_ACTIVATE=1
+
+  stub pyenv-version-name "echo venv"
+  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"
+
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose

  assert_success
  assert_output <<EOS
+deactivated
 pyenv-virtualenv: activate venv
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv) \${PS1}";
 EOS
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (without pyenv-virtualenv-init)" {
@@ -58,27 +103,26 @@ EOS
  stub pyenv-version-name "echo venv"
  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VERSION="venv";
+export PYENV_ACTIVATE_SHELL=1;
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv) \${PS1}";
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.bash_profile:
-
-eval "\$(pyenv virtualenv-init -)"
-
-pyenv shell "venv";
-export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (fish)" {
@@ -87,20 +131,22 @@ EOS
  stub pyenv-version-name "echo venv"
  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing not working for fish.
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from current version (fish) (without pyenv-virtualenv-init)" {
@@ -109,27 +155,24 @@ EOS
  stub pyenv-version-name "echo venv"
  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+set -gx PYENV_VERSION "venv";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+pyenv-virtualenv: prompt changing not working for fish.
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.config/fish/config.fish:
-
-status --is-interactive; and . (pyenv virtualenv-init -|psub)
-
-pyenv shell "venv";
-setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
-EOS
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument" {
@@ -137,21 +180,25 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-pyenv shell "venv27";
+deactivated
+export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv27) \${PS1}";
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument (without pyenv-virtualenv-init)" {
@@ -159,26 +206,25 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.bash_profile:
-
-eval "\$(pyenv virtualenv-init -)"
-
-pyenv shell "venv27";
+deactivated
+export PYENV_VERSION="venv27";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv27) \${PS1}";
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument (fish)" {
@@ -186,21 +232,23 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-pyenv shell "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
+deactivated
+set -gx PYENV_VERSION "venv27";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing not working for fish.
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "activate virtualenv from command-line argument (fish) (without pyenv-virtualenv-init)" {
@@ -208,69 +256,79 @@ EOS

  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-# Load pyenv-virtualenv automatically by adding
-# the following to ~/.config/fish/config.fish:
-
-status --is-interactive; and . (pyenv virtualenv-init -|psub)
-
-pyenv shell "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
+deactivated
+set -gx PYENV_VERSION "venv27";
+set -gx PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing not working for fish.
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
 }

@test "unset invokes deactivate" {
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  stub pyenv-sh-deactivate " : echo deactivated"
+
  run pyenv-sh-activate --unset

  assert_success
  assert_output <<EOS
-pyenv deactivate
+deactivated
 EOS
+
+  unstub pyenv-sh-deactivate
 }

@test "should fail if the version is not a virtualenv" {
  stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
+  stub pyenv-version-name " : echo 3.3.3"
+  stub pyenv-virtualenv-prefix "3.3.3/envs/3.3.3 : false"

  run pyenv-sh-activate "3.3.3"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_failure
  assert_output <<EOS
 pyenv-virtualenv: version \`3.3.3' is not a virtualenv
 false
 EOS
-}
-
-@test "should fail if the version is not a virtualenv (no-error)" {
-  stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-prefix "3.3.3 : echo \"${PYENV_ROOT}/versions/3.3.3\""
-
-  run pyenv-sh-activate --no-error "3.3.3"

  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
+  unstub pyenv-version-name
+}
+
+@test "should fail if the version is not a virtualenv (quiet)" {
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
+  stub pyenv-version-name " : echo 3.3.3"
+  stub pyenv-virtualenv-prefix "3.3.3/envs/3.3.3 : false"
+
+  run pyenv-sh-activate --quiet "3.3.3"

  assert_failure
  assert_output <<EOS
 false
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-version-name
 }

@test "should fail if there are multiple versions" {
+  stub pyenv-virtualenv-prefix "venv : true"
+  stub pyenv-virtualenv-prefix "venv27 : true"
+
  run pyenv-sh-activate "venv" "venv27"

  assert_failure
@@ -278,15 +336,68 @@ EOS
 pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
 false
 EOS
+
+  unstub pyenv-virtualenv-prefix
 }

-@test "should fail if there are multiple versions (no-error)" {
-  run pyenv-sh-activate --no-error "venv" "venv27"
+@test "should fail if there are multiple virtualenvs (quiet)" {
+  stub pyenv-virtualenv-prefix "venv : true"
+  stub pyenv-virtualenv-prefix "venv27 : true"
+
+  run pyenv-sh-activate --quiet "venv" "venv27"

  assert_failure
  assert_output <<EOS
 false
 EOS
+
+  unstub pyenv-virtualenv-prefix
+}
+
+@test "should fail if the first version is not a virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-virtualenv-prefix "2.7.10 : false"
+  stub pyenv-version-name " : echo 2.7.10"
+  stub pyenv-virtualenv-prefix "2.7.10/envs/2.7.10 : false"
+
+  run pyenv-sh-activate "2.7.10" "venv27"
+
+  assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: version \`2.7.10' is not a virtualenv
+false
+EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-version-name
+}
+
+@test "activate if the first virtualenv is a virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-virtualenv-prefix "2.7.10 : false"
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  PYENV_SHELL="bash" run pyenv-sh-activate "venv27" "2.7.10"
+
+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VERSION="venv27:2.7.10";
+export PYENV_ACTIVATE_SHELL=1;
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv27";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(venv27) \${PS1}";
+EOS
+
+  unstub pyenv-sh-deactivate
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
 }

@test "should fail if activate is invoked as a command" {
--- a/test/conda-activate.bats
+++ b/test/conda-activate.bats
@@ -5,145 +5,169 @@ load test_helper
 setup() {
  export HOME="${TMP}"
  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset PYENV_VIRTUAL_ENV
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
 }

@test "activate conda root from current version" {
  export PYENV_VIRTUALENV_INIT=1

-  create_conda "anaconda-2.3.0"
+  setup_conda "anaconda-2.3.0"
  stub pyenv-version-name "echo anaconda-2.3.0"
  stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
-  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0";
+export CONDA_DEFAULT_ENV="root";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(anaconda-2.3.0) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0";
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0";
-. "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/activate" "root";
-EOS
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
 }

@test "activate conda root from current version (fish)" {
  export PYENV_VIRTUALENV_INIT=1

-  create_conda "anaconda-2.3.0"
+  setup_conda "anaconda-2.3.0"
  stub pyenv-version-name "echo anaconda-2.3.0"
  stub pyenv-virtualenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
-  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="fish" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+set -gx PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
+set -gx VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
+set -gx CONDA_DEFAULT_ENV "root";
+pyenv-virtualenv: prompt changing not working for fish.
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_failure
-  assert_output <<EOS
-pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda
-false
-EOS
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
 }

@test "activate conda root from command-line argument" {
  export PYENV_VIRTUALENV_INIT=1

-  create_conda "anaconda-2.3.0"
-  create_conda "miniconda-3.9.1"
+  setup_conda "anaconda-2.3.0"
+  setup_conda "miniconda-3.9.1"
  stub pyenv-virtualenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
  stub pyenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
-  stub pyenv-prefix "miniconda-3.9.1 : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0" run pyenv-sh-activate "miniconda-3.9.1"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-pyenv shell "miniconda-3.9.1";
+deactivated
+export PYENV_VERSION="miniconda-3.9.1";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1";
-. "${PYENV_ROOT}/versions/miniconda-3.9.1/bin/activate" "root";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1";
+export CONDA_DEFAULT_ENV="root";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(miniconda-3.9.1) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1";
 EOS
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0"
+  teardown_conda "miniconda-3.9.1"
 }

@test "activate conda env from current version" {
  export PYENV_VIRTUALENV_INIT=1

-  create_conda "anaconda-2.3.0" "foo"
+  setup_conda "anaconda-2.3.0" "foo"
  stub pyenv-version-name "echo anaconda-2.3.0/envs/foo"
  stub pyenv-virtualenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
-  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate

+  assert_success
+  assert_output <<EOS
+deactivated
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
+export CONDA_DEFAULT_ENV="foo";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(anaconda-2.3.0/envs/foo) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/anaconda-2.3.0/envs/foo";
+. "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/activate.d/activate.sh";
+EOS
+
  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo";
-. "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/activate" "foo";
-EOS
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0" "foo"
 }

@test "activate conda env from command-line argument" {
  export PYENV_VIRTUALENV_INIT=1

-  create_conda "anaconda-2.3.0" "foo"
-  create_conda "miniconda-3.9.1" "bar"
+  setup_conda "anaconda-2.3.0" "foo"
+  setup_conda "miniconda-3.9.1" "bar"
  stub pyenv-virtualenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1\""
  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
-  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
+  stub pyenv-sh-deactivate "--force --quiet : echo deactivated"

  PYENV_SHELL="bash" PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-sh-activate "miniconda-3.9.1/envs/bar"

-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<EOS
-pyenv shell "miniconda-3.9.1/envs/bar";
+deactivated
+export PYENV_VERSION="miniconda-3.9.1/envs/bar";
 export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
-. "${PYENV_ROOT}/versions/miniconda-3.9.1/bin/activate" "bar";
+export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
+export VIRTUAL_ENV="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
+export CONDA_DEFAULT_ENV="bar";
+pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior.
+export _OLD_VIRTUAL_PS1="\${PS1}";
+export PS1="(miniconda-3.9.1/envs/bar) \${PS1}";
+export CONDA_PREFIX="${TMP}/pyenv/versions/miniconda-3.9.1/envs/bar";
+. "${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar/etc/conda/activate.d/activate.sh";
 EOS
-}

-@test "activate conda env from command-line argument in short-form" {
-  export PYENV_VIRTUALENV_INIT=1
-
-  create_conda "miniconda-3.9.1" "bar"
-  stub pyenv-prefix "bar : false"
-  stub pyenv-version-name " : echo miniconda-3.9.1"
-  stub pyenv-virtualenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
-  stub pyenv-prefix "miniconda-3.9.1/envs/bar : echo \"${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar\""
-
-  PYENV_SHELL="bash" PYENV_VERSION="miniconda-3.9.1" run pyenv-sh-activate "bar"
-
-  unstub pyenv-prefix
-  unstub pyenv-version-name
  unstub pyenv-virtualenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv shell "miniconda-3.9.1/envs/bar";
-export PYENV_ACTIVATE_SHELL=1;
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/miniconda-3.9.1/envs/bar";
-. "${PYENV_ROOT}/versions/miniconda-3.9.1/bin/activate" "bar";
-EOS
+  unstub pyenv-prefix
+  unstub pyenv-sh-deactivate
+  teardown_conda "anaconda-2.3.0" "foo"
+  teardown_conda "miniconda-3.9.1" "bar"
 }
--- a/test/conda-deactivate.bats
+++ b/test/conda-deactivate.bats
@@ -4,61 +4,120 @@ load test_helper

 setup() {
  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset PYENV_VIRTUAL_ENV
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
 }

@test "deactivate conda root" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
  export PYENV_ACTIVATE_SHELL=
+  export CONDA_DEFAULT_ENV="root"

-  create_conda "anaconda-2.3.0"
+  setup_conda "anaconda-2.3.0"

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
-if [ -f "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate" ]; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  . "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate";
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+unset CONDA_PREFIX
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+unset CONDA_DEFAULT_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
 fi;
 EOS
+
+  teardown_conda "anaconda-2.3.0"
 }

@test "deactivate conda root (fish)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0"
  export PYENV_ACTIVATE_SHELL=
+  export CONDA_DEFAULT_ENV="root"

-  create_conda "anaconda-2.3.0"
+  setup_conda "anaconda-2.3.0"

  PYENV_SHELL="fish" run pyenv-sh-deactivate

-  assert_failure
+  assert_success
  assert_output <<EOS
-pyenv-virtualenv: Only bash and zsh are supported by Anaconda/Miniconda
-false
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+set -e CONDA_DEFAULT_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
+if functions -q deactivate;
+  functions -e deactivate;
+end;
 EOS
+
+  teardown_conda "anaconda-2.3.0"
 }

@test "deactivate conda env" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo"
  export PYENV_ACTIVATE_SHELL=
+  export CONDA_DEFAULT_ENV="foo"

-  create_conda "anaconda-2.3.0" "foo"
+  setup_conda "anaconda-2.3.0" "foo"

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
-if [ -f "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate" ]; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  . "${PYENV_ROOT}/versions/anaconda-2.3.0/bin/deactivate";
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+. "${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo/etc/conda/deactivate.d/deactivate.sh";
+unset CONDA_PREFIX
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+unset CONDA_DEFAULT_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
 fi;
 EOS
+
+  teardown_conda "anaconda-2.3.0" "foo"
 }
--- a/test/conda-virtualenv-prefix.bats
+++ b/test/conda-virtualenv-prefix.bats
@@ -7,35 +7,35 @@ setup() {
 }

@test "display conda root" {
-  create_conda "anaconda-2.3.0"
-
+  setup_conda "anaconda-2.3.0"
  stub pyenv-version-name "echo anaconda-2.3.0"
  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""

  PYENV_VERSION="anaconda-2.3.0" run pyenv-virtualenv-prefix

-  unstub pyenv-version-name
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<OUT
 ${PYENV_ROOT}/versions/anaconda-2.3.0
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  teardown_conda "anaconda-2.3.0"
 }

@test "display conda env" {
-  create_conda "anaconda-2.3.0" "foo"
-
+  setup_conda "anaconda-2.3.0" "foo"
  stub pyenv-version-name "echo anaconda-2.3.0/envs/foo"
-  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""

  PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-virtualenv-prefix

-  unstub pyenv-version-name
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<OUT
-${PYENV_ROOT}/versions/anaconda-2.3.0
+${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  teardown_conda "anaconda-2.3.0" "foo"
 }
--- a/test/conda.bats
+++ b/test/conda.bats
@@ -0,0 +1,90 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+stub_pyenv() {
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-hooks "virtualenv : echo"
+  stub pyenv-rehash " : echo rehashed"
+}
+
+unstub_pyenv() {
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+}
+
+@test "create virtualenv by conda create" {
+  export PYENV_VERSION="miniconda3-3.16.0"
+  setup_conda "${PYENV_VERSION}"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+
+  run pyenv-virtualenv venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python
+rehashed
+OUT
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_m_venv "miniconda3-3.16.0"
+}
+
+@test "create virtualenv by conda create with -p" {
+  export PYENV_VERSION="miniconda3-3.16.0"
+  setup_conda "${PYENV_VERSION}"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+
+  run pyenv-virtualenv -p python3.5 venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+rehashed
+OUT
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_m_venv "miniconda3-3.16.0"
+}
+
+@test "create virtualenv by conda create with --python" {
+  export PYENV_VERSION="miniconda3-3.16.0"
+  setup_conda "${PYENV_VERSION}"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-exec "conda * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : true"
+
+  run pyenv-virtualenv --python=python3.5 venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+rehashed
+OUT
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_m_venv "miniconda3-3.16.0"
+}
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -4,220 +4,366 @@ load test_helper

 setup() {
  export PYENV_ROOT="${TMP}/pyenv"
+  unset PYENV_VERSION
+  unset PYENV_ACTIVATE_SHELL
+  unset PYENV_VIRTUAL_ENV
+  unset VIRTUAL_ENV
+  unset CONDA_DEFAULT_ENV
+  unset PYTHONHOME
+  unset _OLD_VIRTUAL_PYTHONHOME
+  unset PYENV_VIRTUALENV_VERBOSE_ACTIVATE
+  unset PYENV_VIRTUALENV_DISABLE_PROMPT
+  unset PYENV_VIRTUAL_ENV_DISABLE_PROMPT
+  unset VIRTUAL_ENV_DISABLE_PROMPT
+  unset _OLD_VIRTUAL_PS1
 }

@test "deactivate virtualenv" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
+fi;
+EOS
+}
+
+@test "deactivate virtualenv (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --quit
+
+  assert_success
+  assert_output <<EOS
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
+if declare -f deactivate 1>/dev/null 2>&1; then
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv (verbose)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=
+  export PYENV_VIRTUALENV_VERBOSE_ACTIVATE=1

  PYENV_SHELL="bash" run pyenv-sh-deactivate --verbose

  assert_success
  assert_output <<EOS
+pyenv-virtualenv: deactivate venv
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  echo "pyenv-virtualenv: deactivate venv" 1>&2;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

-@test "deactivate virtualenv (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+@test "deactivate virtualenv (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet

  assert_success
  assert_output <<EOS
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv (with shell activation)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=1

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+unset PYENV_VERSION;
+unset PYENV_ACTIVATE_SHELL;
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
-  unset PYENV_ACTIVATE_SHELL;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

-@test "deactivate virtualenv (with shell activation) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+@test "deactivate virtualenv (with shell activation) (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=1

-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet

  assert_success
  assert_output <<EOS
+unset PYENV_VERSION;
+unset PYENV_ACTIVATE_SHELL;
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
-  unset PYENV_ACTIVATE_SHELL;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv which has been activated manually" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE=
  export PYENV_ACTIVATE_SHELL=

  PYENV_SHELL="bash" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+unset PYENV_VIRTUAL_ENV;
+unset VIRTUAL_ENV;
+if [ -n "\${_OLD_VIRTUAL_PATH}" ]; then
+  export PATH="\${_OLD_VIRTUAL_PATH}";
+  unset _OLD_VIRTUAL_PATH;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PYTHONHOME}" ]; then
+  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
+  unset _OLD_VIRTUAL_PYTHONHOME;
+fi;
+if [ -n "\${_OLD_VIRTUAL_PS1}" ]; then
+  export PS1="\${_OLD_VIRTUAL_PS1}";
+  unset _OLD_VIRTUAL_PS1;
+fi;
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$VIRTUAL_ENV";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  unset -f deactivate;
 fi;
 EOS
 }

@test "deactivate virtualenv (fish)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

  PYENV_SHELL="fish" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
 if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  functions -e deactivate;
 end;
 EOS
 }

-@test "deactivate virtualenv (fish) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+@test "deactivate virtualenv (fish) (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=

-  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet

  assert_success
  assert_output <<EOS
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
 if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  false;
+  functions -e deactivate;
 end;
 EOS
 }

@test "deactivate virtualenv (fish) (with shell activation)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=1

  PYENV_SHELL="fish" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+set -e PYENV_VERSION;
+set -e PYENV_ACTIVATE_SHELL;
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
 if functions -q deactivate;
-  pyenv shell --unset;
-  set -e PYENV_ACTIVATE_SHELL;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  functions -e deactivate;
 end;
 EOS
 }

-@test "deactivate virtualenv (fish) (with shell activation) (no-error)" {
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+@test "deactivate virtualenv (fish) (with shell activation) (quiet)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export PYENV_ACTIVATE_SHELL=1

-  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet

  assert_success
  assert_output <<EOS
+set -e PYENV_VERSION;
+set -e PYENV_ACTIVATE_SHELL;
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
 if functions -q deactivate;
-  pyenv shell --unset;
-  set -e PYENV_ACTIVATE_SHELL;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  false;
+  functions -e deactivate;
 end;
 EOS
 }

@test "deactivate virtualenv which has been activated manually (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE=
  export PYENV_ACTIVATE_SHELL=

  PYENV_SHELL="fish" run pyenv-sh-deactivate

  assert_success
  assert_output <<EOS
+set -e PYENV_VIRTUAL_ENV;
+set -e VIRTUAL_ENV;
+if [ -n "\$_OLD_VIRTUAL_PATH" ];
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
+  set -e _OLD_VIRTUAL_PATH;
+end;
+if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -e _OLD_VIRTUAL_PYTHONHOME;
+end;
 if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$VIRTUAL_ENV";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
+  functions -e deactivate;
 end;
 EOS
 }
--- a/test/delete.bats
+++ b/test/delete.bats
@@ -0,0 +1,88 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "delete virtualenv" {
+  mkdir -p "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-virtualenv-prefix "venv27 : true"
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "venv27"
+
+  assert_success
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "delete virtualenv by symlink" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.11/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ ! -L "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "delete virtualenv with symlink" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.11/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ ! -L "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "not delete virtualenv with different symlink" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.8/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  ln -fs "${PYENV_ROOT}/versions/2.7.8/envs/venv27" "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ -L "${PYENV_ROOT}/versions/venv27" ]
+}
+
+@test "not delete virtualenv with same name" {
+  mkdir -p "${PYENV_ROOT}/versions/2.7.11/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/venv27"
+
+  stub pyenv-rehash "true"
+
+  run pyenv-virtualenv-delete -f "2.7.11/envs/venv27"
+
+  assert_success
+
+  unstub pyenv-rehash
+
+  [ ! -d "${PYENV_ROOT}/versions/2.7.11/envs/venv27" ]
+  [ -d "${PYENV_ROOT}/versions/venv27" ]
+}
--- a/test/envs.bats
+++ b/test/envs.bats
@@ -0,0 +1,47 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/envs/pyenv"
+}
+
+stub_pyenv() {
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-hooks "virtualenv : echo"
+  stub pyenv-rehash " : echo rehashed"
+}
+
+unstub_pyenv() {
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+}
+
+@test "path should be handled properly even if there is 'envs' in PYENV_ROOT" {
+  export PYENV_VERSION="3.5.1"
+  setup_m_venv "3.5.1"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-version-name "echo '${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
+  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip"
+
+  run pyenv-virtualenv venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
+rehashed
+OUT
+  assert [ -e "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip" ]
+
+  unstub_pyenv
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  teardown_m_venv "3.5.1"
+}
--- a/test/hooks.bats
+++ b/test/hooks.bats
@@ -13,23 +13,30 @@ setup() {
 before_virtualenv 'echo before: \$VIRTUALENV_PATH'
 after_virtualenv 'echo after: \$STATUS'
 OUT
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  setup_version "3.5.1"
+  create_executable "3.5.1" "virtualenv"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.5.1'"
+  stub pyenv-exec "python -m venv --help : true"
  stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
-  stub pyenv-exec "echo PYENV_VERSION=3.2.1 \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.5.1 \"\$@\""
  stub pyenv-rehash "echo rehashed"

-  create_executable "3.2.1" "virtualenv"
-  remove_executable "3.2.1" "pyvenv"
-
-  run pyenv-virtualenv "3.2.1" venv
+  run pyenv-virtualenv "3.5.1" venv

  assert_success
  assert_output <<-OUT
-before: ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+before: ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1 python -s -m ensurepip
 after: 0
 rehashed
 OUT
+
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-exec
+  unstub pyenv-rehash
+  teardown_version "3.5.1"
 }
--- a/test/init.bats
+++ b/test/init.bats
@@ -42,34 +42,24 @@ load test_helper
@test "fish instructions" {
  run pyenv-virtualenv-init fish
  assert [ "$status" -eq 1 ]
-  assert_output_contains 'status --is-interactive; and . (pyenv virtualenv-init -|psub)'
+  assert_output_contains 'status --is-interactive; and source (pyenv virtualenv-init -|psub)'
 }

@test "outputs bash-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
  run pyenv-virtualenv-init - bash
  assert_success
  assert_output <<EOS
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
-  if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
-      eval "\$(pyenv sh-deactivate --no-error --verbose)"
-      unset PYENV_DEACTIVATE
-      return 0
-    fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
-        unset PYENV_DEACTIVATE
-        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
-      else
-        eval "\$(pyenv sh-activate --no-error --verbose)"
-      fi
-    fi
+  local ret=\$?
+  if [ -n "\$VIRTUAL_ENV" ]; then
+    eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
  else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-activate --no-error --verbose)" || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
  fi
+  return \$ret
 };
 if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
  PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
@@ -78,64 +68,43 @@ EOS
 }

@test "outputs fish-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
  run pyenv-virtualenv-init - fish
  assert_success
  assert_output <<EOS
-setenv PYENV_VIRTUALENV_INIT 1;
+set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
-  set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
-  if [ -n "\$PYENV_ACTIVATE" ]
-    if [ (pyenv version-name 2>/dev/null; or true) = "system" ]
-      pyenv deactivate --no-error --verbose
-      set -e PYENV_DEACTIVATE
-      return 0
-    end
-    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
-      if pyenv deactivate --no-error --verbose
-        set -e PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
-    end
+  set -l ret \$status
+  if [ -n "\$VIRTUAL_ENV" ]
+    pyenv activate --quiet; or pyenv deactivate --quiet; or true
  else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "\$PYENV_PREFIX" ]
-      pyenv activate --no-error --verbose; or true
-    end
+    pyenv activate --quiet; or true
  end
+  return \$ret
 end
 EOS
 }

@test "outputs zsh-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
  run pyenv-virtualenv-init - zsh
  assert_success
  assert_output <<EOS
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
-  if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
-      eval "\$(pyenv sh-deactivate --no-error --verbose)"
-      unset PYENV_DEACTIVATE
-      return 0
-    fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      if eval "\$(pyenv sh-deactivate --no-error --verbose)"; then
-        unset PYENV_DEACTIVATE
-        eval "\$(pyenv sh-activate --no-error --verbose)" || unset PYENV_DEACTIVATE
-      else
-        eval "\$(pyenv sh-activate --no-error --verbose)"
-      fi
-    fi
+  local ret=\$?
+  if [ -n "\$VIRTUAL_ENV" ]; then
+    eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
  else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
-      eval "\$(pyenv sh-activate --no-error --verbose)" || true
-    fi
+    eval "\$(pyenv sh-activate --quiet || true)" || true
  fi
+  return \$ret
 };
 typeset -g -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
-  precmd_functions+=_pyenv_virtualenv_hook;
+  precmd_functions=(_pyenv_virtualenv_hook \$precmd_functions);
 fi
 EOS
 }
--- a/test/pip.bats
+++ b/test/pip.bats
@@ -21,54 +21,56 @@ unstub_pyenv() {
 }

@test "install pip with ensurepip" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_m_venv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
-  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin"
+  stub pyenv-exec "python -s -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip"

  run pyenv-virtualenv venv

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=venv python -s -m ensurepip
+PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
+PYENV_VERSION=3.5.1/envs/venv python -s -m ensurepip
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+  assert [ -e "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pip" ]

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_m_venv "3.5.1"
 }

@test "install pip without using ensurepip" {
-  export PYENV_VERSION="3.3.5"
+  export PYENV_VERSION="3.3.6"
+  setup_m_venv "3.3.6"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin"
  stub pyenv-exec "python -s -m ensurepip : false"
-  stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
+  stub pyenv-exec "python -s */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/3.3.6/envs/venv/bin/pip"
  stub curl true

-  remove_executable "3.3.5" "virtualenv"
-  create_executable "3.3.5" "pyvenv"
-
  run pyenv-virtualenv venv

  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
-PYENV_VERSION=venv python -s ${TMP}/pyenv/cache/get-pip.py
+PYENV_VERSION=3.3.6 python -m venv ${PYENV_ROOT}/versions/3.3.6/envs/venv
+Installing pip from https://bootstrap.pypa.io/3.3/get-pip.py...
+PYENV_VERSION=3.3.6/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+  assert [ -e "${PYENV_ROOT}/versions/3.3.6/envs/venv/bin/pip" ]

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_m_venv "3.3.6"
 }
--- a/test/prefix.bats
+++ b/test/prefix.bats
@@ -0,0 +1,246 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+create_version() {
+  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
+  touch "${PYENV_ROOT}/versions/$1/bin/python"
+  chmod +x "${PYENV_ROOT}/versions/$1/bin/python"
+}
+
+remove_version() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+create_virtualenv() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/lib/python${2:-$1}"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/lib/python${2:-$1}/orig-prefix.txt"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+create_virtualenv_jython() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/Lib/"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/Lib/orig-prefix.txt"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+create_virtualenv_pypy() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  mkdir -p "${PYENV_ROOT}/versions/$1/lib-python/${2:-$1}"
+  echo "${PYENV_ROOT}/versions/${2:-$1}" > "${PYENV_ROOT}/versions/$1/lib-python/${2:-$1}/orig-prefix.txt"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_virtualenv() {
+  remove_version "$1"
+  remove_version "${2:-$1}"
+}
+
+create_m_venv() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  echo "home = ${PYENV_ROOT}/versions/${2:-$1}/bin" > "${PYENV_ROOT}/versions/$1/pyvenv.cfg"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_m_venv() {
+  remove_version "${2:-$1}"
+}
+
+create_conda() {
+  create_version "$1"
+  create_version "${2:-$1}"
+  touch "${PYENV_ROOT}/versions/$1/bin/conda"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+  mkdir -p "${PYENV_ROOT}/versions/${2:-$1}/bin"
+  touch "${PYENV_ROOT}/versions/${2:-$1}/bin/conda"
+  touch "${PYENV_ROOT}/versions/${2:-$1}/bin/activate"
+}
+
+remove_conda() {
+  remove_version "${2:-$1}"
+}
+
+@test "display prefix of virtualenv created by virtualenv" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_virtualenv "foo" "2.7.11"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/2.7.11
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "2.7.11"
+}
+
+@test "display prefix of virtualenv created by virtualenv (pypy)" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_virtualenv_pypy "foo" "pypy-4.0.1"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/pypy-4.0.1
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "pypy-4.0.1"
+}
+
+@test "display prefix of virtualenv created by virtualenv (jython)" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_virtualenv_jython "foo" "jython-2.7.0"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/jython-2.7.0
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "jython-2.7.0"
+}
+
+@test "display prefixes of virtualenv created by virtualenv" {
+  stub pyenv-version-name "echo foo:bar"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" \
+                    "bar : echo \"${PYENV_ROOT}/versions/bar\""
+  create_virtualenv "foo" "2.7.11"
+  create_virtualenv "bar" "3.5.1"
+
+  PYENV_VERSION="foo:bar" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/2.7.11:${PYENV_ROOT}/versions/3.5.1
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "foo" "2.7.11"
+  remove_virtualenv "bar" "3.5.1"
+}
+
+@test "display prefix of virtualenv created by venv" {
+  stub pyenv-version-name "echo foo"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\""
+  create_m_venv "foo" "3.3.6"
+
+  PYENV_VERSION="foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/3.3.6
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_m_venv "foo" "3.3.6"
+}
+
+@test "display prefixes of virtualenv created by venv" {
+  stub pyenv-version-name "echo foo:bar"
+  stub pyenv-prefix "foo : echo \"${PYENV_ROOT}/versions/foo\"" \
+                    "bar : echo \"${PYENV_ROOT}/versions/bar\""
+  create_m_venv "foo" "3.3.6"
+  create_m_venv "bar" "3.4.4"
+
+  PYENV_VERSION="foo:bar" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/3.3.6:${PYENV_ROOT}/versions/3.4.4
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_m_venv "foo" "3.3.6"
+  remove_m_venv "bar" "3.4.4"
+}
+
+@test "display prefix of virtualenv created by conda" {
+  stub pyenv-version-name "echo miniconda3-3.16.0/envs/foo"
+  stub pyenv-prefix "miniconda3-3.16.0/envs/foo : echo \"${PYENV_ROOT}/versions/miniconda3-3.16.0/envs/foo\""
+  create_conda "miniconda3-3.16.0/envs/foo" "miniconda3-3.16.0"
+
+  PYENV_VERSION="miniconda3-3.16.0/envs/foo" run pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/miniconda3-3.16.0/envs/foo
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_conda "miniconda3-3.16.0/envs/foo" "miniconda3-3.16.0"
+}
+
+@test "should fail if the version is the system" {
+  stub pyenv-version-name "echo system"
+
+  PYENV_VERSION="system" run pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`system' is not a virtualenv
+OUT
+
+  unstub pyenv-version-name
+}
+
+@test "should fail if the version is not a virtualenv" {
+  stub pyenv-version-name "echo 3.4.4"
+  stub pyenv-prefix "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\""
+  create_version "3.4.4"
+
+  PYENV_VERSION="3.4.4" run pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`3.4.4' is not a virtualenv
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_version "3.4.4"
+}
+
+@test "should fail if one of the versions is not a virtualenv" {
+  stub pyenv-version-name "echo venv33:3.4.4"
+  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
+                    "3.4.4 : echo \"${PYENV_ROOT}/versions/3.4.4\""
+  create_virtualenv "venv33" "3.3.6"
+  create_version "3.4.4"
+
+  PYENV_VERSION="venv33:3.4.4" run pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`3.4.4' is not a virtualenv
+OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  remove_virtualenv "venv33" "3.3.6"
+  remove_version "3.4.4"
+}
--- a/test/python.bats
+++ b/test/python.bats
@@ -5,8 +5,8 @@ load test_helper
 setup() {
  export PYENV_ROOT="${TMP}/pyenv"
  export PYENV_VERSION="2.7.8"
-  create_executable "${PYENV_VERSION}" "virtualenv"
-  remove_executable "${PYENV_VERSION}" "pyvenv"
+  setup_version "2.7.8"
+  create_executable "2.7.8" "virtualenv"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
@@ -22,6 +22,7 @@ teardown() {
  unstub pyenv-prefix
  unstub pyenv-hooks
  unstub pyenv-rehash
+  teardown_version "2.7.8"
  rm -fr "$TMP"/*
 }

@@ -30,14 +31,15 @@ teardown() {
  create_executable "2.7.8" "python2.7"
  remove_executable "2.7.9" "python2.7"

-  stub pyenv-exec "virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"
  stub pyenv-which "python2.7 : echo ${PYENV_ROOT}/versions/2.7.8/bin/python2.7"

  run pyenv-virtualenv --verbose --python=python2.7 venv

  assert_output <<OUT
-PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.8/bin/python2.7 ${PYENV_ROOT}/versions/2.7.8/envs/venv
 OUT
  assert_success

@@ -54,7 +56,8 @@ OUT
  remove_executable "2.7.8" "python2.7"
  create_executable "2.7.9" "python2.7"

-  stub pyenv-exec "virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv --verbose * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"
  stub pyenv-which "python2.7 : false"
  stub pyenv-whence "python2.7 : echo 2.7.7; echo 2.7.8; echo 2.7.9"
@@ -63,7 +66,7 @@ OUT
  run pyenv-virtualenv --verbose --python=python2.7 venv

  assert_output <<OUT
-PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=2.7.8 virtualenv --verbose --python=${PYENV_ROOT}/versions/2.7.9/bin/python2.7 ${PYENV_ROOT}/versions/2.7.8/envs/venv
 OUT
  assert_success

--- a/test/pyvenv.bats
+++ b/test/pyvenv.bats
@@ -20,156 +20,159 @@ unstub_pyenv() {
  unstub pyenv-rehash
 }

-@test "use pyvenv if virtualenv is not available" {
-  export PYENV_VERSION="3.4.1"
+@test "use venv if virtualenv is not available" {
+  export PYENV_VERSION="3.5.1"
+  setup_m_venv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "python -m venv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"

-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
-
  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.5.1 python -m venv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_m_venv "3.5.1"
 }

-@test "not use pyvenv if virtualenv is available" {
-  export PYENV_VERSION="3.4.1"
+@test "not use venv if virtualenv is available" {
+  export PYENV_VERSION="3.5.1"
+  setup_m_venv "3.5.1"
+  create_executable "3.5.1" "virtualenv"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"

-  create_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
-
  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.5.1 virtualenv ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_m_venv "3.5.1"
 }

-@test "install virtualenv if pyvenv is not avaialble" {
+@test "install virtualenv if venv is not available" {
  export PYENV_VERSION="3.2.1"
+  setup_version "3.2.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "python -s -m ensurepip : false"
-  stub pyenv-exec "python -s */get-pip.py : true"
-  stub curl true
-
-  remove_executable "3.2.1" "virtualenv"
-  remove_executable "3.2.1" "pyvenv"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "pip install virtualenv* : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""

  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.2.1 pip install virtualenv
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+PYENV_VERSION=3.2.1 pip install virtualenv==13.1.2
+PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.2.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
-  unstub curl
+  teardown_version "3.2.1"
 }

@test "install virtualenv if -p has given" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_m_venv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
  stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"

-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
-
  run pyenv-virtualenv -p ${TMP}/python3 venv

  assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.5.1 pip install virtualenv
+PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_m_venv "3.5.1"
 }

@test "install virtualenv if --python has given" {
-  export PYENV_VERSION="3.4.1"
+  export PYENV_VERSION="3.5.1"
+  setup_m_venv "3.5.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : true"
  stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : true"

-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
-
  run pyenv-virtualenv --python=${TMP}/python3 venv

  assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.5.1 pip install virtualenv
+PYENV_VERSION=3.5.1 virtualenv --python=${TMP}/python3 ${PYENV_ROOT}/versions/3.5.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.5.1/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
+  teardown_m_venv "3.5.1"
 }

@test "install virtualenv with unsetting troublesome pip options" {
  export PYENV_VERSION="3.2.1"
+  setup_version "3.2.1"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "pip install virtualenv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "python -s -m ensurepip : false"
-  stub pyenv-exec "python -s */get-pip.py : true"
-  stub curl true
-
-  remove_executable "3.2.1" "virtualenv"
-  remove_executable "3.2.1" "pyvenv"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "pip install virtualenv* : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv * : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""

  PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
-PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv
-PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv==13.1.2
+PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/3.2.1/envs/venv
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/3.2.1/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
-  unstub curl
+  teardown_version "3.2.1"
 }
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -117,18 +117,54 @@ remove_executable() {
  rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
 }

-create_conda() {
-  local version="$1"
+setup_version() {
+  create_executable "$1" "python"
+  remove_executable "$1" "activate"
+  remove_executable "$1" "conda"
+}
+
+teardown_version() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+setup_virtualenv() {
+  create_executable "$1" "python"
+  create_executable "$1" "activate"
+  remove_executable "$1" "conda"
+}
+
+teardown_virtualenv() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+setup_m_venv() {
+  create_executable "$1" "python"
+  create_executable "$1" "activate"
+  remove_executable "$1" "conda"
+}
+
+teardown_m_venv() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+setup_conda() {
+  create_executable "$1" "python"
+  create_executable "$1" "activate"
+  create_executable "$1" "conda"
+  local conda="$1"
  shift 1
-  mkdir -p "${PYENV_ROOT}/versions/$version/bin"
-  touch "${PYENV_ROOT}/versions/$version/bin/activate"
-  touch "${PYENV_ROOT}/versions/$version/bin/conda"
-  chmod +x "${PYENV_ROOT}/versions/$version/bin/conda"
-  local conda_env
-  for conda_env; do
-    mkdir -p "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin"
-    touch "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/activate"
-    touch "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/conda"
-    chmod +x "${PYENV_ROOT}/versions/$version/envs/$conda_env/bin/conda"
+  local env
+  for env; do
+    create_executable "${conda}/envs/${env}" "python"
+    create_executable "${conda}/envs/${env}" "activate"
+    create_executable "${conda}/envs/${env}" "conda"
+    mkdir -p "${PYENV_ROOT}/versions/${conda}/envs/${env}/etc/conda/activate.d"
+    touch "${PYENV_ROOT}/versions/${conda}/envs/${env}/etc/conda/activate.d/activate.sh"
+    mkdir -p "${PYENV_ROOT}/versions/${conda}/envs/${env}/etc/conda/deactivate.d"
+    touch "${PYENV_ROOT}/versions/${conda}/envs/${env}/etc/conda/deactivate.d/deactivate.sh"
  done
 }
+
+teardown_conda() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
--- a/test/version.bats
+++ b/test/version.bats
@@ -4,40 +4,34 @@ load test_helper

 setup() {
  export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20151006"
 }

@test "display virtualenv version" {
+  setup_virtualenv "2.7.7"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
+  stub pyenv-exec "python -m venv --help : false"
  stub pyenv-exec "virtualenv --version : echo \"1.11\""

-  create_executable "2.7.7" "virtualenv"
-  remove_executable "2.7.7" "pyvenv"
-
  run pyenv-virtualenv --version

  assert_success
-  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
+  [[ "$output" == "pyenv-virtualenv "?.?.?" (virtualenv 1.11)" ]]

  unstub pyenv-prefix
  unstub pyenv-exec
+  teardown_virtualenv "2.7.7"
 }

-@test "display pyvenv version" {
+@test "display venv version" {
+  setup_m_venv "3.4.1"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
-  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.4.1/bin/pyvenv\""
-  stub pyenv-root "echo \"${PYENV_ROOT}\""
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
+  stub pyenv-exec "python -m venv --help : true"

  run pyenv-virtualenv --version

  assert_success
-  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.4.1)"
+  [[ "$output" == "pyenv-virtualenv "?.?.?" (python -m venv)" ]]

  unstub pyenv-prefix
-  unstub pyenv-root
+  teardown_m_venv "3.4.1"
 }
--- a/test/virtualenv-prefix.bats
+++ b/test/virtualenv-prefix.bats
@@ -1,158 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-setup() {
-  export PYENV_ROOT="${TMP}/pyenv"
-}
-
-create_virtualenv() {
-  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
-  touch "${PYENV_ROOT}/versions/$1/bin/activate"
-}
-
-remove_virtualenv() {
-  rm -fr "${PYENV_ROOT}/versions/$1"
-}
-
-@test "display prefix with using sys.real_prefix" {
-  stub pyenv-version-name "echo venv27"
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\""
-  create_virtualenv "venv27"
-
-  PYENV_VERSION="venv27" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv27"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/2.7.6
-OUT
-}
-
-@test "display prefixes with using sys.real_prefix" {
-  stub pyenv-version-name "echo venv27:venv32"
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\"" \
-                    "venv32 : echo \"${PYENV_ROOT}/versions/venv32\""
-  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\"" \
-                  "echo \"${PYENV_ROOT}/versions/3.2.1\""
-  create_virtualenv "venv27"
-  create_virtualenv "venv32"
-
-  PYENV_VERSION="venv27:venv32" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv27"
-  remove_virtualenv "venv32"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/2.7.6:${PYENV_ROOT}/versions/3.2.1
-OUT
-}
-
-@test "display prefix with using sys.base_prefix" {
-  stub pyenv-version-name "echo venv33"
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
-  create_virtualenv "venv33"
-
-  PYENV_VERSION="venv33" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/3.3.3
-OUT
-}
-
-@test "display prefixes with using sys.base_prefix" {
-  stub pyenv-version-name "echo venv33:venv34"
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
-                    "venv34 : echo \"${PYENV_ROOT}/versions/venv34\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\"" \
-                  "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.4.0\""
-  create_virtualenv "venv33"
-  create_virtualenv "venv34"
-
-  PYENV_VERSION="venv33:venv34" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-  remove_virtualenv "venv34"
-
-  assert_success
-  assert_output <<OUT
-${PYENV_ROOT}/versions/3.3.3:${PYENV_ROOT}/versions/3.4.0
-OUT
-}
-
-@test "should fail if the version is the system" {
-  stub pyenv-version-name "echo system"
-
-  PYENV_VERSION="system" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: version \`system' is not a virtualenv
-OUT
-}
-
-@test "should fail if the version is not a virtualenv" {
-  stub pyenv-version-name "echo 3.4.0"
-  stub pyenv-prefix "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
-  mkdir -p "${PYENV_ROOT}/versions/3.4.0"
-
-  PYENV_VERSION="3.4.0" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  rmdir "${PYENV_ROOT}/versions/3.4.0"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: version \`3.4.0' is not a virtualenv
-OUT
-}
-
-@test "should fail if one of the versions is not a virtualenv" {
-  stub pyenv-version-name "echo venv33:3.4.0"
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
-                    "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
-  stub pyenv-exec "false" \
-                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
-  create_virtualenv "venv33"
-  mkdir -p "${PYENV_ROOT}/versions/3.4.0"
-
-  PYENV_VERSION="venv33:3.4.0" run pyenv-virtualenv-prefix
-
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-  unstub pyenv-exec
-  remove_virtualenv "venv33"
-  rmdir "${PYENV_ROOT}/versions/3.4.0"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: version \`3.4.0' is not a virtualenv
-OUT
-}
-
-
--- a/test/virtualenv.bats
+++ b/test/virtualenv.bats
@@ -7,10 +7,8 @@ setup() {
 }

 stub_pyenv() {
+  setup_version "${PYENV_VERSION}"
  create_executable "${PYENV_VERSION}" "virtualenv"
-  remove_executable "${PYENV_VERSION}" "pyvenv"
-
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
  stub pyenv-hooks "virtualenv : echo"
@@ -21,59 +19,70 @@ unstub_pyenv() {
  unstub pyenv-prefix
  unstub pyenv-hooks
  unstub pyenv-rehash
+  teardown_version "${PYENV_VERSION}"
 }

@test "create virtualenv from given version" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
-  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true

-  run pyenv-virtualenv "3.2.1" "venv"
+  run pyenv-virtualenv "2.7.11" "venv"

-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "create virtualenv from current version" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true

  run pyenv-virtualenv venv

-  assert_success
  assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
+  assert_success

  unstub_pyenv
  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "create virtualenv with short options" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-exec "virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true
@@ -81,23 +90,27 @@ OUT
  run pyenv-virtualenv -v -p ${TMP}/python venv

  assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "create virtualenv with long options" {
-  export PYENV_VERSION="3.2.1"
+  export PYENV_VERSION="2.7.11"
  stub_pyenv "${PYENV_VERSION}"
  stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-exec "virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
  stub pyenv-exec "python -s -m ensurepip : false"
  stub pyenv-exec "python -s */get-pip.py : true"
  stub curl true
@@ -105,20 +118,22 @@ OUT
  run pyenv-virtualenv --verbose --python=${TMP}/python venv

  assert_output <<OUT
-PYENV_VERSION=3.2.1 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/2.7.11/envs/venv
 Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
  assert_success

  unstub_pyenv
  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
  unstub pyenv-exec
  unstub curl
 }

@test "no whitespace allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo bar"
+  run pyenv-virtualenv "2.7.11" "foo bar"

  assert_failure
  assert_output <<OUT
@@ -127,10 +142,54 @@ OUT
 }

@test "no tab allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo	bar baz"
+  run pyenv-virtualenv "2.7.11" "foo	bar baz"

  assert_failure
  assert_output <<OUT
 pyenv-virtualenv: no whitespace allowed in virtualenv name.
 OUT
 }
+
+@test "system not allowed as virtualenv name" {
+  run pyenv-virtualenv "2.7.11" "system"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: \`system' is not allowed as virtualenv name.
+OUT
+}
+
+@test "no slash allowed in virtualenv name" {
+  run pyenv-virtualenv "2.7.11" "foo/bar"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: no slash allowed in virtualenv name.
+OUT
+}
+
+@test "slash allowed if it is the long name of the virtualenv" {
+  export PYENV_VERSION="2.7.11"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-virtualenv-prefix " : false"
+  stub pyenv-exec "python -m venv --help : false"
+  stub pyenv-exec "virtualenv * : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -s -m ensurepip : false"
+  stub pyenv-exec "python -s */get-pip.py : true"
+  stub curl true
+
+  run pyenv-virtualenv "2.7.11" "2.7.11/envs/foo"
+
+  assert_output <<OUT
+PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/foo
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
+rehashed
+OUT
+  assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/foo/bin/pydoc" ]
+  assert_success
+
+  unstub_pyenv
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-exec
+  unstub curl
+}
--- a/test/virtualenvs.bats
+++ b/test/virtualenvs.bats
@@ -12,66 +12,55 @@ setup() {

@test "list virtual environments only" {
  stub pyenv-version-name ": echo system"
-  stub pyenv-versions "--bare : echo \"system\";echo \"2.7.6\";echo \"3.3.3\";echo \"venv27\";echo \"venv33\""
  stub pyenv-virtualenv-prefix "2.7.6 : false"
  stub pyenv-virtualenv-prefix "3.3.3 : false"
  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
  stub pyenv-virtualenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""

  run pyenv-virtualenvs

-  unstub pyenv-version-name
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<OUT
  venv27 (created from ${PYENV_ROOT}/versions/2.7.6)
  venv33 (created from ${PYENV_ROOT}/versions/3.3.3)
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
 }

@test "list virtual environments with hit prefix" {
  stub pyenv-version-name ": echo venv33"
-  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
-  stub pyenv-prefix "venv27 : echo \"/usr\""
-  stub pyenv-prefix "venv33 : echo \"/usr\""

  run pyenv-virtualenvs

-  unstub pyenv-version-name
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<OUT
  venv27 (created from /usr)
 * venv33 (created from /usr)
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
 }

@test "list virtual environments with --bare" {
-  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
-  stub pyenv-prefix "venv27 : echo \"/usr\""
-  stub pyenv-prefix "venv33 : echo \"/usr\""

  run pyenv-virtualenvs --bare

-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
  assert_success
  assert_output <<OUT
 venv27
 venv33
 OUT
+
+  unstub pyenv-virtualenv-prefix
 }