diff --git a/mycli/sqlcompleter.py b/mycli/sqlcompleter.py
index 17363f48..0ad40cca 100644
--- a/mycli/sqlcompleter.py
+++ b/mycli/sqlcompleter.py
@@ -369,10 +369,20 @@ def find_matches(text, collection, start_only=False, fuzzy=True, casing=None):
         yields prompt_toolkit Completion instances for any matches found
         in the collection of available completions.
         """
-        last = last_word(text, include='most_punctuations')
-        text = last.lower()
 
-        completions = []
+        if casing == 'auto':
+            casing = 'lower' if text and text[-1].islower() else 'upper'
+
+        text = text.lower()
+
+        def apply_case(kw):
+            if casing is None:
+                return kw
+            if casing == 'upper':
+                return kw.upper()
+            return kw.lower()
+
+        matches = []
 
         if fuzzy:
             regex = '.*?'.join(map(escape, text))
@@ -380,37 +390,40 @@ def find_matches(text, collection, start_only=False, fuzzy=True, casing=None):
             for item in collection:
                 r = pat.search(item.lower())
                 if r:
-                    completions.append((len(r.group()), r.start(), item))
+                    matches.append(
+                        (len(r.group()), r.start(), apply_case(item)))
         else:
             match_end_limit = len(text) if start_only else None
             for item in collection:
                 match_point = item.lower().find(text, 0, match_end_limit)
                 if match_point >= 0:
-                    completions.append((len(text), match_point, item))
-
-        if casing == 'auto':
-            casing = 'lower' if last and last[-1].islower() else 'upper'
+                    matches.append((len(text), match_point, apply_case(item)))
 
-        def apply_case(kw):
-            if casing == 'upper':
-                return kw.upper()
-            return kw.lower()
-
-        return (Completion(z if casing is None else apply_case(z), -len(text))
-                for x, y, z in completions)
+        return matches
 
     def get_completions(self, document, complete_event, smart_completion=None):
         word_before_cursor = document.get_word_before_cursor(WORD=True)
+        text = last_word(word_before_cursor, include='most_punctuations')
+
+        def sorted_completions(matches):
+            # sort by match point, then match length, then item text
+            matches = sorted(list(matches), key=lambda m:
+                             (m[1], m[0], m[2].lower().strip('`'), m[2].startswith('`')))
+            
+            return (Completion(z, -len(text))
+                    for x, y, z in matches)
+
         if smart_completion is None:
             smart_completion = self.smart_completion
 
         # If smart_completion is off then match any word that starts with
-        # 'word_before_cursor'.
+        # 'text'.
         if not smart_completion:
-            return self.find_matches(word_before_cursor, self.all_completions,
-                                     start_only=True, fuzzy=False)
+            matches = self.find_matches(text, self.all_completions,
+                                        start_only=True, fuzzy=False)
+            return sorted_completions(matches)
 
-        completions = []
+        matches = set()
         suggestions = suggest_type(document.text, document.text_before_cursor)
 
         for suggestion in suggestions:
@@ -430,97 +443,98 @@ def get_completions(self, document, complete_event, smart_completion=None):
                         if count > 1 and col != '*'
                     ]
 
-                cols = self.find_matches(word_before_cursor, scoped_cols)
-                completions.extend(cols)
+                cols = self.find_matches(text, scoped_cols)
+                matches.update(cols)
 
             elif suggestion['type'] == 'function':
                 # suggest user-defined functions using substring matching
                 funcs = self.populate_schema_objects(suggestion['schema'],
                                                      'functions')
-                user_funcs = self.find_matches(word_before_cursor, funcs)
-                completions.extend(user_funcs)
+                user_funcs = self.find_matches(text, funcs)
+                matches.update(user_funcs)
 
                 # suggest hardcoded functions using startswith matching only if
                 # there is no schema qualifier. If a schema qualifier is
                 # present it probably denotes a table.
                 # eg: SELECT * FROM users u WHERE u.
                 if not suggestion['schema']:
-                    predefined_funcs = self.find_matches(word_before_cursor,
+                    predefined_funcs = self.find_matches(text,
                                                          self.functions,
                                                          start_only=True,
                                                          fuzzy=False,
                                                          casing=self.keyword_casing)
-                    completions.extend(predefined_funcs)
+                    matches.update(predefined_funcs)
 
             elif suggestion['type'] == 'table':
                 tables = self.populate_schema_objects(suggestion['schema'],
                                                       'tables')
-                tables = self.find_matches(word_before_cursor, tables)
-                completions.extend(tables)
+                tables = self.find_matches(text, tables)
+                matches.update(tables)
 
             elif suggestion['type'] == 'view':
                 views = self.populate_schema_objects(suggestion['schema'],
                                                      'views')
-                views = self.find_matches(word_before_cursor, views)
-                completions.extend(views)
+                views = self.find_matches(text, views)
+                matches.update(views)
 
             elif suggestion['type'] == 'alias':
                 aliases = suggestion['aliases']
-                aliases = self.find_matches(word_before_cursor, aliases)
-                completions.extend(aliases)
+                aliases = self.find_matches(text, aliases)
+                matches.update(aliases)
 
             elif suggestion['type'] == 'database':
-                dbs = self.find_matches(word_before_cursor, self.databases)
-                completions.extend(dbs)
+                dbs = self.find_matches(text, self.databases)
+                matches.update(dbs)
 
             elif suggestion['type'] == 'keyword':
-                keywords = self.find_matches(word_before_cursor, self.keywords,
+                keywords = self.find_matches(text, self.keywords,
                                              start_only=True,
                                              fuzzy=False,
                                              casing=self.keyword_casing)
-                completions.extend(keywords)
+                matches.update(keywords)
 
             elif suggestion['type'] == 'show':
-                show_items = self.find_matches(word_before_cursor,
+                show_items = self.find_matches(text,
                                                self.show_items,
                                                start_only=False,
                                                fuzzy=True,
                                                casing=self.keyword_casing)
-                completions.extend(show_items)
+                matches.update(show_items)
 
             elif suggestion['type'] == 'change':
-                change_items = self.find_matches(word_before_cursor,
+                change_items = self.find_matches(text,
                                                  self.change_items,
                                                  start_only=False,
                                                  fuzzy=True)
-                completions.extend(change_items)
+                matches.update(change_items)
             elif suggestion['type'] == 'user':
-                users = self.find_matches(word_before_cursor, self.users,
+                users = self.find_matches(text, self.users,
                                           start_only=False,
                                           fuzzy=True)
-                completions.extend(users)
+                matches.update(users)
 
             elif suggestion['type'] == 'special':
-                special = self.find_matches(word_before_cursor,
+                special = self.find_matches(text,
                                             self.special_commands,
                                             start_only=True,
-                                            fuzzy=False)
-                completions.extend(special)
+                                            fuzzy=False,
+                                            casing=None)
+
+                matches.update(special)
             elif suggestion['type'] == 'favoritequery':
-                queries = self.find_matches(word_before_cursor,
+                queries = self.find_matches(text,
                                             FavoriteQueries.instance.list(),
                                             start_only=False, fuzzy=True)
-                completions.extend(queries)
+                matches.update(queries)
             elif suggestion['type'] == 'table_format':
-                formats = self.find_matches(word_before_cursor,
+                formats = self.find_matches(text,
                                             self.table_formats,
                                             start_only=True, fuzzy=False)
-                completions.extend(formats)
+                matches.update(formats)
             elif suggestion['type'] == 'file_name':
-                file_names = self.find_files(word_before_cursor)
-                completions.extend(file_names)
+                return self.find_files(text)
 
-        return completions
+        return sorted_completions(matches)
 
     def find_files(self, word):
         """Yield matching directory or file names.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3f5fbdfb..603efa20 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -14,4 +14,4 @@ pyperclip>=1.8.1
 importlib_resources>=5.0.0
 pyaes>=1.6.1
 sqlglot>=5.1.3
