diff --git a/python/src/com/jetbrains/python/psi/resolve/PyResolveImportUtil.kt b/python/src/com/jetbrains/python/psi/resolve/PyResolveImportUtil.kt
index 328685ece839..aabb4983dd46 100644
--- a/python/src/com/jetbrains/python/psi/resolve/PyResolveImportUtil.kt
+++ b/python/src/com/jetbrains/python/psi/resolve/PyResolveImportUtil.kt
@@ -101,7 +101,8 @@ private fun resolveQualifiedName(name: QualifiedName,
 
   val foreignResults = foreignResults(name, context)
   val pythonResults = listOf(relativeResults,
-                             resolveFromRoots(name, context),
+                             // TODO: replace with resolveFromRoots when namespace package magic features PY-16688, PY-23087 are implemented
+                             resultsFromRoots(name, context),
                              relativeResultsFromSkeletons(name, context)).flatten().distinct()
   val allResults = pythonResults + foreignResults
   val results = if (name.componentCount > 0) findFirstResults(pythonResults, context.module) + foreignResults else allResults
diff --git a/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java b/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
index fdde049e300c..71c553cb33f5 100644
--- a/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
+++ b/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
@@ -467,7 +467,8 @@ public class PyMultiFileResolveTest extends PyMultiFileResolveTestCase {
   }
 
   // PY-28321
-  public void testImportManySourceRootsReverseRootOrder() {
+  // TODO: The test should be turned on as soon as PY-16688 and PY-23087 are implemented
+  public void ignoreTestImportManySourceRootsReverseRootOrder() {
     myFixture.copyDirectoryToProject("importManySourceRoots", "");
     runWithSourceRoots(Lists.newArrayList(myFixture.findFileInTempDir("root1"), myFixture.findFileInTempDir("root2")), () -> {
       final PsiFile psiFile = myFixture.configureByFile("root1/pkg/a.py");