diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py
index 4c4e0171..d90c6ac5 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/baremetal/test_driver.py
@@ -22,23 +22,18 @@
 Tests for the base baremetal driver class.
 """
 
-import mox
-
-from nova.openstack.common import cfg
-
 from nova import exception
+from nova.openstack.common import cfg
 from nova import test
-
 from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
-
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import driver as bm_driver
 from nova.virt.baremetal import fake
-from nova.virt import firewall
+
 
 CONF = cfg.CONF
 
diff --git a/nova/tests/baremetal/test_ipmi.py b/nova/tests/baremetal/test_ipmi.py
index 40ec43ab..def6da66 100644
--- a/nova/tests/baremetal/test_ipmi.py
+++ b/nova/tests/baremetal/test_ipmi.py
@@ -24,9 +24,6 @@ Test class for baremetal IPMI power manager.
 import os
 import stat
 import tempfile
-import time
-
-import mox
 
 from nova.openstack.common import cfg
 from nova import test
@@ -35,7 +32,6 @@ from nova import utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import ipmi
 from nova.virt.baremetal import utils as bm_utils
-from nova.virt.libvirt import utils as libvirt_utils
 
 CONF = cfg.CONF