diff --git a/nova/auth/dbdriver.py b/nova/auth/dbdriver.py
index c6d81ee0..a84e11e6 100644
--- a/nova/auth/dbdriver.py
+++ b/nova/auth/dbdriver.py
@@ -20,8 +20,6 @@
 Auth driver using the DB as its backend.
 """
 
-import sys
-
 from nova import context
 from nova import exception
 from nova import db
diff --git a/nova/notifier/test_notifier.py b/nova/notifier/test_notifier.py
index d43f43e4..1fa7a66b 100644
--- a/nova/notifier/test_notifier.py
+++ b/nova/notifier/test_notifier.py
@@ -13,10 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
 from nova import flags
-from nova import log as logging
 
 FLAGS = flags.FLAGS
 
diff --git a/nova/scheduler/distributed_scheduler.py b/nova/scheduler/distributed_scheduler.py
index a7cd97da..754945fe 100644
--- a/nova/scheduler/distributed_scheduler.py
+++ b/nova/scheduler/distributed_scheduler.py
@@ -24,7 +24,6 @@ import operator
 
 import M2Crypto
 
-from nova.compute import api as compute_api
 from novaclient import v1_1 as novaclient
 from novaclient import exceptions as novaclient_exceptions
 from nova import crypto
@@ -32,10 +31,8 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import rpc
 from nova.scheduler import api
 from nova.scheduler import driver
-from nova.scheduler import filters
 from nova.scheduler import least_cost
 from nova.scheduler import scheduler_options
 from nova import utils
diff --git a/nova/scheduler/least_cost.py b/nova/scheduler/least_cost.py
index 7e12ca39..bb9c78e8 100644
--- a/nova/scheduler/least_cost.py
+++ b/nova/scheduler/least_cost.py
@@ -25,7 +25,6 @@ is then selected for provisioning.
 
 from nova import flags
 from nova import log as logging
-from nova import exception
 
 LOG = logging.getLogger('nova.scheduler.least_cost')
 
diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py
index e7c7b611..3835b623 100644
--- a/nova/scheduler/zone_manager.py
+++ b/nova/scheduler/zone_manager.py
@@ -18,7 +18,6 @@ ZoneManager oversees all communications with child Zones.
 """
 
 import datetime
-import thread
 import traceback
 import UserDict
 
diff --git a/nova/tests/notifier/test_list_notifier.py b/nova/tests/notifier/test_list_notifier.py
index b7772075..d71bb279 100644
--- a/nova/tests/notifier/test_list_notifier.py
+++ b/nova/tests/notifier/test_list_notifier.py
@@ -13,15 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
-import sys
-
 import nova
 from nova import log as logging
 import nova.notifier.api
 from nova.notifier.api import notify
-from nova.notifier import log_notifier
-from nova.notifier import no_op_notifier
+import nova.notifier.log_notifier
+import nova.notifier.no_op_notifier
 from nova.notifier import list_notifier
 from nova import test
 
@@ -32,7 +29,6 @@ class NotifierListTestCase(test.TestCase):
     def setUp(self):
         super(NotifierListTestCase, self).setUp()
         list_notifier._reset_drivers()
-        self.stubs = stubout.StubOutForTesting()
         # Mock log to add one to exception_count when log.exception is called
 
         def mock_exception(cls, *args):
diff --git a/nova/tests/rpc/test_carrot.py b/nova/tests/rpc/test_carrot.py
index fa9f7396..2523810d 100644
--- a/nova/tests/rpc/test_carrot.py
+++ b/nova/tests/rpc/test_carrot.py
@@ -19,7 +19,6 @@
 Unit Tests for remote procedure calls using carrot
 """
 
-from nova import context
 from nova import log as logging
 from nova.rpc import impl_carrot
 from nova.tests.rpc import common
diff --git a/nova/tests/rpc/test_kombu.py b/nova/tests/rpc/test_kombu.py
index dc100cf1..255de275 100644
--- a/nova/tests/rpc/test_kombu.py
+++ b/nova/tests/rpc/test_kombu.py
@@ -19,7 +19,6 @@
 Unit Tests for remote procedure calls using kombu
 """
 
-from nova import context
 from nova import log as logging
 from nova import test
 from nova.rpc import impl_kombu
