diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py
index 5490d960..1a3c0dbb 100644
--- a/plugins/builder/runroot.py
+++ b/plugins/builder/runroot.py
@@ -1,18 +1,20 @@
 # kojid plugin
 
 from __future__ import absolute_import
-import koji
-import six.moves.configparser
+
 import os
 import platform
 import re
 import subprocess
 
+import six.moves.configparser
+
+import koji
 import koji.tasks
+from __main__ import BuildRoot
+from koji.daemon import log_output
 from koji.tasks import scan_mounts
 from koji.util import isSuccess, parseStatus
-from koji.daemon import log_output
-from __main__ import BuildRoot
 
 __all__ = ('RunRootTask',)
 
diff --git a/plugins/builder/save_failed_tree.py b/plugins/builder/save_failed_tree.py
index f4490883..0a4aa055 100644
--- a/plugins/builder/save_failed_tree.py
+++ b/plugins/builder/save_failed_tree.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 import fnmatch
 import os
 import sys
diff --git a/plugins/cli/runroot.py b/plugins/cli/runroot.py
index c4b9d08a..ba448c4c 100644
--- a/plugins/cli/runroot.py
+++ b/plugins/cli/runroot.py
@@ -1,12 +1,13 @@
 from __future__ import absolute_import
+
 import sys
 import time
 from optparse import OptionParser
 
 import koji
 from koji.plugin import export_cli
-from koji_cli.lib import _, activate_session, watch_tasks, \
-                         list_task_output_all_volumes, bytes_to_stdout
+from koji_cli.lib import (_, activate_session, bytes_to_stdout,
+                          list_task_output_all_volumes, watch_tasks)
 
 
 @export_cli
diff --git a/plugins/cli/save_failed_tree.py b/plugins/cli/save_failed_tree.py
index 22cc449e..6a0cb00f 100644
--- a/plugins/cli/save_failed_tree.py
+++ b/plugins/cli/save_failed_tree.py
@@ -6,6 +6,7 @@ import koji
 from koji.plugin import export_cli
 from koji_cli.lib import _, activate_session, watch_tasks
 
+
 @export_cli
 def handle_save_failed_tree(options, session, args):
     "Create tarball with whole buildtree"
diff --git a/plugins/hub/echo.py b/plugins/hub/echo.py
index 859e05ce..1fb63afb 100644
--- a/plugins/hub/echo.py
+++ b/plugins/hub/echo.py
@@ -6,10 +6,13 @@
 #     Mike Bonnet <mikeb@redhat.com>
 
 from __future__ import absolute_import
-from koji.plugin import callbacks, callback, ignore_error
-from koji.util import to_list
+
 import logging
 
+from koji.plugin import callback, callbacks, ignore_error
+from koji.util import to_list
+
+
 @callback(*to_list(callbacks.keys()))
 @ignore_error
 def echo(cbtype, *args, **kws):
diff --git a/plugins/hub/protonmsg.py b/plugins/hub/protonmsg.py
index c62d5ef9..fdc1aabf 100644
--- a/plugins/hub/protonmsg.py
+++ b/plugins/hub/protonmsg.py
@@ -6,15 +6,18 @@
 #     Mike Bonnet <mikeb@redhat.com>
 
 from __future__ import absolute_import
-import koji
-from koji.plugin import callback, ignore_error, convert_datetime
-from koji.context import context
-import logging
+
 import json
+import logging
 import random
+
 from proton import Message, SSLDomain
-from proton.reactor import Container
 from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+import koji
+from koji.context import context
+from koji.plugin import callback, convert_datetime, ignore_error
 
 CONFIG_FILE = '/etc/koji-hub/plugins/protonmsg.conf'
 CONFIG = None
diff --git a/plugins/hub/rpm2maven.py b/plugins/hub/rpm2maven.py
index f35e0867..bbf75816 100644
--- a/plugins/hub/rpm2maven.py
+++ b/plugins/hub/rpm2maven.py
@@ -6,15 +6,16 @@
 #     Mike Bonnet <mikeb@redhat.com>
 
 from __future__ import absolute_import
-import koji
-from koji.context import context
-from koji.plugin import callback
-from koji.util import joinpath
-from koji.util import rmtree
+
 import fnmatch
 import os
 import subprocess
 
+import koji
+from koji.context import context
+from koji.plugin import callback
+from koji.util import joinpath, rmtree
+
 CONFIG_FILE = '/etc/koji-hub/plugins/rpm2maven.conf'
 
 config = None
diff --git a/plugins/hub/runroot_hub.py b/plugins/hub/runroot_hub.py
index 4dc46f2f..e9631018 100644
--- a/plugins/hub/runroot_hub.py
+++ b/plugins/hub/runroot_hub.py
@@ -4,15 +4,17 @@
 
 
 from __future__ import absolute_import
-from koji.context import context
-from koji.plugin import export
-import koji
+
 import random
 import sys
 
+import koji
+import kojihub
+from koji.context import context
+from koji.plugin import export
+
 #XXX - have to import kojihub for make_task
 sys.path.insert(0, '/usr/share/koji-hub/')
-import kojihub
 
 __all__ = ('runroot',)
 
@@ -60,4 +62,3 @@ def runroot(tagInfo, arch, command, channel=None, **opts):
 
     args = koji.encode_args(tagInfo, arch, command, **opts)
     return kojihub.make_task('runroot', args, **taskopts)
-
diff --git a/plugins/hub/save_failed_tree.py b/plugins/hub/save_failed_tree.py
index bb1f262d..f5863abc 100644
--- a/plugins/hub/save_failed_tree.py
+++ b/plugins/hub/save_failed_tree.py
@@ -1,11 +1,13 @@
 from __future__ import absolute_import
+
 import sys
+
 import koji
+import kojihub
 from koji.context import context
 from koji.plugin import export
 
 sys.path.insert(0, '/usr/share/koji-hub/')
-import kojihub
 
 __all__ = ('saveFailedTree',)