diff --git a/docs/source/overview.rst b/docs/source/overview.rst
index 770e769c..90a4a791 100644
--- a/docs/source/overview.rst
+++ b/docs/source/overview.rst
@@ -158,7 +158,8 @@ is the absolute path to your Powerline installation directory:
 
 .. code-block:: bash
 
-   . {repository_root}/powerline/bindings/fish/powerline.fish
+   set fish_function_path $fish_function_path "{repository_root}/powerline/bindings/fish"
+   powerline-setup
 
 Tmux statusline
 ---------------
diff --git a/powerline/bindings/fish/powerline.fish b/powerline/bindings/fish/powerline-setup.fish
similarity index 97%
rename from powerline/bindings/fish/powerline.fish
rename to powerline/bindings/fish/powerline-setup.fish
index 196e9c81..e4dc1ace 100644
--- a/powerline/bindings/fish/powerline.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -1,4 +1,4 @@
-function powerline
+function powerline-setup
 	if test -z "$POWERLINE_COMMAND"
 		if which powerline-client >/dev/null
 			set -g -x POWERLINE_COMMAND powerline-client
@@ -33,4 +33,3 @@ function powerline
 	_powerline_tmux_set_columns
 	_powerline_tmux_set_pwd
 end
-powerline
diff --git a/tests/test_shells/input.fish b/tests/test_shells/input.fish
index 41f0ca40..dda72ec5 100644
--- a/tests/test_shells/input.fish
+++ b/tests/test_shells/input.fish
@@ -2,7 +2,8 @@ set POWERLINE_COMMAND "$PWD/scripts/powerline -p $PWD/powerline/config_files"
 set POWERLINE_COMMAND "$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
 set POWERLINE_COMMAND "$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
 set VIRTUAL_ENV
-. powerline/bindings/fish/powerline.fish ; cd tests/shell/3rd
+set fish_function_path $fish_function_path "$PWD/powerline/bindings/fish"
+powerline-setup ; cd tests/shell/3rd
 cd .git
 cd ..
 set VIRTUAL_ENV "$HOME/.virtenvs/some-virtual-environment"