diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate
index ec3454a..6586de8 100755
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -146,8 +146,8 @@ if [ -z "$no_shell" ]; then
   case "$shell" in
   fish )
     cat <<EOS
-setenv PYENV_VERSION "${versions[*]}";
-setenv PYENV_ACTIVATE_SHELL 1;
+set -gx PYENV_VERSION "${versions[*]}";
+set -gx PYENV_ACTIVATE_SHELL 1;
 EOS
     ;;
   * )
@@ -164,8 +164,8 @@ fi
 case "${shell}" in
 fish )
   cat <<EOS
-setenv PYENV_VIRTUAL_ENV "${prefix}";
-setenv VIRTUAL_ENV "${prefix}";
+set -gx PYENV_VIRTUAL_ENV "${prefix}";
+set -gx VIRTUAL_ENV "${prefix}";
 EOS
   ;;
 * )
@@ -185,7 +185,7 @@ if [ -x "${prefix}/bin/conda" ]; then
   fi
   case "${shell}" in
   fish )
-    echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
+    echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
     ;;
   * )
     echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
@@ -197,7 +197,7 @@ if [ -n "${PYTHONHOME}" ]; then
   case "${shell}" in
   fish )
     cat <<EOS
-setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
+set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
 set -e PYTHONHOME;
 EOS
     ;;
diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index 9562578..7afdb89 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -125,7 +125,7 @@ case "${shell}" in
 fish )
   cat <<EOS
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 EOS
@@ -144,7 +144,7 @@ case "${shell}" in
 fish )
   cat <<EOS
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 EOS
diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index 834a9fd..765b8da 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -86,8 +86,8 @@ fi
 case "$shell" in
 fish )
   cat <<EOS
-setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
-setenv PYENV_VIRTUALENV_INIT 1;
+set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
+set -gx PYENV_VIRTUALENV_INIT 1;
 EOS
   ;;
 * )
diff --git a/test/activate.bats b/test/activate.bats
index c64ed1f..88dc493 100644
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -138,8 +138,8 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+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
 
@@ -162,10 +162,10 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
+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
 
@@ -239,10 +239,10 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+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
 
@@ -263,10 +263,10 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VERSION "venv27";
-setenv PYENV_ACTIVATE_SHELL 1;
-setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
-setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
+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
 
@@ -381,7 +381,7 @@ EOS
   stub pyenv-virtualenv-prefix "2.7.10 : false"
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
-  run pyenv-sh-activate "venv27" "2.7.10"
+  PYENV_SHELL="bash" run pyenv-sh-activate "venv27" "2.7.10"
 
   assert_success
   assert_output <<EOS
diff --git a/test/conda-activate.bats b/test/conda-activate.bats
index 39d7301..768b8d8 100644
--- a/test/conda-activate.bats
+++ b/test/conda-activate.bats
@@ -62,9 +62,9 @@ EOS
   assert_success
   assert_output <<EOS
 deactivated
-setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
-setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
-setenv CONDA_DEFAULT_ENV "root";
+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
 
diff --git a/test/conda-deactivate.bats b/test/conda-deactivate.bats
index 647b0c9..b390810 100644
--- a/test/conda-deactivate.bats
+++ b/test/conda-deactivate.bats
@@ -69,11 +69,11 @@ set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 set -e CONDA_DEFAULT_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
diff --git a/test/deactivate.bats b/test/deactivate.bats
index 59a780a..ad8f553 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -247,11 +247,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -273,11 +273,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -301,11 +301,11 @@ set -e PYENV_ACTIVATE_SHELL;
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -329,11 +329,11 @@ set -e PYENV_ACTIVATE_SHELL;
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
@@ -355,11 +355,11 @@ EOS
 set -e PYENV_VIRTUAL_ENV;
 set -e VIRTUAL_ENV;
 if [ -n "\$_OLD_VIRTUAL_PATH" ];
-  setenv PATH "\$_OLD_VIRTUAL_PATH";
+  set -gx PATH "\$_OLD_VIRTUAL_PATH";
   set -e _OLD_VIRTUAL_PATH;
 end;
 if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
-  setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
+  set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
 if functions -q deactivate;
diff --git a/test/init.bats b/test/init.bats
index 8c1f899..74b0e2b 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -72,8 +72,8 @@ EOS
   run pyenv-virtualenv-init - fish
   assert_success
   assert_output <<EOS
-setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
-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 ret \$status
   if [ -n "\$VIRTUAL_ENV" ]