diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt
new file mode 100644
index 00000000000..a1c71570df3
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt
@@ -0,0 +1,12 @@
+// FILE: checkAmbiguityBetweenRootAndPackage.kt
+package test
+
+val t = <!OVERLOAD_RESOLUTION_AMBIGUITY!>testFun()<!>
+
+// FILE: checkAmbiguityBetweenRootAndPackageRoot.kt
+fun testFun() = 12
+
+// FILE: checkAmbiguityBetweenRootAndPackageTest.kt
+package test
+
+fun testFun() = 12
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/AmbiguityBetweenRootAndPackage.txt b/compiler/testData/lazyResolve/diagnostics/overload/AmbiguityBetweenRootAndPackage.txt
new file mode 100644
index 00000000000..95a3b32216c
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/overload/AmbiguityBetweenRootAndPackage.txt
@@ -0,0 +1,9 @@
+namespace <root>
+
+// <namespace name="test">
+namespace test
+
+internal final val t: [ERROR : Type for testFun()]
+internal final fun testFun(): jet.Int
+// </namespace name="test">
+internal final fun testFun(): jet.Int
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 9ccce46684d..6586b0479d4 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -3810,6 +3810,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/scopes"), "kt", true);
             }
             
+            @TestMetadata("AmbiguityBetweenRootAndPackage.kt")
+            public void testAmbiguityBetweenRootAndPackage() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt");
+            }
+            
             @TestMetadata("ImportFromCurrentWithDifferentName.kt")
             public void testImportFromCurrentWithDifferentName() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt");