diff --git a/heat/engine/resources/openstack/octavia/loadbalancer.py b/heat/engine/resources/openstack/octavia/loadbalancer.py
index c4d477f7e2..a8d8fe510e 100644
--- a/heat/engine/resources/openstack/octavia/loadbalancer.py
+++ b/heat/engine/resources/openstack/octavia/loadbalancer.py
@@ -126,6 +126,8 @@ class LoadBalancer(octavia_base.OctaviaBase):
         if self.NAME not in props:
             props[self.NAME] = self.physical_resource_name()
         props['vip_subnet_id'] = props.pop(self.VIP_SUBNET)
+        if 'tenant_id' in props:
+            props['project_id'] = props.pop('tenant_id')
         return props
 
     def handle_create(self):
diff --git a/heat/tests/openstack/octavia/test_loadbalancer.py b/heat/tests/openstack/octavia/test_loadbalancer.py
index 969ce3b669..ad5b9c8b0c 100644
--- a/heat/tests/openstack/octavia/test_loadbalancer.py
+++ b/heat/tests/openstack/octavia/test_loadbalancer.py
@@ -56,7 +56,7 @@ class LoadBalancerTest(common.HeatTestCase):
                 'vip_address': '10.0.0.4',
                 'vip_subnet_id': '123',
                 'provider': 'octavia',
-                'tenant_id': '1234',
+                'project_id': '1234',
                 'admin_state_up': True,
             }
         }