diff --git a/docs/source/configuration/local.rst b/docs/source/configuration/local.rst
index bf20cfcf..6aa3a1db 100644
--- a/docs/source/configuration/local.rst
+++ b/docs/source/configuration/local.rst
@@ -37,6 +37,8 @@ Vim configuration can be overridden using the following options:
     was configured in :ref:`log_* options <config-common-log>`. Level is always 
     :ref:`log_level <config-common-log_level>`, same for format.
 
+.. _local-configuration-overrides-script:
+
 Powerline script overrides
 ==========================
 
@@ -69,7 +71,10 @@ Powerline script has a number of options controlling powerline behavior. Here
 
 .. warning::
     Such overrides are suggested for testing purposes only. Use 
-    :ref:`Environment variables overrides` for other purposes.
+    :ref:`Environment variables overrides <local-configuration-overrides-env>` 
+    for other purposes.
+
+.. _local-configuration-overrides-env:
 
 Environment variables overrides
 ===============================
@@ -143,14 +148,16 @@ searched for configuration.
 
 .. note::
     Overrides from environment variables have lower priority then 
-    :ref:`Powerline script overrides`. Latter are suggested for tests only.
+    :ref:`Powerline script overrides <local-configuration-overrides-script>`. 
+    Latter are suggested for tests only.
 
 Zsh/zpython overrides
 =====================
 
 Here overrides are controlled by similarly to the powerline script, but values 
-are taken from zsh variables. :ref:`Environment variable overrides` are also 
-supported: if variable is a string this variant is used.
+are taken from zsh variables. :ref:`Environment variable overrides 
+<local-configuration-overrides-env>` are also supported: if variable is a string 
+this variant is used.
 
 ``POWERLINE_CONFIG_OVERRIDES``
     Overrides options from :file:`powerline/config.json`. Should be a zsh 
@@ -210,7 +217,9 @@ putting powerline into different directory.
     ``$POWERLINE_COMMAND`` appears in shell scripts without quotes thus you can 
     specify additional parameters in bash. In tmux it is passed to ``eval`` and 
     depends on the shell used. POSIX-compatible shells, zsh, bash and fish will 
-    split this variable in this case.
+    split this variable in this case. Do not use this feature for overriding 
+    configuration: there are :ref:`Environment variables overrides 
+    <local-configuration-overrides-env>`.
 
 If you want to disable prompt in shell, but still have tmux support or if you 
 want to disable tmux support you can use variables 
diff --git a/tests/test_shells/bash.daemon.ok b/tests/test_shells/bash.daemon.ok
index f6c3d0ff..e4535b1e 100644
--- a/tests/test_shells/bash.daemon.ok
+++ b/tests/test_shells/bash.daemon.ok
@@ -7,8 +7,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated              bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
- USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo '
                                      abc
                                      def
@@ -26,5 +26,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/bash.nodaemon.ok b/tests/test_shells/bash.nodaemon.ok
index 36e317fe..56dd1fc5 100644
--- a/tests/test_shells/bash.nodaemon.ok
+++ b/tests/test_shells/bash.nodaemon.ok
@@ -7,8 +7,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated              bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
- USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo '
    abc
    def
@@ -26,5 +26,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/busybox.daemon.ok b/tests/test_shells/busybox.daemon.ok
index fcaf7474..0230f4de 100644
--- a/tests/test_shells/busybox.daemon.ok
+++ b/tests/test_shells/busybox.daemon.ok
@@ -6,8 +6,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated                 bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
- USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo '
                                      abc
                                      def
@@ -25,5 +25,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/busybox.nodaemon.ok b/tests/test_shells/busybox.nodaemon.ok
index f3edb6e8..fa485401 100644
--- a/tests/test_shells/busybox.nodaemon.ok
+++ b/tests/test_shells/busybox.nodaemon.ok
@@ -6,8 +6,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
 [1]+  Terminated                 bgscript.sh
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
- USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo '
    abc
    def
@@ -25,5 +25,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/dash.daemon.ok b/tests/test_shells/dash.daemon.ok
index cbcd8f79..042665d8 100644
--- a/tests/test_shells/dash.daemon.ok
+++ b/tests/test_shells/dash.daemon.ok
@@ -5,8 +5,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1   USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+set_theme_option default_leftonly.segment_data.hostname.display false
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1   USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo '
                                      abc
                                      def
@@ -24,5 +24,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/dash.nodaemon.ok b/tests/test_shells/dash.nodaemon.ok
index 64e455b6..bac163c1 100644
--- a/tests/test_shells/dash.nodaemon.ok
+++ b/tests/test_shells/dash.nodaemon.ok
@@ -5,8 +5,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1   USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+set_theme_option default_leftonly.segment_data.hostname.display false
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1   USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo '
    abc
    def
@@ -24,5 +24,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/input.bash b/tests/test_shells/input.bash
index 4ad925fc..0a1c0165 100644
--- a/tests/test_shells/input.bash
+++ b/tests/test_shells/input.bash
@@ -1,7 +1,13 @@
+set_theme_option() {
+	export POWERLINE_THEME_OVERRIDES="${POWERLINE_THEME_OVERRIDES};$1=$2"
+}
+set_theme() {
+	export POWERLINE_CONFIG_OVERRIDES="ext.shell.theme=$1"
+}
+set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false
+set_theme default_leftonly
 export VIRTUAL_ENV=
 source powerline/bindings/bash/powerline.sh
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
 cd tests/shell/3rd
 cd .git
 cd ..
@@ -10,8 +16,8 @@ VIRTUAL_ENV=
 bgscript.sh & waitpid.sh
 false
 kill `cat pid` ; sleep 1s
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+set_theme_option default_leftonly.segment_data.hostname.display false
+set_theme_option default_leftonly.segment_data.user.display false
 echo '
 abc
 def
@@ -25,7 +31,7 @@ cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
 cd ../'«Unicode!»'
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+set_theme_option default_leftonly.dividers.left.hard \$ABC
 false
 true is the last line
 exit
diff --git a/tests/test_shells/input.busybox b/tests/test_shells/input.busybox
index 94bee2f5..16824d7b 100644
--- a/tests/test_shells/input.busybox
+++ b/tests/test_shells/input.busybox
@@ -1,6 +1,12 @@
+set_theme_option() {
+	export POWERLINE_THEME_OVERRIDES="${POWERLINE_THEME_OVERRIDES};$1=$2"
+}
+set_theme() {
+	export POWERLINE_CONFIG_OVERRIDES="ext.shell.theme=$1"
+}
+set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false
+set_theme default_leftonly
 . powerline/bindings/shell/powerline.sh
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
 export VIRTUAL_ENV=
 cd tests/shell/3rd
 cd .git
@@ -10,8 +16,8 @@ VIRTUAL_ENV=
 bgscript.sh & waitpid.sh
 false
 kill `cat pid` ; sleep 1s
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+set_theme_option default_leftonly.segment_data.hostname.display false
+set_theme_option default_leftonly.segment_data.user.display false
 echo '
 abc
 def
@@ -25,7 +31,7 @@ cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
 cd ../'«Unicode!»'
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+set_theme_option default_leftonly.dividers.left.hard \$ABC
 false
 true is the last line
 exit
diff --git a/tests/test_shells/input.dash b/tests/test_shells/input.dash
index 94bee2f5..16824d7b 100644
--- a/tests/test_shells/input.dash
+++ b/tests/test_shells/input.dash
@@ -1,6 +1,12 @@
+set_theme_option() {
+	export POWERLINE_THEME_OVERRIDES="${POWERLINE_THEME_OVERRIDES};$1=$2"
+}
+set_theme() {
+	export POWERLINE_CONFIG_OVERRIDES="ext.shell.theme=$1"
+}
+set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false
+set_theme default_leftonly
 . powerline/bindings/shell/powerline.sh
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
 export VIRTUAL_ENV=
 cd tests/shell/3rd
 cd .git
@@ -10,8 +16,8 @@ VIRTUAL_ENV=
 bgscript.sh & waitpid.sh
 false
 kill `cat pid` ; sleep 1s
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+set_theme_option default_leftonly.segment_data.hostname.display false
+set_theme_option default_leftonly.segment_data.user.display false
 echo '
 abc
 def
@@ -25,7 +31,7 @@ cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
 cd ../'«Unicode!»'
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+set_theme_option default_leftonly.dividers.left.hard \$ABC
 false
 true is the last line
 exit
diff --git a/tests/test_shells/input.fish b/tests/test_shells/input.fish
index 0e09b54d..968248f1 100644
--- a/tests/test_shells/input.fish
+++ b/tests/test_shells/input.fish
@@ -1,10 +1,16 @@
+function set_theme_option
+	set -g -x POWERLINE_THEME_OVERRIDES "$POWERLINE_THEME_OVERRIDES;$argv[1]=$argv[2]"
+end
+function set_theme
+	set -g -x POWERLINE_CONFIG_OVERRIDES "ext.shell.theme=$argv"
+end
+set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false
+set_theme default_leftonly
 set fish_function_path "$PWD/powerline/bindings/fish" $fish_function_path
 while jobs | grep fish_update_completions
 	sleep 1
 end
 powerline-setup
-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"
 setenv VIRTUAL_ENV
 cd tests/shell/3rd
 cd .git
@@ -23,7 +29,7 @@ cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
 cd ../'«Unicode!»'
-set POWERLINE_COMMAND "$POWERLINE_COMMAND -c ext.shell.theme=default"
+set_theme default
 set -g fish_key_bindings fish_vi_key_bindings
 ii
 false
diff --git a/tests/test_shells/input.mksh b/tests/test_shells/input.mksh
index 8174254a..1656800e 100644
--- a/tests/test_shells/input.mksh
+++ b/tests/test_shells/input.mksh
@@ -1,6 +1,12 @@
+set_theme_option() {
+	export POWERLINE_THEME_OVERRIDES="${POWERLINE_THEME_OVERRIDES};$1=$2"
+}
+set_theme() {
+	export POWERLINE_CONFIG_OVERRIDES="ext.shell.theme=$1"
+}
+set_theme default_leftonly
+set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false
 . powerline/bindings/shell/powerline.sh
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
 export VIRTUAL_ENV=
 cd tests/shell/3rd
 cd .git
@@ -10,8 +16,8 @@ VIRTUAL_ENV=
 bgscript.sh & waitpid.sh
 false
 kill `cat pid` ; sleep 1
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+set_theme_option default_leftonly.segment_data.hostname.display false
+set_theme_option default_leftonly.segment_data.user.display false
 echo -n
 echo '
 abc
@@ -26,7 +32,7 @@ cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
 cd ../'«Unicode!»'
-POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+set_theme_option default_leftonly.dividers.left.hard \$ABC
 false
 true is the last line
 exit
diff --git a/tests/test_shells/input.tcsh b/tests/test_shells/input.tcsh
index 5302783b..509c7ae6 100644
--- a/tests/test_shells/input.tcsh
+++ b/tests/test_shells/input.tcsh
@@ -1,5 +1,6 @@
+setenv POWERLINE_THEME_OVERRIDES "default_leftonly.segment_data.hostname.args.only_if_ssh=false"
+setenv POWERLINE_CONFIG_OVERRIDES "ext.shell.theme=default_leftonly"
 source powerline/bindings/tcsh/powerline.tcsh
-set POWERLINE_COMMAND=$POWERLINE_COMMAND:q" -t default_leftonly.segment_data.hostname.args.only_if_ssh=false -c ext.shell.theme=default_leftonly"
 unsetenv VIRTUAL_ENV
 cd tests/shell/3rd
 cd .git
diff --git a/tests/test_shells/mksh.daemon.ok b/tests/test_shells/mksh.daemon.ok
index 72d58e3d..3619f422 100644
--- a/tests/test_shells/mksh.daemon.ok
+++ b/tests/test_shells/mksh.daemon.ok
@@ -8,8 +8,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1
 [1] + Terminated bash -c ...
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
- USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo -n
   BRANCH  ⋯  tests  shell  3rd  echo '
                                      abc
@@ -28,5 +28,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/mksh.nodaemon.ok b/tests/test_shells/mksh.nodaemon.ok
index a3550ca6..754633ab 100644
--- a/tests/test_shells/mksh.nodaemon.ok
+++ b/tests/test_shells/mksh.nodaemon.ok
@@ -8,8 +8,8 @@
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false
   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1
 [1] + Terminated bash -c ...
-  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.display=false"
- USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.user.display=false"
+  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.hostname.display false
+ USER   BRANCH  ⋯  tests  shell  3rd  set_theme_option default_leftonly.segment_data.user.display false
   BRANCH  ⋯  tests  shell  3rd  echo -n
   BRANCH  ⋯  tests  shell  3rd  echo '
    abc
@@ -28,5 +28,5 @@ def
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»'
-  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH  ⋯  shell  3rd  «Unicode!»  set_theme_option default_leftonly.dividers.left.hard \$ABC
   BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse
diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index 03ac0ebb..9306323a 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -78,7 +78,8 @@ run() {
 		PYTHONPATH="${PWD}${PYTHONPATH:+:}$PYTHONPATH" \
 		POWERLINE_SHELL_CONTINUATION=$additional_prompts \
 		POWERLINE_SHELL_SELECT=$additional_prompts \
-		POWERLINE_COMMAND="${POWERLINE_COMMAND} -p $PWD/powerline/config_files" \
+		POWERLINE_CONFIG_PATHS="$PWD/powerline/config_files" \
+		POWERLINE_COMMAND="${POWERLINE_COMMAND}" \
 		"$@"
 }