diff --git a/nova/tests/scheduler/test_distributed_scheduler.py b/nova/tests/scheduler/test_distributed_scheduler.py
index 36d2ddc5..412c981c 100644
--- a/nova/tests/scheduler/test_distributed_scheduler.py
+++ b/nova/tests/scheduler/test_distributed_scheduler.py
@@ -22,9 +22,7 @@ import nova.db
 
 from nova import context
 from nova import exception
-from nova import rpc
 from nova import test
-from nova.compute import api as compute_api
 from nova.scheduler import distributed_scheduler
 from nova.scheduler import least_cost
 from nova.scheduler import zone_manager
diff --git a/nova/tests/scheduler/test_host_filter.py b/nova/tests/scheduler/test_host_filter.py
index 62131a62..797ec3fe 100644
--- a/nova/tests/scheduler/test_host_filter.py
+++ b/nova/tests/scheduler/test_host_filter.py
@@ -22,7 +22,6 @@ import nova
 from nova import exception
 from nova import test
 from nova.scheduler import distributed_scheduler as dist
-from nova.scheduler import zone_manager
 from nova.tests.scheduler import fake_zone_manager as ds_fakes
 
 
diff --git a/nova/tests/scheduler/test_least_cost.py b/nova/tests/scheduler/test_least_cost.py
index 4a3af2ea..65a4268d 100644
--- a/nova/tests/scheduler/test_least_cost.py
+++ b/nova/tests/scheduler/test_least_cost.py
@@ -16,7 +16,6 @@
 Tests For Least Cost functions.
 """
 from nova.scheduler import least_cost
-from nova.scheduler import zone_manager
 from nova import test
 from nova.tests.scheduler import fake_zone_manager
 
diff --git a/nova/tests/scheduler/test_vsa_scheduler.py b/nova/tests/scheduler/test_vsa_scheduler.py
index 9a74c994..cc141897 100644
--- a/nova/tests/scheduler/test_vsa_scheduler.py
+++ b/nova/tests/scheduler/test_vsa_scheduler.py
@@ -13,12 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
-
 import nova
 
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/tests/test_adminapi.py b/nova/tests/test_adminapi.py
index 41dbc3e9..dba2a278 100644
--- a/nova/tests/test_adminapi.py
+++ b/nova/tests/test_adminapi.py
@@ -16,8 +16,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from eventlet import greenthread
-
 from nova import context
 from nova import db
 from nova import flags
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index cb33df2b..f7548ceb 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -31,7 +31,6 @@ from nova import block_device
 from nova import context
 from nova import exception
 from nova import test
-from nova import wsgi
 from nova.api import auth
 from nova.api import ec2
 from nova.api.ec2 import apirequest
diff --git a/nova/tests/test_cfg.py b/nova/tests/test_cfg.py
index 440b7acc..f150df31 100644
--- a/nova/tests/test_cfg.py
+++ b/nova/tests/test_cfg.py
@@ -18,7 +18,6 @@ import os
 import sys
 import StringIO
 import tempfile
-import unittest
 
 import stubout
 
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index ae0c19ad..b5fe1198 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -21,7 +21,6 @@ import exceptions
 import os
 import tempfile
 
-from nova import exception
 from nova import flags
 from nova import test
 
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index aa277206..2def4373 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -23,7 +23,6 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova import utils
 from nova.compute import instance_types
 from nova.db.sqlalchemy.session import get_session
 from nova.db.sqlalchemy import models
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 782e0156..8334e6f9 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -20,7 +20,6 @@ import mox
 import os
 import re
 import shutil
-import sys
 import tempfile
 
 from xml.etree.ElementTree import fromstring as xml_to_tree
diff --git a/nova/tests/test_localization.py b/nova/tests/test_localization.py
index a25809a7..3011b8b2 100644
--- a/nova/tests/test_localization.py
+++ b/nova/tests/test_localization.py
@@ -14,11 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import glob
 import os
 import re
-import sys
-import unittest
 
 import nova
 from nova import test
diff --git a/nova/tests/test_network_info.py b/nova/tests/test_network_info.py
index 1fd30dc9..7627c29f 100644
--- a/nova/tests/test_network_info.py
+++ b/nova/tests/test_network_info.py
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
 from nova import exception
 from nova import log as logging
 from nova.network import model
diff --git a/nova/tests/test_notifier.py b/nova/tests/test_notifier.py
index 70a0ec5d..00f367f4 100644
--- a/nova/tests/test_notifier.py
+++ b/nova/tests/test_notifier.py
@@ -16,15 +16,9 @@
 import stubout
 
 import nova
-from nova import context
-from nova import flags
 from nova import log
-from nova import rpc
 import nova.notifier.api
 from nova.notifier.api import notify
-from nova.notifier import no_op_notifier
-from nova.notifier import rabbit_notifier
-from nova.rpc import impl_kombu
 from nova import test
 
 
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index 8e8a8511..51cdda49 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -15,14 +15,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import stubout
-
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
 from nova import exception
-from nova import ipv6
 from nova import log as logging
 from nova.network.quantum import manager as quantum_manager
 from nova.network.quantum import melange_connection
@@ -30,8 +27,6 @@ from nova import test
 from nova import utils
 from nova.network import manager
 
-import mox
-
 LOG = logging.getLogger('nova.tests.quantum_network')
 
 
diff --git a/nova/tests/test_volume_types.py b/nova/tests/test_volume_types.py
index 1e190805..1e4a600a 100644
--- a/nova/tests/test_volume_types.py
+++ b/nova/tests/test_volume_types.py
@@ -19,12 +19,10 @@ Unit Tests for volume types code
 import time
 
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova import utils
 from nova.volume import volume_types
 from nova.db.sqlalchemy.session import get_session
 from nova.db.sqlalchemy import models
diff --git a/nova/tests/test_volume_types_extra_specs.py b/nova/tests/test_volume_types_extra_specs.py
index 0a1f1a46..9ff778bb 100644
--- a/nova/tests/test_volume_types_extra_specs.py
+++ b/nova/tests/test_volume_types_extra_specs.py
@@ -21,8 +21,6 @@ Unit Tests for volume types extra specs code
 from nova import context
 from nova import db
 from nova import test
-from nova.db.sqlalchemy.session import get_session
-from nova.db.sqlalchemy import models
 
 
 class VolumeTypeExtraSpecsTestCase(test.TestCase):
diff --git a/nova/tests/test_vsa.py b/nova/tests/test_vsa.py
index 271747fe..d7c8f09f 100644
--- a/nova/tests/test_vsa.py
+++ b/nova/tests/test_vsa.py
@@ -17,10 +17,8 @@ import base64
 import stubout
 
 from xml.etree import ElementTree
-from xml.etree.ElementTree import Element, SubElement
 
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/tests/test_vsa_volumes.py b/nova/tests/test_vsa_volumes.py
index b7cd4e84..ef6396ff 100644
--- a/nova/tests/test_vsa_volumes.py
+++ b/nova/tests/test_vsa_volumes.py
@@ -13,13 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
-
 from nova import exception
 from nova import flags
 from nova import vsa
 from nova import volume
-from nova import db
 from nova import context
 from nova import test
 from nova import log as logging
@@ -33,7 +30,6 @@ class VsaVolumesTestCase(test.TestCase):
 
     def setUp(self):
         super(VsaVolumesTestCase, self).setUp()
-        self.stubs = stubout.StubOutForTesting()
         self.vsa_api = vsa.API()
         self.volume_api = volume.API()
         self.context = context.get_admin_context()
diff --git a/nova/tests/test_zones.py b/nova/tests/test_zones.py
index 9b5b9b24..703ff0bf 100644
--- a/nova/tests/test_zones.py
+++ b/nova/tests/test_zones.py
@@ -19,14 +19,10 @@ Tests For ZoneManager
 import datetime
 import mox
 
-from nova import context
 from nova import db
 from nova import flags
-from nova import service
 from nova import test
-from nova import rpc
 from nova import utils
-from nova.auth import manager as auth_manager
 from nova.scheduler import zone_manager
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 6e24bdc3..c0de0dd3 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -15,7 +15,6 @@
 
 """Stubouts, mocks and fixtures for the test suite"""
 
-import eventlet
 import json
 import random
 
diff --git a/nova/vsa/api.py b/nova/vsa/api.py
index 4f6c5c27..9f17b6e4 100644
--- a/nova/vsa/api.py
+++ b/nova/vsa/api.py
@@ -26,7 +26,6 @@ For assistance and guidelines pls contact
 import sys
 
 from nova import compute
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging