diff --git a/common/remote_client.py b/common/remote_client.py
index 3b48545..5365ceb 100644
--- a/common/remote_client.py
+++ b/common/remote_client.py
@@ -12,13 +12,14 @@
 
 import cStringIO
 import logging
-import paramiko
 import re
 import select
-import six
 import socket
 import time
 
+import paramiko
+import six
+
 from heat_integrationtests.common import exceptions
 
 LOG = logging.getLogger(__name__)
diff --git a/common/test.py b/common/test.py
index 57083fd..4c96567 100644
--- a/common/test.py
+++ b/common/test.py
@@ -10,19 +10,19 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import fixtures
 import logging
 import os
 import random
 import re
-import six
 import subprocess
-import testscenarios
-import testtools
 import time
 
+import fixtures
 from heatclient import exc as heat_exceptions
 from oslo.utils import timeutils
+import six
+import testscenarios
+import testtools
 
 from heat_integrationtests.common import clients
 from heat_integrationtests.common import config