diff --git a/python/helpers/pydev/tests_pydevd/test_egg_zip_exist.py b/python/helpers/pydev/tests_pydevd/test_egg_zip_exist.py
new file mode 100644
index 000000000000..fb41246f8ec4
--- /dev/null
+++ b/python/helpers/pydev/tests_pydevd/test_egg_zip_exist.py
@@ -0,0 +1,22 @@
+__author__ = 'Dmitry.Trofimov'
+
+import unittest
+import os
+
+test_data_path = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', 'testData', 'debug'))
+
+
+class PyDevTestCase(unittest.TestCase):
+    def testZipFileExits(self):
+        from pydevd_file_utils import exists
+
+        self.assertTrue(exists(test_data_path + '/zipped_lib.zip/zipped_module.py'))
+        self.assertFalse(exists(test_data_path + '/zipped_lib.zip/zipped_module2.py'))
+        self.assertFalse(exists(test_data_path + '/zipped_lib2.zip/zipped_module.py'))
+
+
+    def testEggFileExits(self):
+        from pydevd_file_utils import exists
+
+        self.assertTrue(exists(test_data_path + '/pycharm-debug.egg/pydev/pydevd.py'))
+        self.assertFalse(exists(test_data_path + '/pycharm-debug.egg/pydev/pydevd2.py'))
\ No newline at end of file
diff --git a/python/helpers/pydev/tests_pydevd_python/test_debugger.py b/python/helpers/pydev/tests_pydevd_python/test_debugger.py
index 9c9bd5136b4e..f9725f843d81 100644
--- a/python/helpers/pydev/tests_pydevd_python/test_debugger.py
+++ b/python/helpers/pydev/tests_pydevd_python/test_debugger.py
@@ -5,7 +5,7 @@
 
     Note that it's a python script but it'll spawn a process to run as jython, ironpython and as python.
 '''
-from tests_python.debugger_unittest import get_free_port
+from tests_pydevd_python.debugger_unittest import get_free_port
 import threading
 
 
@@ -22,7 +22,7 @@ import unittest
 import os
 import sys
 import time
-from tests_python import debugger_unittest
+from tests_pydevd_python import debugger_unittest
 
 TEST_DJANGO = False
 if sys.version_info[:2] == (2, 7):
diff --git a/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
index 346d32ed95fc..4cc8fe4fd412 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
@@ -73,7 +73,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   @Test
   @Staging
   public void testPydevTests_Debugger() {
-    unittests("tests_python/test_debugger.py");
+    unittests("tests_pydevd_python/test_debugger.py");
   }
 
   private void unittests(final String script) {
@@ -102,8 +102,9 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
+  @Staging
   public void testDebug() { //TODO: merge it into pydev tests
-    unittests("test_debug.py");
+    unittests("tests_pydevd/test_egg_zip_exist.py");
   }
 
   @Test