diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 9e313ae5..c41a7a9e 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -146,45 +146,46 @@ class FlatNetworkTestCase(test.TestCase):
         nw_info = fake_get_instance_nw_info(self.stubs, 1, 2)
 
         for i, (nw, info) in enumerate(nw_info):
-            check = {'bridge': 'fake_br%d' % i,
-                     'cidr': '192.168.%s.0/24' % i,
-                     'cidr_v6': 'DONTCARE',
-                     'id': 'DONTCARE',
+            nid = i + 1
+            check = {'bridge': 'fake_br%d' % nid,
+                     'cidr': '192.168.%s.0/24' % nid,
+                     'cidr_v6': '2001:db8:0:%x::/64' % nid,
+                     'id': '00000000-0000-0000-0000-00000000000000%02d' % nid,
                      'multi_host': False,
                      'injected': False,
-                     'bridge_interface': 'DONTCARE',
+                     'bridge_interface': None,
                      'vlan': None}
 
             self.assertDictMatch(nw, check)
 
-            check = {'broadcast': '192.168.%d.255' % i,
-                     'dhcp_server': '192.168.%d.1' % i,
-                     'dns': 'DONTCARE',
-                     'gateway': '192.168.%d.1' % i,
-                     'gateway_v6': 'DONTCARE',
+            check = {'broadcast': '192.168.%d.255' % nid,
+                     'dhcp_server': '192.168.%d.1' % nid,
+                     'dns': ['192.168.%d.3' % nid, '192.168.%d.4' % nid],
+                     'gateway': '192.168.%d.1' % nid,
+                     'gateway_v6': 'fe80::def',
                      'ip6s': 'DONTCARE',
                      'ips': 'DONTCARE',
-                     'label': 'test%d' % i,
-                     'mac': 'DE:AD:BE:EF:00:%02x' % i,
-                     'vif_uuid':
-                        '00000000-0000-0000-0000-00000000000000%02d' % i,
+                     'label': 'test%d' % nid,
+                     'mac': 'DE:AD:BE:EF:00:%02x' % nid,
                      'rxtx_cap': 0,
+                     'vif_uuid':
+                        '00000000-0000-0000-0000-00000000000000%02d' % nid,
                      'should_create_vlan': False,
                      'should_create_bridge': False}
             self.assertDictMatch(info, check)
 
             check = [{'enabled': 'DONTCARE',
-                      'ip': 'DONTCARE',
-                      'gateway': 'DONTCARE',
-                      'netmask': 64}]
+                      'ip': '2001:db8:0:1::%x' % nid,
+                      'netmask': 64,
+                      'gateway': 'fe80::def'}]
             self.assertDictListMatch(info['ip6s'], check)
 
             num_fixed_ips = len(info['ips'])
             check = [{'enabled': 'DONTCARE',
-                      'ip': '192.168.%d.1%02d' % (i, ip_num),
-                      'gateway': 'DONTCARE',
-                      'netmask': '255.255.255.0'}
-                      for ip_num in xrange(num_fixed_ips)]
+                      'ip': '192.168.%d.%03d' % (nid, ip_num + 99),
+                      'netmask': '255.255.255.0',
+                      'gateway': '192.168.%d.1' % nid}
+                      for ip_num in xrange(1, num_fixed_ips + 1)]
             self.assertDictListMatch(info['ips'], check)
 
     def test_validate_networks(self):
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index cf15cc02..7a2dc07d 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -301,7 +301,8 @@ class QuantumManagerTestCase(QuantumNovaTestCase):
 
         nw_info = self.net_man.get_instance_nw_info(ctx, instance_ref['id'],
                                 instance_ref['uuid'],
-                                instance_ref['instance_type_id'], "")
+                                instance_ref['instance_type_id'], "",
+                                project_id=project_id)
 
         self._check_vifs(len(nw_info))
         self._validate_nw_info(nw_info, expected_labels)