diff --git a/setools/__init__.py b/setools/__init__.py
index 2ea8d15..1d9a9f8 100644
--- a/setools/__init__.py
+++ b/setools/__init__.py
@@ -28,19 +28,19 @@ from . import policyrep
 from .policyrep import SELinuxPolicy, InvalidPolicy
 
 # Component Queries
+from . import boolquery
 from . import categoryquery
 from . import commonquery
 from . import objclassquery
-from . import typequery
-from . import rolequery
-from . import userquery
-from . import boolquery
 from . import polcapquery
+from . import rolequery
+from . import typequery
+from . import userquery
 
 # Rule Queries
-from . import terulequery
-from . import rbacrulequery
 from . import mlsrulequery
+from . import rbacrulequery
+from . import terulequery
 
 # In-policy Context Queries
 from . import fsusequery
diff --git a/setools/policyrep/__init__.py b/setools/policyrep/__init__.py
index d944d35..b2d8c18 100644
--- a/setools/policyrep/__init__.py
+++ b/setools/policyrep/__init__.py
@@ -33,26 +33,26 @@ from . import qpol
 # be valid for the policy it comes from.
 
 # Components
-from . import default
-from . import objclass
-from . import typeattr
 from . import boolcond
-from . import role
-from . import user
+from . import default
 from . import mls
+from . import objclass
 from . import polcap
+from . import role
+from . import typeattr
+from . import user
 
 # Rules
-from . import terule
-from . import rbacrule
 from . import mlsrule
+from . import rbacrule
+from . import terule
 
 # Constraints
 from . import constraint
 
 # In-policy Labeling
-from . import initsid
 from . import fscontext
+from . import initsid
 from . import netcontext
 
 
diff --git a/tests/__init__.py b/tests/__init__.py
index 06d0626..589305c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -21,6 +21,7 @@ from . import commonquery
 from . import dta
 from . import fsusequery
 from . import genfsconquery
+from . import infoflow
 from . import initsidquery
 from . import mlsrulequery
 from . import netifconquery
@@ -28,9 +29,8 @@ from . import nodeconquery
 from . import objclassquery
 from . import permmap
 from . import polcapquery
-from . import infoflow
-from . import terulequery
 from . import rbacrulequery
-from . import typequery
 from . import rolequery
+from . import terulequery
+from . import typequery
 from . import userquery