diff --git a/test/completion/stub_folder/stub_only_folder/nested_stub_only.pyi b/test/completion/stub_folder/stub_only_folder/nested_stub_only.pyi
new file mode 100644
index 00000000..4f2f4239
--- /dev/null
+++ b/test/completion/stub_folder/stub_only_folder/nested_stub_only.pyi
@@ -0,0 +1 @@
+in_stub_only: int
diff --git a/test/completion/stub_folder/stub_only_folder/nested_with_stub.py b/test/completion/stub_folder/stub_only_folder/nested_with_stub.py
new file mode 100644
index 00000000..0f9111f4
--- /dev/null
+++ b/test/completion/stub_folder/stub_only_folder/nested_with_stub.py
@@ -0,0 +1,2 @@
+in_python = ''
+in_both = ''
diff --git a/test/completion/stub_folder/stub_only_folder/nested_with_stub.pyi b/test/completion/stub_folder/stub_only_folder/nested_with_stub.pyi
new file mode 100644
index 00000000..53dc2653
--- /dev/null
+++ b/test/completion/stub_folder/stub_only_folder/nested_with_stub.pyi
@@ -0,0 +1,2 @@
+in_stub: int
+in_both: float
diff --git a/test/completion/stub_folder/stub_only_folder/python_only.py b/test/completion/stub_folder/stub_only_folder/python_only.py
new file mode 100644
index 00000000..23370e0c
--- /dev/null
+++ b/test/completion/stub_folder/stub_only_folder/python_only.py
@@ -0,0 +1 @@
+in_python = ''
diff --git a/test/completion/stubs.py b/test/completion/stubs.py
index 61137e9a..6dcba6f9 100644
--- a/test/completion/stubs.py
+++ b/test/completion/stubs.py
@@ -1,6 +1,8 @@
 from stub_folder import with_stub, stub_only, with_stub_folder, stub_only_folder
 
+# -------------------------
 # Just files
+# -------------------------
 
 #? int()
 stub_only.in_stub_only
@@ -12,7 +14,9 @@ with_stub.in_with_stub_python
 with_stub.in_with_stub_stub
 
 
+# -------------------------
 # Folders
+# -------------------------
 
 #? int()
 stub_only_folder.in_stub_only_folder
@@ -23,7 +27,9 @@ with_stub_folder.in_with_stub_python_folder
 #? float()
 with_stub_folder.in_with_stub_stub_folder
 
-# Folders nested
+# -------------------------
+# Folders nested with stubs
+# -------------------------
 
 from stub_folder.with_stub_folder import nested_stub_only, nested_with_stub, \
     python_only
@@ -38,3 +44,21 @@ nested_with_stub.in_python
 nested_with_stub.in_stub
 #? str()
 python_only.in_python
+
+# -------------------------
+# Folders nested with stubs
+# -------------------------
+
+from stub_folder.stub_only_folder import nested_stub_only, nested_with_stub, \
+    python_only
+
+#? int()
+nested_stub_only.in_stub_only
+#? float()
+nested_with_stub.in_both
+#?
+nested_with_stub.in_python
+#? int()
+nested_with_stub.in_stub
+#? str()
+python_only.in_python