diff --git a/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_alarm.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_alarm.py
index 0b96958b6..b863b59d6 100644
--- a/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_alarm.py
+++ b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_alarm.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import time
+import unittest
 
 from oslo_serialization import jsonutils
 
@@ -111,11 +112,13 @@ class VnfTestAlarmMonitor(base.BaseTackerTest):
         self.addCleanup(self.wait_until_vnf_delete, vnf_id,
                         constants.VNF_CIRROS_DELETE_TIMEOUT)
 
+    @unittest.skip("heat-translator use old metric cpu_util & aggregation API")
     def test_vnf_alarm_respawn(self):
         self._test_vnf_tosca_alarm(
             'sample-tosca-alarm-respawn.yaml',
             'alarm and respawn-vnf')
 
+    @unittest.skip("heat-translator use old metric cpu_util & aggregation API")
     def test_vnf_alarm_scale(self):
         self._test_vnf_tosca_alarm(
             'sample-tosca-alarm-scale.yaml',
diff --git a/tacker/tests/unit/test_auth.py b/tacker/tests/unit/test_auth.py
index d3973ec75..190448ea4 100644
--- a/tacker/tests/unit/test_auth.py
+++ b/tacker/tests/unit/test_auth.py
@@ -80,7 +80,7 @@ class TackerKeystoneContextTestCase(test_base.BaseTestCase):
         response = self.request.get_response(self.middleware)
         self.assertEqual('200 OK', response.status)
         self.assertEqual('testtenantid', self.context.tenant_id)
-        self.assertEqual('testtenantid', self.context.tenant)
+        self.assertEqual('testtenantid', self.context.project_id)
 
     def test_roles_no_admin(self):
         self.request.headers['X_PROJECT_ID'] = 'testtenantid'