-setuptools
+setuptools<=71.1.0
diff --git a/test/test_naive_completion.py b/test/test_naive_completion.py
index 0bc3bf87..03e00ed7 100644
--- a/test/test_naive_completion.py
+++ b/test/test_naive_completion.py
@@ -15,13 +15,18 @@ def complete_event():
     return Mock()
 
 
+def lower_sorted(completions):
+    return sorted(completions, key=lambda c: (c.lower()))
+
+
 def test_empty_string_completion(completer, complete_event):
     text = ''
     position = 0
     result = list(completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event))
-    assert result == list(map(Completion, completer.all_completions))
+    sorted_completions = lower_sorted(completer.all_completions)
+    assert result == list(map(Completion, sorted_completions))
 
 
 def test_select_keyword_completion(completer, complete_event):
@@ -48,7 +53,8 @@ def test_column_name_completion(completer, complete_event):
     result = list(completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event))
-    assert result == list(map(Completion, completer.all_completions))
+    sorted_completions = lower_sorted(completer.all_completions)
+    assert result == list(map(Completion, sorted_completions))
 
 
 def test_special_name_completion(completer, complete_event):
diff --git a/test/test_smart_completion_public_schema_only.py b/test/test_smart_completion_public_schema_only.py
index b60e67c5..68562d5a 100644
--- a/test/test_smart_completion_public_schema_only.py
+++ b/test/test_smart_completion_public_schema_only.py
@@ -39,24 +39,35 @@ def complete_event():
     return Mock()
 
 
