diff --git a/ironic_python_agent/agent.py b/ironic_python_agent/agent.py
index 82b8792f9..089548bc9 100644
--- a/ironic_python_agent/agent.py
+++ b/ironic_python_agent/agent.py
@@ -18,6 +18,10 @@ import random
 import threading
 import time
 
+import pkg_resources
+from stevedore import driver
+from wsgiref import simple_server
+
 from ironic_python_agent.api import app
 from ironic_python_agent import base
 from ironic_python_agent import encoding
@@ -27,10 +31,6 @@ from ironic_python_agent import ironic_api_client
 from ironic_python_agent.openstack.common import log
 from ironic_python_agent import utils
 
-import pkg_resources
-from stevedore import driver
-from wsgiref import simple_server
-
 
 def _time():
     """Wraps time.time() for simpler testing."""
diff --git a/ironic_python_agent/configdrive.py b/ironic_python_agent/configdrive.py
index d581c6616..f2039d34a 100644
--- a/ironic_python_agent/configdrive.py
+++ b/ironic_python_agent/configdrive.py
@@ -16,11 +16,11 @@ limitations under the License.
 
 import base64
 
-from ironic_python_agent import utils
-
 import json
 import os
 
+from ironic_python_agent import utils
+
 
 class ConfigDriveWriter(object):
     def __init__(self):
diff --git a/ironic_python_agent/tests/agent.py b/ironic_python_agent/tests/agent.py
index 4fc5d082f..024879142 100644
--- a/ironic_python_agent/tests/agent.py
+++ b/ironic_python_agent/tests/agent.py
@@ -18,16 +18,16 @@ import json
 import time
 import unittest
 
+import mock
+import pkg_resources
+from wsgiref import simple_server
+
 from ironic_python_agent import agent
 from ironic_python_agent import base
 from ironic_python_agent import encoding
 from ironic_python_agent import errors
 from ironic_python_agent import hardware
 
-import mock
-import pkg_resources
-from wsgiref import simple_server
-
 EXPECTED_ERROR = RuntimeError('command execution failed')