diff --git a/client.py b/client.py
index 23e1acfa2a25..f092a6c92aac 100755
--- a/client.py
+++ b/client.py
@@ -7,10 +7,10 @@ from __future__ import absolute_import, print_function
 
 HG_EXCLUSIONS = [".hg", ".hgignore", ".hgtags"]
 
-import os
-import sys
-import shutil
 import glob
+import os
+import shutil
+import sys
 from optparse import OptionParser
 from subprocess import check_call
 
diff --git a/configure.py b/configure.py
index f67ac5067df6..842cb08ad208 100644
--- a/configure.py
+++ b/configure.py
@@ -12,7 +12,6 @@ import logging
 import os
 import sys
 import textwrap
-
 from collections.abc import Iterable
 
 base_dir = os.path.abspath(os.path.dirname(__file__))
@@ -23,6 +22,9 @@ sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "packaging"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "pyparsing"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "six"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "looseversion"))
+import mozpack.path as mozpath
+import six
+from mach.requirements import MachEnvRequirements
 from mach.site import (
     CommandSiteManager,
     ExternalPythonSite,
@@ -30,16 +32,10 @@ from mach.site import (
     MozSiteMetadata,
     SitePackagesSource,
 )
-from mach.requirements import MachEnvRequirements
-from mozbuild.configure import (
-    ConfigureSandbox,
-    TRACE,
-)
-from mozbuild.pythonutil import iter_modules_in_path
 from mozbuild.backend.configenvironment import PartialConfigEnvironment
+from mozbuild.configure import TRACE, ConfigureSandbox
+from mozbuild.pythonutil import iter_modules_in_path
 from mozbuild.util import write_indented_repr
-import mozpack.path as mozpath
-import six
 
 
 def main(argv):