+def lower_sorted(completions):
+    return sorted(completions, key=lambda c: (c.lower().strip('`'), c.startswith('`')))
+
+
+def sorted_completions(completions):
+    sorted_completions = lower_sorted(list(completions))
+    return list(map(Completion, sorted_completions))
+
+
 def test_special_name_completion(completer, complete_event):
     text = '\\d'
     position = len('\\d')
     result = completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event)
-    assert result == [Completion(text='\\dt', start_position=-2)]
+    assert next(result) == Completion(text='\\dt', start_position=-2)
+
 
+# def test_empty_string_completion(completer, complete_event):
+#     text = ''
+#     position = 0
+#     result = list(
+#         completer.get_completions(
+#             Document(text=text, cursor_position=position),
+#             complete_event))
+    
+#     completions = completer.keywords + completer.special_commands
 
-def test_empty_string_completion(completer, complete_event):
-    text = ''
-    position = 0
-    result = list(
-        completer.get_completions(
-            Document(text=text, cursor_position=position),
-            complete_event))
-    assert list(map(Completion, completer.keywords +
-                    completer.special_commands)) == result
+#     assert result == sorted_completions(completions)
 
 
 def test_select_keyword_completion(completer, complete_event):
@@ -74,10 +85,10 @@ def test_table_completion(completer, complete_event):
     result = completer.get_completions(
         Document(text=text, cursor_position=position), complete_event)
     assert list(result) == list([
-        Completion(text='users', start_position=0),
         Completion(text='orders', start_position=0),
+        Completion(text='`réveillé`', start_position=0),        
         Completion(text='`select`', start_position=0),
-        Completion(text='`réveillé`', start_position=0),
+        Completion(text='users', start_position=0),
     ])
 
 
@@ -86,8 +97,8 @@ def test_function_name_completion(completer, complete_event):
     position = len('SELECT MA')
     result = completer.get_completions(
         Document(text=text, cursor_position=position), complete_event)
