diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 693dde3b40..ce11716aba 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -100,7 +100,7 @@ class Query(object):
 
     def __init__(self, model, where=WhereNode):
         self.model = model
-        self.alias_refcount = {}
+        self.alias_refcount = SortedDict()
         self.alias_map = {}     # Maps alias to join information
         self.table_map = {}     # Maps table names to list of aliases.
         self.join_map = {}
@@ -819,7 +819,7 @@ class Query(object):
         assert current < ord('Z')
         prefix = chr(current + 1)
         self.alias_prefix = prefix
-        change_map = {}
+        change_map = SortedDict()
         for pos, alias in enumerate(self.tables):
             if alias in exceptions:
                 continue