diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
index 2b19c32..9edb7d5 100644
--- a/mycli/packages/completion_engine.py
+++ b/mycli/packages/completion_engine.py
@@ -75,7 +75,7 @@ def suggest_type(full_text, text_before_cursor):
         # Be careful here because trivial whitespace is parsed as a statement,
         # but the statement won't have a first token
         tok1 = statement.token_first()
-        if tok1 and (tok1.value == 'source' or tok1.value.startswith('\\')):
+        if tok1 and tok1.value in ['\\', 'source']:
             return suggest_special(text_before_cursor)
 
     last_token = statement and statement.token_prev(len(statement.tokens))[1] or ''
@@ -190,7 +190,7 @@ def suggest_based_on_last_token(token, text_before_cursor, full_text, identifier
 
         # We're probably in a function argument list
         return [{'type': 'column', 'tables': extract_tables(full_text)}]
-    elif token_v in ('set', 'order by', 'distinct'):
+    elif token_v in ('set', 'by', 'distinct'):
         return [{'type': 'column', 'tables': extract_tables(full_text)}]
     elif token_v == 'as':
         # Don't suggest anything for an alias
diff --git a/setup.py b/setup.py
index 2a9b81e..4a7b45a 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ install_requirements = [
     'Pygments >= 1.6',
     'prompt_toolkit>=2.0.6,<3.0.0',
     'PyMySQL >= 0.9.2',
-    'sqlparse>=0.3.0,<0.4.0',
+    'sqlparse>=0.2.2,<0.3.0',
     'configobj >= 5.0.5',
     'cryptography >= 1.0.0',
     'cli_helpers[styles] > 1.1.0',
diff --git a/test/test_completion_engine.py b/test/test_completion_engine.py
index 9e7c608..c2ab991 100644
--- a/test/test_completion_engine.py
+++ b/test/test_completion_engine.py
@@ -531,7 +531,3 @@ def test_favorite_name_suggestion(expression):
     suggestions = suggest_type(expression, expression)
     assert suggestions == [{'type': 'favoritequery'}]
 
-def test_order_by():
-    text = 'select * from foo order by '
-    suggestions = suggest_type(text, text)
-    assert suggestions == [{'tables': [(None, 'foo', None)], 'type': 'column'}]