diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
index edf9189816fd..aa46ad6c8574 100644
--- a/salt/client/ssh/__init__.py
+++ b/salt/client/ssh/__init__.py
@@ -922,8 +922,8 @@ def run_wfunc(self):
                     opts_pkg['grains'][grain] = self.target['grains'][grain]
 
             popts = {}
-            popts.update(opts_pkg['__master_opts__'])
             popts.update(opts_pkg)
+            popts.update(opts_pkg['__master_opts__'])
             pillar = salt.pillar.Pillar(
                     popts,
                     opts_pkg['grains'],