diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py
index 44735bf7c..a147a3a99 100644
--- a/nova/tests/test_volume.py
+++ b/nova/tests/test_volume.py
@@ -51,9 +51,8 @@ class VolumeTestCase(test.TestCase):
         self.compute = importutils.import_object(FLAGS.compute_manager)
         vol_tmpdir = tempfile.mkdtemp()
         self.flags(compute_driver='nova.virt.fake.FakeDriver',
-                   volumes_dir=vol_tmpdir)
-        self.stubs.Set(nova.flags.FLAGS, 'notification_driver',
-                ['nova.openstack.common.notifier.test_notifier'])
+                   volumes_dir=vol_tmpdir,
+                   notification_driver=[test_notifier.__name__])
         self.stubs.Set(iscsi.TgtAdm, '_get_target', self.fake_get_target)
         self.volume = importutils.import_object(FLAGS.volume_manager)
         self.context = context.get_admin_context()
diff --git a/nova/tests/test_volume_utils.py b/nova/tests/test_volume_utils.py
index 66b00d48f..89ad7c3db 100644
--- a/nova/tests/test_volume_utils.py
+++ b/nova/tests/test_volume_utils.py
@@ -38,9 +38,8 @@ class UsageInfoTestCase(test.TestCase):
     def setUp(self):
         super(UsageInfoTestCase, self).setUp()
         self.flags(compute_driver='nova.virt.fake.FakeDriver',
-                   host='fake')
-        self.stubs.Set(flags.FLAGS, 'notification_driver',
-                ['nova.openstack.common.notifier.test_notifier'])
+                   host='fake',
+                   notification_driver=[test_notifier.__name__])
         fake_network.set_stub_network_methods(self.stubs)
 
         self.volume = importutils.import_object(FLAGS.volume_manager)