diff --git a/heat/engine/clients/os/senlin.py b/heat/engine/clients/os/senlin.py
index 078c352d3..7a026e91b 100644
--- a/heat/engine/clients/os/senlin.py
+++ b/heat/engine/clients/os/senlin.py
@@ -37,12 +37,12 @@ class SenlinClientPlugin(client_plugin.ClientPlugin):
         return client.Client(self.VERSION, **args)
 
     def is_not_found(self, ex):
-        return isinstance(ex, exc.HTTPNotFound)
+        return isinstance(ex, exc.sdkexc.ResourceNotFound)
 
 
 class ProfileConstraint(constraints.BaseCustomConstraint):
 
-    expected_exceptions = (exc.HTTPNotFound,)
+    expected_exceptions = (exc.sdkexc.ResourceNotFound,)
 
     def validate_with_client(self, client, profile):
         client.client(CLIENT_NAME).get_profile(profile)
diff --git a/heat/tests/clients/test_senlin_client.py b/heat/tests/clients/test_senlin_client.py
index d30696f40..ce7be34da 100644
--- a/heat/tests/clients/test_senlin_client.py
+++ b/heat/tests/clients/test_senlin_client.py
@@ -44,5 +44,6 @@ class ProfileConstraintTest(common.HeatTestCase):
         self.assertTrue(self.constraint.validate("PROFILE_ID", self.ctx))
 
     def test_validate_false(self):
-        self.mock_get_profile.side_effect = exc.HTTPNotFound
+        self.mock_get_profile.side_effect = exc.sdkexc.ResourceNotFound(
+            'PROFILE_ID')
         self.assertFalse(self.constraint.validate("PROFILE_ID", self.ctx))
diff --git a/heat/tests/openstack/senlin/test_cluster.py b/heat/tests/openstack/senlin/test_cluster.py
index 8476bdbc8..473aa1c60 100644
--- a/heat/tests/openstack/senlin/test_cluster.py
+++ b/heat/tests/openstack/senlin/test_cluster.py
@@ -137,7 +137,7 @@ class SenlinClusterTest(common.HeatTestCase):
     def test_cluster_delete_success(self):
         cluster = self._create_cluster(self.t)
         self.senlin_mock.get_cluster.side_effect = [
-            exc.HTTPNotFound(),
+            exc.sdkexc.ResourceNotFound('SenlinCluster'),
         ]
         scheduler.TaskRunner(cluster.delete)()
         self.senlin_mock.delete_cluster.assert_called_once_with(