diff --git a/ec2driver.py b/ec2driver.py
index e834ce4..0e3ea35 100644
--- a/ec2driver.py
+++ b/ec2driver.py
@@ -17,15 +17,15 @@
 from threading import Lock
 import base64
 import time
-from ec2driver_config import *
+
 from boto import ec2
+import boto.ec2.cloudwatch
 from boto import exception as boto_exc
 from boto.exception import EC2ResponseError
-from credentials import get_nova_creds
-
 from boto.regioninfo import RegionInfo
 from oslo.config import cfg
 from novaclient.v1_1 import client
+
 from ec2driver_config import *
 from nova import block_device
 from nova.compute import power_state
@@ -38,10 +38,9 @@ from nova.openstack.common import log as logging
 from nova.openstack.common import loopingcall
 from nova.virt import driver
 from nova.virt import virtapi
-from nova.compute import flavors
-from novaclient.v1_1 import client
 from credentials import get_nova_creds
 
+
 LOG = logging.getLogger(__name__)
 
 ec2driver_opts = [
diff --git a/tests/test_ec2driver.py b/tests/test_ec2driver.py
index cb3be18..2441d62 100644
--- a/tests/test_ec2driver.py
+++ b/tests/test_ec2driver.py
@@ -173,8 +173,10 @@ class TestEC2Driver(EC2TestBase):
         self.assertEqual(diagnostics['instance.instance_type'], 't2.micro')
         self.assertEqual(diagnostics['instance._state'], 'running(16)')
 
+    @unittest.skipIf(os.environ.get('MOCK_EC2'), 'Not supported by moto')
     def test_attach_volume(self):
-        volume = self.nova_volume.volumes.create(1, snapshot_id=None, display_name='test', display_description=None, volume_type=None, availability_zone=None, imageRef=None)
+        volume = self.nova_volume.volumes.create(1, snapshot_id=None, display_name='test', display_description=None,
+                                                 volume_type=None, availability_zone=None, imageRef=None)
         self.volumes.append(volume)
         instance, instance_ref = self.spawn_ec2_instance()
         self.nova.volumes.create_server_volume(instance_ref, volume.id, "/dev/sdb")