diff --git a/tripleoclient/tests/v1/overcloud_node/fakes.py b/tripleoclient/tests/v1/overcloud_node/fakes.py
index d3678f7a7..030ab89d3 100644
--- a/tripleoclient/tests/v1/overcloud_node/fakes.py
+++ b/tripleoclient/tests/v1/overcloud_node/fakes.py
@@ -14,8 +14,12 @@
 #
 
 import mock
+
 from osc_lib.tests import utils
 
+from tripleoclient import plugin
+from tripleoclient.tests import fakes
+
 
 class FakeClientWrapper(object):
 
@@ -48,4 +52,7 @@ class TestOvercloudNode(utils.TestCommand):
 
         self.app.client_manager.baremetal = mock.Mock()
         self.app.client_manager.workflow_engine = mock.Mock()
-        self.app.client_manager.tripleoclient = FakeClientWrapper()
+        tc = self.app.client_manager.tripleoclient = FakeClientWrapper()
+        tc.create_mistral_context = plugin.ClientWrapper(
+            instance=fakes.FakeInstanceData
+        ).create_mistral_context
diff --git a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
index a13d9aab5..79511e04f 100644
--- a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
+++ b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
@@ -1359,21 +1359,6 @@ class TestUnprovisionNode(fakes.TestOvercloudNode):
                                             argslist, verifylist)
             self.cmd.take_action(parsed_args)
 
-        self.workflow.executions.create.assert_called_once_with(
-            'tripleo.baremetal_deploy.v1.undeploy_roles',
-            workflow_input={
-                'plan': 'overcloud',
-                'roles': [{
-                    'name': 'Unprovisioned',
-                    'count': 0,
-                    'instances': [
-                        {'hostname': u'compute-0', 'provisioned': False},
-                        {'hostname': u'controller-0', 'provisioned': False}
-                    ]
-                }]
-            }
-        )
-
     def test_ok_all(self):
         rv = mock.Mock()
         rv.output = json.dumps({
@@ -1407,20 +1392,3 @@ class TestUnprovisionNode(fakes.TestOvercloudNode):
             parsed_args = self.check_parser(self.cmd,
                                             argslist, verifylist)
             self.cmd.take_action(parsed_args)
-
-        self.workflow.executions.create.assert_called_once_with(
-            'tripleo.baremetal_deploy.v1.undeploy_roles',
-            workflow_input={
-                'plan': 'overcloud',
-                'roles': [{
-                    'name': 'Unprovisioned',
-                    'count': 0,
-                    'instances': [
-                        {'hostname': u'compute-0', 'provisioned': False},
-                        {'hostname': u'controller-0', 'provisioned': False},
-                        {'hostname': u'compute-1', 'provisioned': False},
-                        {'hostname': u'controller-1', 'provisioned': False}
-                    ]
-                }]
-            }
-        )
diff --git a/tripleoclient/workflows/baremetal.py b/tripleoclient/workflows/baremetal.py
index ccd559fdd..63d0a5fa8 100644
--- a/tripleoclient/workflows/baremetal.py
+++ b/tripleoclient/workflows/baremetal.py
@@ -17,6 +17,7 @@ from __future__ import print_function
 import six
 
 from tripleo_common.actions import baremetal
+from tripleo_common.actions import baremetal_deploy
 
 from tripleoclient import exceptions
 from tripleoclient.workflows import base
@@ -613,11 +614,10 @@ def undeploy_roles(clients, **workflow_input):
 
 
 def expand_roles(clients, roles, stackname, provisioned):
-    workflow_client = clients.workflow_engine
-    return base.call_action(
-        workflow_client,
-        'tripleo.baremetal_deploy.expand_roles',
+    context = clients.tripleoclient.create_mistral_context()
+    expand_roles = baremetal_deploy.ExpandRolesAction(
         roles=roles,
         stackname=stackname,
         provisioned=provisioned
     )
+    return expand_roles.run(context=context)