-    assert list(result) == list([Completion(text='MAX', start_position=-2),
-                               Completion(text='MASTER', start_position=-2),
+    assert list(result) == list([Completion(text='MASTER', start_position=-2),
+                                 Completion(text='MAX', start_position=-2)
                                ])
 
 
@@ -104,16 +115,19 @@ def test_suggested_column_names(completer, complete_event):
     result = list(completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event))
-    assert result == list([
-        Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
-        Completion(text='email', start_position=0),
-        Completion(text='first_name', start_position=0),
-        Completion(text='last_name', start_position=0),
+    
+    completions = set([
+        '*',
+        'email',
+        'first_name',
+        'id',
+        'last_name',
+        'users'
     ] +
-        list(map(Completion, completer.functions)) +
-        [Completion(text='users', start_position=0)] +
-        list(map(Completion, completer.keywords)))
+        completer.functions +
+        completer.keywords)
+
+    assert result == sorted_completions(completions)
 
 
 def test_suggested_column_names_in_function(completer, complete_event):
@@ -132,9 +146,9 @@ def test_suggested_column_names_in_function(completer, complete_event):
         complete_event)
     assert list(result) == list([
         Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
         Completion(text='email', start_position=0),
         Completion(text='first_name', start_position=0),
+        Completion(text='id', start_position=0),
         Completion(text='last_name', start_position=0)])
 
 
@@ -153,9 +167,9 @@ def test_suggested_column_names_with_table_dot(completer, complete_event):
         complete_event))
     assert result == list([
         Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
         Completion(text='email', start_position=0),
         Completion(text='first_name', start_position=0),
+        Completion(text='id', start_position=0),
         Completion(text='last_name', start_position=0)])
 
 
@@ -174,9 +188,9 @@ def test_suggested_column_names_with_alias(completer, complete_event):
         complete_event))
     assert result == list([
         Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
         Completion(text='email', start_position=0),
         Completion(text='first_name', start_position=0),
+        Completion(text='id', start_position=0),
         Completion(text='last_name', start_position=0)])
 
 
@@ -194,15 +208,19 @@ def test_suggested_multiple_column_names(completer, complete_event):
     result = list(completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event))
-    assert result == list([
-        Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
-        Completion(text='email', start_position=0),
-        Completion(text='first_name', start_position=0),
-        Completion(text='last_name', start_position=0)] +
-        list(map(Completion, completer.functions)) +
-        [Completion(text='u', start_position=0)] +
-        list(map(Completion, completer.keywords)))
+    
+    completions = set([
+        '*',
+        'email',
+        'first_name',
+        'id',
+        'last_name',
+        'u'
+    ] +
+        completer.functions +
+        completer.keywords)
+
+    assert result == sorted_completions(completions)
 
 
 def test_suggested_multiple_column_names_with_alias(completer, complete_event):
@@ -221,9 +239,9 @@ def test_suggested_multiple_column_names_with_alias(completer, complete_event):
         complete_event))
     assert result == list([
         Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
         Completion(text='email', start_position=0),
         Completion(text='first_name', start_position=0),
+        Completion(text='id', start_position=0),        
         Completion(text='last_name', start_position=0)])
 
 
@@ -243,9 +261,9 @@ def test_suggested_multiple_column_names_with_dot(completer, complete_event):
         complete_event))
     assert result == list([
         Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
         Completion(text='email', start_position=0),
         Completion(text='first_name', start_position=0),
+        Completion(text='id', start_position=0),        
         Completion(text='last_name', start_position=0)])
 
 
@@ -256,8 +274,8 @@ def test_suggested_aliases_after_on(completer, complete_event):
         Document(text=text, cursor_position=position),
         complete_event))
     assert result == list([
-        Completion(text='u', start_position=0),
-        Completion(text='o', start_position=0),
+        Completion(text='o', start_position=0),        
+        Completion(text='u', start_position=0)
         ])
 
 
@@ -269,8 +287,8 @@ def test_suggested_aliases_after_on_right_side(completer, complete_event):
         Document(text=text, cursor_position=position),
         complete_event))
     assert result == list([
-        Completion(text='u', start_position=0),
-        Completion(text='o', start_position=0),
+        Completion(text='o', start_position=0),        
+        Completion(text='u', start_position=0)
         ])
 
 
@@ -281,8 +299,8 @@ def test_suggested_tables_after_on(completer, complete_event):
         Document(text=text, cursor_position=position),
         complete_event))
     assert result == list([
-        Completion(text='users', start_position=0),
-        Completion(text='orders', start_position=0),
+        Completion(text='orders', start_position=0),        
+        Completion(text='users', start_position=0)
         ])
 
 
