diff --git a/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/refactorer/ClassHierarchySearchTest.java b/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/refactorer/ClassHierarchySearchTest.java
index 99aadc9b5a..e27f901033 100644
--- a/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/refactorer/ClassHierarchySearchTest.java
+++ b/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/refactorer/ClassHierarchySearchTest.java
@@ -24,6 +24,7 @@
 import org.python.pydev.core.ModulesKey;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.log.Log;
+import org.python.pydev.core.preferences.InterpreterGeneralPreferences;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.plugin.nature.PythonNature;
 import org.python.pydev.shared_core.io.FileUtils;
@@ -67,7 +68,7 @@ public void setUp() throws Exception {
             baseDir2.mkdirs();
         }
         super.setUp();
-
+        InterpreterGeneralPreferences.FORCE_USE_TYPESHED = true;
     }
 
     @Override
@@ -134,6 +135,7 @@ public void tearDown() throws Exception {
         FileUtils.deleteDirectoryTree(baseDir2);
 
         super.tearDown();
+        InterpreterGeneralPreferences.FORCE_USE_TYPESHED = null;
     }
 
     public void testFindHierarchy() throws Throwable {
@@ -154,7 +156,7 @@ public void testFindHierarchy() throws Throwable {
             assertEquals("Bar", node.name);
             assertTrue(node.moduleName.startsWith("foo"));
 
-            assertIsIn("Pickler", "pickle", node.parents);
+            assertIsIn("Pickler", "_pickle", node.parents);
             assertIsIn("Foo", node.moduleName, node.children);
         } finally {
             //            System.out.println("END ------------");
@@ -177,7 +179,7 @@ public void testFindHierarchy2() {
         assertTrue(node.moduleName.startsWith("foo"));
 
         HierarchyNodeModel model = assertIsIn("Bar", node.moduleName, node.parents);
-        assertIsIn("Pickler", "pickle", model.parents);
+        assertIsIn("Pickler", "_pickle", model.parents);
 
     }
 
@@ -201,7 +203,7 @@ public void testFindHierarchy3() {
         assertTrue(node.moduleName.startsWith("foo"));
 
         assertIsIn("Bar", node.moduleName, node.parents);
-        assertIsIn("Pickler", "pickle", node.parents);
+        assertIsIn("Pickler", "_pickle", node.parents);
 
     }
 
diff --git a/plugins/org.python.pydev/tests_completions/org/python/pydev/ast/codecompletion/revisited/CodeCompletionTestsBase.java b/plugins/org.python.pydev/tests_completions/org/python/pydev/ast/codecompletion/revisited/CodeCompletionTestsBase.java
index 42fba5c968..44032d759c 100644
--- a/plugins/org.python.pydev/tests_completions/org/python/pydev/ast/codecompletion/revisited/CodeCompletionTestsBase.java
+++ b/plugins/org.python.pydev/tests_completions/org/python/pydev/ast/codecompletion/revisited/CodeCompletionTestsBase.java
@@ -149,6 +149,7 @@ public void tearDown() throws Exception {
         CorePlugin.setBundleInfo(null);
         ProjectModulesManager.IN_TESTS = false;
         FileUtils.IN_TESTS = false;
+        InterpreterGeneralPreferences.FORCE_USE_TYPESHED = null;
         super.tearDown();
     }