diff --git a/murano/engine/system/agent_listener.py b/murano/engine/system/agent_listener.py
index b7cc5b39f..19b65a377 100644
--- a/murano/engine/system/agent_listener.py
+++ b/murano/engine/system/agent_listener.py
@@ -33,10 +33,7 @@ class AgentListenerException(Exception):
 @dsl.name('io.murano.system.AgentListener')
 class AgentListener(object):
     def __init__(self, name):
-        self._enabled = False
-        if CONF.engine.disable_murano_agent:
-            return
-        self._enabled = True
+        self._enabled = not CONF.engine.disable_murano_agent
         self._results_queue = str('-execution-results-%s' % name.lower())
         self._subscriptions = {}
         self._receive_thread = None
diff --git a/murano/tests/unit/engine/system/test_agent_listener.py b/murano/tests/unit/engine/system/test_agent_listener.py
index b7bfb6a5a..0c4a52359 100644
--- a/murano/tests/unit/engine/system/test_agent_listener.py
+++ b/murano/tests/unit/engine/system/test_agent_listener.py
@@ -21,17 +21,17 @@ from murano.tests.unit import base
 class TestExecutionPlan(base.MuranoTestCase):
     def setUp(self):
         super(TestExecutionPlan, self).setUp()
+        self.override_config("disable_murano_agent", False, "engine")
+        self.agent = agent_listener.AgentListener("test")
+        self.addCleanup(mock.patch.stopall)
 
-        name = "test"
-        results_queue = str('-execution-results-%s' % name.lower())
-        self.agent = agent_listener.AgentListener(name)
+    def test_agent_ready(self):
         self.assertEqual({}, self.agent._subscriptions)
+        results_queue = str('-execution-results-test')
         self.assertEqual(results_queue, self.agent._results_queue)
         self.assertTrue(self.agent._enabled)
         self.assertIsNone(self.agent._receive_thread)
 
-        self.addCleanup(mock.patch.stopall)
-
     def test_queue_name(self):
         self.assertEqual(self.agent._results_queue, self.agent.queue_name())
 
diff --git a/murano_tempest_tests/tests/scenario/application_catalog/test_cinder_volumes.py b/murano_tempest_tests/tests/scenario/application_catalog/test_cinder_volumes.py
index 17ea9008d..6119ecf54 100644
--- a/murano_tempest_tests/tests/scenario/application_catalog/test_cinder_volumes.py
+++ b/murano_tempest_tests/tests/scenario/application_catalog/test_cinder_volumes.py
@@ -14,6 +14,7 @@
 
 import os
 import testtools
+import unittest2
 
 from tempest import config
 
@@ -343,6 +344,7 @@ class TestCinderVolumes(base.BaseApplicationCatalogScenarioTest):
 
     @testtools.testcase.attr('smoke')
     @testtools.testcase.attr('scenario')
+    @unittest2.skip('Skipped due to bug #1634876')
     def test_deploy_app_with_volume_creation_from_backup(self):
         """Test app deployment with volume creation from volume backup