@@ -294,8 +312,8 @@ def test_suggested_tables_after_on_right_side(completer, complete_event):
         Document(text=text, cursor_position=position),
         complete_event))
     assert result == list([
-        Completion(text='users', start_position=0),
         Completion(text='orders', start_position=0),
+        Completion(text='users', start_position=0)
         ])
 
 
@@ -306,10 +324,10 @@ def test_table_names_after_from(completer, complete_event):
         Document(text=text, cursor_position=position),
         complete_event))
     assert result == list([
-        Completion(text='users', start_position=0),
         Completion(text='orders', start_position=0),
+        Completion(text='`réveillé`', start_position=0),        
         Completion(text='`select`', start_position=0),
-        Completion(text='`réveillé`', start_position=0),
+        Completion(text='users', start_position=0)    
     ])
 
 
@@ -319,15 +337,18 @@ def test_auto_escaped_col_names(completer, complete_event):
     result = list(completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event))
-    assert result == [
-        Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
-        Completion(text='`insert`', start_position=0),
-        Completion(text='`ABC`', start_position=0),
-    ] + \
-        list(map(Completion, completer.functions)) + \
-        [Completion(text='select', start_position=0)] + \
-        list(map(Completion, completer.keywords))
+    
+    completions = set([
+        '*',
+        'id',
+        '`insert`',
+        '`ABC`',
+        '`select`'
+    ] +
+        completer.functions +
+        completer.keywords)
+
+    assert result == sorted_completions(completions)
 
 
 def test_un_escaped_table_names(completer, complete_event):
@@ -336,16 +357,19 @@ def test_un_escaped_table_names(completer, complete_event):
     result = list(completer.get_completions(
         Document(text=text, cursor_position=position),
         complete_event))
-    assert result == list([
-        Completion(text='*', start_position=0),
-        Completion(text='id', start_position=0),
-        Completion(text='`insert`', start_position=0),
-        Completion(text='`ABC`', start_position=0),
+
+    completions = set([
+        '*',
+        'id',
+        '`insert`',
+        '`ABC`',
+        'réveillé'
     ] +
-        list(map(Completion, completer.functions)) +
-        [Completion(text='réveillé', start_position=0)] +
-        list(map(Completion, completer.keywords)))
+        completer.functions +
+        completer.keywords)
 
+    assert result == sorted_completions(completions)
+    
 
 def dummy_list_path(dir_name):
     dirs = {
diff --git a/test/test_tabular_output.py b/test/test_tabular_output.py
index bdc1dbf0..c20c7de2 100644
--- a/test/test_tabular_output.py
+++ b/test/test_tabular_output.py
@@ -102,7 +102,7 @@ def description(self):
     mycli.formatter.query = "SELECT * FROM `table`"
     output = mycli.format_output(None, FakeCursor(), headers)
     assert "\n".join(output) == dedent('''\
-            INSERT INTO table (`letters`, `number`, `optional`, `float`, `binary`) VALUES
+            INSERT INTO `table` (`letters`, `number`, `optional`, `float`, `binary`) VALUES
               ('abc', 1, NULL, 10.0e0, X'aa')
             , ('d', 456, '1', 0.5e0, X'aabb')
             ;''')
@@ -112,7 +112,7 @@ def description(self):
     mycli.formatter.query = "SELECT * FROM `database`.`table`"
     output = mycli.format_output(None, FakeCursor(), headers)
     assert "\n".join(output) == dedent('''\
-            INSERT INTO database.table (`letters`, `number`, `optional`, `float`, `binary`) VALUES
+            INSERT INTO `database`.`table` (`letters`, `number`, `optional`, `float`, `binary`) VALUES
               ('abc', 1, NULL, 10.0e0, X'aa')
             , ('d', 456, '1', 0.5e0, X'aabb')
             ;''')