diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index 4460631..7450d50 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -162,7 +162,7 @@ esac
 case "${shell}" in
 fish )
   cat <<EOS
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
diff --git a/test/conda-deactivate.bats b/test/conda-deactivate.bats
index 895b087..401ba86 100644
--- a/test/conda-deactivate.bats
+++ b/test/conda-deactivate.bats
@@ -77,7 +77,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
diff --git a/test/deactivate.bats b/test/deactivate.bats
index 1105d0c..fac034a 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -228,7 +228,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -255,7 +255,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -284,7 +284,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -313,7 +313,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS
@@ -340,7 +340,7 @@ if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
   setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
   set -e _OLD_VIRTUAL_PYTHONHOME;
 end;
-if functions -g deactivate;
+if functions -q deactivate;
   functions -e deactivate;
 end;
 EOS