diff --git a/test/init.bats b/test/init.bats
index ba90b5d..260c638 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -72,6 +72,8 @@ EOS
   run pyenv-virtualenv-init - fish
   assert_success
   assert_output <<EOS
+while set index (contains -i -- "${TMP}/pyenv/plugins/pyenv-virtualenv/shims" $PATH)
+set -eg PATH[$index]; end; set -e index
 set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
 set -gx PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
diff --git a/test/pip.bats b/test/pip.bats
index 491613c..73a402f 100644
--- a/test/pip.bats
+++ b/test/pip.bats
@@ -63,7 +63,7 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.3.6 python3.3 -m venv ${PYENV_ROOT}/versions/3.3.6/envs/venv
-Installing pip from https://bootstrap.pypa.io/3.3/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/3.3/get-pip.py...
 PYENV_VERSION=3.3.6/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
 rehashed
 OUT
diff --git a/test/virtualenv.bats b/test/virtualenv.bats
index c22e563..de1f064 100644
--- a/test/virtualenv.bats
+++ b/test/virtualenv.bats
@@ -38,7 +38,7 @@ unstub_pyenv() {
 
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/2.7/get-pip.py...
 rehashed
 OUT
   assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]