diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 2b7a083d..ffb752ae 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -42,7 +42,6 @@ from nova.network import linux_net
 
 FLAGS = flags.FLAGS
 flags.DECLARE('auth_driver', 'nova.auth.manager')
-flags.DECLARE('redis_db', 'nova.datastore')
 flags.DECLARE('network_size', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
 flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager')
@@ -100,11 +99,10 @@ def main():
     interface = os.environ.get('DNSMASQ_INTERFACE', 'br0')
     if int(os.environ.get('TESTING', '0')):
         FLAGS.fake_rabbit = True
-        FLAGS.redis_db = 8
         FLAGS.network_size = 16
         FLAGS.connection_type = 'fake'
         FLAGS.fake_network = True
-        FLAGS.auth_driver = 'nova.auth.ldapdriver.FakeLdapDriver'
+        FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
         FLAGS.num_networks = 5
         path = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                             '..',
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 20099069..835bfdf4 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -26,6 +26,7 @@ import StringIO
 import tempfile
 import time
 
+from eventlet import greenthread
 from twisted.internet import defer
 import unittest
 from xml.etree import ElementTree
@@ -101,6 +102,9 @@ class CloudTestCase(test.TrialTestCase):
         instance_id = rv['instancesSet'][0]['instanceId']
         output = yield self.cloud.get_console_output(context=self.context, instance_id=[instance_id])
         self.assertEquals(b64decode(output['output']), 'FAKE CONSOLE OUTPUT')
+        # TODO(soren): We need this until we can stop polling in the rpc code
+        #              for unit tests.
+        greenthread.sleep(0.3)
         rv = yield self.cloud.terminate_instances(self.context, [instance_id])