diff --git a/mistral/actions/openstack/actions.py b/mistral/actions/openstack/actions.py
index f594151dc..e8eb71b75 100644
--- a/mistral/actions/openstack/actions.py
+++ b/mistral/actions/openstack/actions.py
@@ -823,8 +823,9 @@ class SenlinAction(base.OpenStackAction):
 
     @classmethod
     def _get_fake_client(cls):
-        sess = keystone_utils.get_admin_session()
-        return cls._get_client_class()(authenticator=sess.auth)
+        # Senlin client changed interface a bit, let's skip __init__ altogether
+        class_ = cls._get_client_class()
+        return class_.__new__(class_)
 
 
 class AodhAction(base.OpenStackAction):
diff --git a/mistral/tests/unit/actions/openstack/test_generator.py b/mistral/tests/unit/actions/openstack/test_generator.py
index 7df19580d..294e20b94 100644
--- a/mistral/tests/unit/actions/openstack/test_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_generator.py
@@ -14,7 +14,6 @@ import contextlib
 import os
 
 from oslo_config import cfg
-import testtools
 
 import mock
 
@@ -86,7 +85,6 @@ class GeneratorTest(base.BaseTest):
         self.baremetal_patch.start()
         self.addCleanup(self.baremetal_patch.stop)
 
-    @testtools.skip("Finish https://review.openstack.org/#/c/614211")
     def test_generator(self):
         for generator_cls in generator_factory.all_generators():
             action_classes = generator_cls.create_actions()