diff --git a/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py b/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py
deleted file mode 100644
index 838595ab7..000000000
--- a/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#--- path: a/__init__.py ---#
-from . import b
-#             ^ defined: 6
-
-#--- path: a/b/__init__.py ---#
-B = 'b'
-
-#--- path: main.py ---#
-from a import b
-#             ^ defined: 6
-
-print b.B
-#     ^ defined: 9, 6
-#       ^ defined: 6
\ No newline at end of file
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py
new file mode 100644
index 000000000..ea51f9450
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py
@@ -0,0 +1,14 @@
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: test.py ---
+
+from foo import bar
+
+bar.BAR
+# ^ defined: 7, 3
+#     ^ defined: 3
+
+foo
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py
new file mode 100644
index 000000000..1eb97ffe2
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py
@@ -0,0 +1,13 @@
+# --- path: foo.py ---
+
+FOO = 42
+
+# --- path: test.py ---
+
+from foo import FOO
+
+FOO
+# ^ defined: 7, 3
+
+foo
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py
new file mode 100644
index 000000000..088ca9544
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py
@@ -0,0 +1,13 @@
+# --- path: foo.py ---
+
+FOO = 42
+
+# --- path: test.py ---
+
+from foo import FOO as QUX
+
+QUX
+# ^ defined: 7, 3
+
+FOO
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py
new file mode 100644
index 000000000..3a1de4ffe
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py
@@ -0,0 +1,13 @@
+# --- path: foo.py ---
+
+FOO = 42
+
+# --- path: test.py ---
+
+from foo import *
+
+FOO
+# ^ defined: 3
+
+foo
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py
new file mode 100644
index 000000000..8d89d8538
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py
@@ -0,0 +1,16 @@
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: test.py ---
+
+from foo.bar import BAR
+
+BAR
+# ^ defined: 7, 3
+
+foo
+# ^ defined:
+
+bar
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py
new file mode 100644
index 000000000..961cd1622
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py
@@ -0,0 +1,10 @@
+# --- path: foo/__init__.py ---
+
+FOO = 42
+
+# --- path: foo/bar/test.py ---
+
+from .. import FOO
+
+FOO
+# ^ defined: 7, 3
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py
new file mode 100644
index 000000000..75652f7cd
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py
@@ -0,0 +1,10 @@
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: foo/baz/test.py ---
+
+from ..bar import BAR
+
+BAR
+# ^ defined: 7, 3
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py
new file mode 100644
index 000000000..f8de8042c
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py
@@ -0,0 +1,10 @@
+# --- path: foo/__init__.py ---
+
+FOO = 42
+
+# --- path: foo/test.py ---
+
+from . import FOO
+
+FOO
+# ^ defined: 7, 3
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py
new file mode 100644
index 000000000..dc64ce387
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py
@@ -0,0 +1,10 @@
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: foo/test.py ---
+
+from .bar import BAR
+
+BAR
+# ^ defined: 7, 3
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_module.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_module.py
new file mode 100644
index 000000000..897acdf63
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_module.py
@@ -0,0 +1,11 @@
+# --- path: foo.py ---
+
+FOO = 42
+
+# --- path: test.py ---
+
+import foo
+
+foo.FOO
+# ^ defined: 7, 3
+#     ^ defined: 3
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py
new file mode 100644
index 000000000..220a6b72d
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py
@@ -0,0 +1,14 @@
+# --- path: foo.py ---
+
+FOO = 42
+
+# --- path: test.py ---
+
+import foo as qux
+
+qux.FOO
+# ^ defined: 7, 3
+#     ^ defined: 3
+
+foo
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py
new file mode 100644
index 000000000..312cd66a1
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py
@@ -0,0 +1,15 @@
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: test.py ---
+
+import foo.bar
+
+foo.bar.BAR
+# ^ defined: 7
+#     ^ defined: 7, 3
+#         ^ defined: 3
+
+bar
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip
new file mode 100644
index 000000000..dd84f39b5
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip
@@ -0,0 +1,17 @@
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: test.py ---
+
+import foo.bar as qux
+
+qux.BAR
+# ^ defined: 7
+#     ^ defined: 3
+
+foo
+# ^ defined:
+
+bar
+# ^ defined:
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip
new file mode 100644
index 000000000..2cdb2cf66
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip
@@ -0,0 +1,14 @@
+# --- path: foo/__init__.py ---
+from . import bar
+#             ^ defined: 6
+
+# --- path: foo/bar/__init__.py ---
+BAR = 'b'
+
+# --- path: main.py ---
+from foo import bar
+#               ^ defined: 6
+
+bar.BAR
+# ^ defined: 9, 6
+#     ^ defined: 6
diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip
new file mode 100644
index 000000000..a9d12848c
--- /dev/null
+++ b/languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip
@@ -0,0 +1,18 @@
+# --- path: foo/__init__.py ---
+
+FOO = 42
+
+# --- path: foo/bar.py ---
+
+BAR = 42
+
+# --- path: test.py ---
+
+import foo
+
+foo.FOO
+# ^ defined: 11, 3
+#     ^ defined: 3
+
+foo.bar
+#   ^ defined: