diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index 9a66069b13e..c39bb4b8e90 100644
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -775,7 +775,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
                         port['port_id'], {'port':
                             {'fixed_ips': fixed_ips}}), [subnet], False
 
-        port_data = {'tenant_id': subnet['tenant_id'],
+        port_data = {'tenant_id': router.tenant_id,
                      'network_id': subnet['network_id'],
                      'fixed_ips': [fixed_ip],
                      'admin_state_up': True,
diff --git a/neutron/tests/unit/extensions/test_l3.py b/neutron/tests/unit/extensions/test_l3.py
index c0f4973af11..985d126e7ce 100644
--- a/neutron/tests/unit/extensions/test_l3.py
+++ b/neutron/tests/unit/extensions/test_l3.py
@@ -1011,10 +1011,10 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 self.assertIn('id', payload)
                 self.assertEqual(payload['id'], router['router']['id'])
                 self.assertIn('tenant_id', payload)
-                stid = subnet['subnet']['tenant_id']
+                rtid = router['router']['tenant_id']
                 # tolerate subnet tenant deliberately set to '' in the
                 # nsx metadata access case
-                self.assertIn(payload['tenant_id'], [stid, ''], msg)
+                self.assertIn(payload['tenant_id'], [rtid, ''], msg)
 
     def test_router_add_interface_bad_values(self):
         with self.router() as r:
diff --git a/neutron/tests/unit/plugins/ml2/test_plugin.py b/neutron/tests/unit/plugins/ml2/test_plugin.py
index 091f0b53f87..c5528776107 100644
--- a/neutron/tests/unit/plugins/ml2/test_plugin.py
+++ b/neutron/tests/unit/plugins/ml2/test_plugin.py
@@ -700,7 +700,7 @@ class TestMl2PortsV2(test_plugin.TestPortsV2, Ml2PluginV2TestCase):
                                    method='create_port_postcommit')):
             l3_plugin = directory.get_plugin(constants.L3)
             data = {'router': {'name': 'router', 'admin_state_up': True,
-                               'tenant_id': self.context.tenant_id}}
+                               'tenant_id': 'fake_tenant'}}
             r = l3_plugin.create_router(self.context, data)
             with self.subnet() as s:
                 data = {'subnet_id': s['subnet']['id']}
@@ -717,7 +717,7 @@ class TestMl2PortsV2(test_plugin.TestPortsV2, Ml2PluginV2TestCase):
                                    method='_bind_port_if_needed')):
             l3_plugin = directory.get_plugin(constants.L3)
             data = {'router': {'name': 'router', 'admin_state_up': True,
-                               'tenant_id': self.context.tenant_id}}
+                               'tenant_id': 'fake_tenant'}}
             r = l3_plugin.create_router(self.context, data)
             with self.subnet() as s:
                 data = {'subnet_id': s['subnet']['id']}
@@ -1398,7 +1398,7 @@ class TestMl2DvrPortsV2(TestMl2PortsV2):
         r = plugin.create_router(
             self.context,
             {'router': {'name': 'router', 'admin_state_up': True,
-             'tenant_id': self.context.tenant_id}})
+             'tenant_id': 'fake_tenant'}})
         with self.subnet() as s:
             p = plugin.add_router_interface(self.context, r['id'],
                                             {'subnet_id': s['subnet']['id']})