diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/search/PySearchUtilBase.java b/python/python-psi-impl/src/com/jetbrains/python/psi/search/PySearchUtilBase.java
index 9a21c5c49d41..8248511c908d 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/psi/search/PySearchUtilBase.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/psi/search/PySearchUtilBase.java
@@ -79,7 +79,7 @@ public class PySearchUtilBase {
       }
       // XXX: Disable resolving to any third-party libraries from typeshed in the same places where we don't want SDK tests
       excludedDirs.addAll(Arrays.stream(sdk.getRootProvider().getFiles(OrderRootType.CLASSES))
-                            .filter(file -> PyTypeShed.INSTANCE.isInside(file) || PyTypeShed.INSTANCE.isInThirdPartyLibraries(file))
+                            .filter(file -> PyTypeShed.INSTANCE.isInside(file) && PyTypeShed.INSTANCE.isInThirdPartyLibraries(file))
                             .collect(Collectors.toList()));
       if (!excludedDirs.isEmpty()) {
         GlobalSearchScope scope = buildUnionScope(project, excludedDirs);
diff --git a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.after.py b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.after.py
index ac6d1a85877b..6e51e77ef2c6 100644
--- a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.after.py
+++ b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.after.py
@@ -1,3 +1,3 @@
-from m1 import Cls
+from m1 import SomeCls
 
-Cls
\ No newline at end of file
+SomeCls
\ No newline at end of file
diff --git a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.py b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.py
index be2018256f70..5b1f7be3d6d6 100644
--- a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.py
+++ b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/a.py
@@ -1 +1 @@
-Cls<caret>
\ No newline at end of file
+SomeCls<caret>
\ No newline at end of file
diff --git a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root1/m1.py b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root1/m1.py
index 0370a59fc067..9314858cb911 100644
--- a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root1/m1.py
+++ b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root1/m1.py
@@ -1,2 +1,2 @@
-class Cls:
+class SomeCls:
     pass
\ No newline at end of file
diff --git a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root2/m1.py b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root2/m1.py
index 0370a59fc067..9314858cb911 100644
--- a/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root2/m1.py
+++ b/python/testData/completion/duplicatedEntriesFromMultipleSourceRoots/root2/m1.py
@@ -1,2 +1,2 @@
-class Cls:
+class SomeCls:
     pass
\ No newline at end of file