diff --git a/tests/test_function_metadata.py b/tests/parseutils/test_function_metadata.py
similarity index 100%
rename from tests/test_function_metadata.py
rename to tests/parseutils/test_function_metadata.py
diff --git a/tests/test_parseutils.py b/tests/parseutils/test_parseutils.py
similarity index 98%
rename from tests/test_parseutils.py
rename to tests/parseutils/test_parseutils.py
index f82f271f..6c2994f8 100644
--- a/tests/test_parseutils.py
+++ b/tests/parseutils/test_parseutils.py
@@ -1,6 +1,6 @@
 import pytest
-from pgcli.packages.parseutils import extract_tables
-from pgcli.packages.parseutils import find_prev_keyword, is_open_quote
+from pgcli.packages.parseutils.tables import extract_tables
+from pgcli.packages.parseutils.utils import find_prev_keyword, is_open_quote
 
 def test_empty_string():
     tables = extract_tables('')