diff --git a/nova/flags.py b/nova/flags.py
index eea632d6..cf02c971 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -375,9 +375,6 @@ DEFINE_string('instance_dns_domain', '',
 DEFINE_string('floating_ip_dns_manager',
               'nova.network.dns_driver.DNSDriver',
               'DNS Manager for floating IPs')
-DEFINE_multistring('floating_ip_dns_zones', '',
-                   'DNS zones for floating IPs.'
-                   'e.g. "example.org"')
 DEFINE_string('network_manager', 'nova.network.manager.VlanManager',
               'Manager for network')
 DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager',
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index f0decc23..573a308e 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -1502,12 +1502,10 @@ class LdapDNSTestCase(test.TestCase):
         self.driver.delete_domain(domain2)
 
     def test_ldap_dns_domains(self):
-        flags.FLAGS.floating_ip_dns_domains = [domain1, domain2]
-
         domains = self.driver.get_domains()
         self.assertEqual(len(domains), 2)
-        self.assertEqual(domains[0], domain1)
-        self.assertEqual(domains[1], domain2)
+        self.assertIn(domain1, domains)
+        self.assertIn(domain2, domains)
 
     def test_ldap_dns_create_conflict(self):
         address1 = "10.10.10.11"