diff --git a/libexec/pyenv-which b/libexec/pyenv-which
index 0ebf8219..4cdcfeb0 100755
--- a/libexec/pyenv-which
+++ b/libexec/pyenv-which
@@ -112,8 +112,8 @@ else
         echo "The \`$PYENV_COMMAND' command exists in these Python versions:"
         echo "$versions" | sed 's/^/  /g'
         echo
-        echo "Note: See 'pyenv help global' for tips on allowing both"
-        echo "      python2 and python3 to be found."
+        echo "Note: See 'pyenv help global' for tips on allowing multiple"
+        echo "      Python versions to be found at the same time."
       } >&2
     fi
   fi
diff --git a/test/which.bats b/test/which.bats
index e54c1704..91138804 100644
--- a/test/which.bats
+++ b/test/which.bats
@@ -68,8 +68,8 @@ pyenv: py.test: command not found
 The \`py.test' command exists in these Python versions:
   3.4
 
- Note: See 'pyenv help global' for tips on allowing both
-       python2 and python3 to be found.
+Note: See 'pyenv help global' for tips on allowing multiple
+      Python versions to be found at the same time.
 OUT
 }
 
@@ -85,8 +85,8 @@ pyenv: py.test: command not found
 The \`py.test' command exists in these Python versions:
   3.4
 
- Note: See 'pyenv help global' for tips on allowing both
-       python2 and python3 to be found.
+Note: See 'pyenv help global' for tips on allowing multiple
+      Python versions to be found at the same time.
 OUT
 }
 
@@ -118,8 +118,8 @@ The \`py.test' command exists in these Python versions:
   3.3
   3.4
 
-Note: See 'pyenv help global' for tips on allowing both
-      python2 and python3 to be found.
+Note: See 'pyenv help global' for tips on allowing multiple
+      Python versions to be found at the same time.
 OUT
 }