diff --git a/test/namespace_package/ns1/pkg/__init__.py b/test/namespace_package/ns1/pkg/__init__.py
new file mode 100644
index 00000000..484098a8
--- /dev/null
+++ b/test/namespace_package/ns1/pkg/__init__.py
@@ -0,0 +1 @@
+foo = 'ns1!'
diff --git a/test/namespace_package/ns1/pkg/ns1_file.py b/test/namespace_package/ns1/pkg/ns1_file.py
new file mode 100644
index 00000000..940279f9
--- /dev/null
+++ b/test/namespace_package/ns1/pkg/ns1_file.py
@@ -0,0 +1 @@
+foo = 'ns1_file!'
diff --git a/test/namespace_package/ns1/pkg/ns1_folder/__init__.py b/test/namespace_package/ns1/pkg/ns1_folder/__init__.py
new file mode 100644
index 00000000..9eeeb294
--- /dev/null
+++ b/test/namespace_package/ns1/pkg/ns1_folder/__init__.py
@@ -0,0 +1 @@
+foo = 'ns1_folder!'
diff --git a/test/namespace_package/ns2/pkg/ns2_file.py b/test/namespace_package/ns2/pkg/ns2_file.py
new file mode 100644
index 00000000..e87d7d88
--- /dev/null
+++ b/test/namespace_package/ns2/pkg/ns2_file.py
@@ -0,0 +1 @@
+foo = 'ns2_file!'
diff --git a/test/namespace_package/ns2/pkg/ns2_folder/__init__.py b/test/namespace_package/ns2/pkg/ns2_folder/__init__.py
new file mode 100644
index 00000000..70b24ae4
--- /dev/null
+++ b/test/namespace_package/ns2/pkg/ns2_folder/__init__.py
@@ -0,0 +1 @@
+foo = 'ns2_folder!'
diff --git a/test/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/test/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
new file mode 100644
index 00000000..fbba1db1
--- /dev/null
+++ b/test/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
@@ -0,0 +1 @@
+foo = 'nested!'
diff --git a/test/test_namespace_package.py b/test/test_namespace_package.py
new file mode 100644
index 00000000..c8478bb2
--- /dev/null
+++ b/test/test_namespace_package.py
@@ -0,0 +1,17 @@
+import jedi
+import sys
+
+def test_namespace_package():
+    sys.path.insert(0, 'namespace_package/ns1')
+    sys.path.insert(1, 'namespace_package/ns2')
+    try:
+        assert jedi.Script('from pkg import ns1_file').goto_definitions()
+        assert jedi.Script('from pkg import ns2_file').goto_definitions()
+        assert not jedi.Script('from pkg import ns3_file').goto_definitions()
+
+        completions = jedi.Script('from pkg import ').completions()
+        names = [c.name for c in completions]
+        assert names == ['foo', 'ns1_file', 'ns1_folder', 'ns2_folder', 'ns2_file']
+    finally:
+        sys.path.pop(0)
+        sys.path.pop(0)