diff --git a/zaza/charm_tests/series_upgrade/tests.py b/zaza/charm_tests/series_upgrade/tests.py
index 3943849..bf1aa6a 100644
--- a/zaza/charm_tests/series_upgrade/tests.py
+++ b/zaza/charm_tests/series_upgrade/tests.py
@@ -50,7 +50,7 @@ class SeriesUpgradeTest(unittest.TestCase):
             # Defaults
             origin = "openstack-origin"
             pause_non_leader_subordinate = True
-            pause_non_leader_primary = False
+            pause_non_leader_primary = True
             # Skip subordinates
             if applications[application]["subordinate-to"]:
                 continue
diff --git a/zaza/utilities/generic.py b/zaza/utilities/generic.py
index 49ba34c..c062e2f 100644
--- a/zaza/utilities/generic.py
+++ b/zaza/utilities/generic.py
@@ -298,6 +298,9 @@ def series_upgrade(unit_name, machine_num,
     model.block_until_unit_wl_status(unit_name, "blocked")
     logging.info("Watiing for model idleness")
     model.block_until_all_units_idle()
+    logging.info("Set origin on {}".format(application))
+    set_origin(application, origin)
+    model.block_until_all_units_idle()
     logging.info("Complete series upgrade on {}".format(machine_num))
     model.complete_series_upgrade(machine_num)
     model.block_until_all_units_idle()
@@ -305,9 +308,6 @@ def series_upgrade(unit_name, machine_num,
                  .format(unit_name))
     model.block_until_unit_wl_status(unit_name, "active")
     model.block_until_all_units_idle()
-    logging.info("Set origin on {}".format(application))
-    set_origin(application, origin)
-    model.block_until_all_units_idle()
     # This step may be performed by juju in the future
     logging.info("Set series on {} to {}".format(application, to_series))
     model.set_series(application, to_series)