diff --git a/python/helpers/pydev/tests/__init__.py b/python/helpers/pydev/tests_pydevd/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests/__init__.py
rename to python/helpers/pydev/tests_pydevd/__init__.py
diff --git a/python/helpers/pydev/tests/test_check_pydevconsole.py b/python/helpers/pydev/tests_pydevd/test_check_pydevconsole.py
similarity index 100%
rename from python/helpers/pydev/tests/test_check_pydevconsole.py
rename to python/helpers/pydev/tests_pydevd/test_check_pydevconsole.py
diff --git a/python/helpers/pydev/tests/test_get_referrers.py b/python/helpers/pydev/tests_pydevd/test_get_referrers.py
similarity index 100%
rename from python/helpers/pydev/tests/test_get_referrers.py
rename to python/helpers/pydev/tests_pydevd/test_get_referrers.py
diff --git a/python/helpers/pydev/tests/test_jyserver.py b/python/helpers/pydev/tests_pydevd/test_jyserver.py
similarity index 100%
rename from python/helpers/pydev/tests/test_jyserver.py
rename to python/helpers/pydev/tests_pydevd/test_jyserver.py
diff --git a/python/helpers/pydev/tests/test_jysimpleTipper.py b/python/helpers/pydev/tests_pydevd/test_jysimpleTipper.py
similarity index 100%
rename from python/helpers/pydev/tests/test_jysimpleTipper.py
rename to python/helpers/pydev/tests_pydevd/test_jysimpleTipper.py
diff --git a/python/helpers/pydev/tests/test_pydev_ipython_011.py b/python/helpers/pydev/tests_pydevd/test_pydev_ipython_011.py
similarity index 100%
rename from python/helpers/pydev/tests/test_pydev_ipython_011.py
rename to python/helpers/pydev/tests_pydevd/test_pydev_ipython_011.py
diff --git a/python/helpers/pydev/tests/test_pydevconsole.py b/python/helpers/pydev/tests_pydevd/test_pydevconsole.py
similarity index 100%
rename from python/helpers/pydev/tests/test_pydevconsole.py
rename to python/helpers/pydev/tests_pydevd/test_pydevconsole.py
diff --git a/python/helpers/pydev/tests/test_pyserver.py b/python/helpers/pydev/tests_pydevd/test_pyserver.py
similarity index 100%
rename from python/helpers/pydev/tests/test_pyserver.py
rename to python/helpers/pydev/tests_pydevd/test_pyserver.py
diff --git a/python/helpers/pydev/tests/test_signature.py b/python/helpers/pydev/tests_pydevd/test_signature.py
similarity index 100%
rename from python/helpers/pydev/tests/test_signature.py
rename to python/helpers/pydev/tests_pydevd/test_signature.py
diff --git a/python/helpers/pydev/tests/test_simpleTipper.py b/python/helpers/pydev/tests_pydevd/test_simpleTipper.py
similarity index 100%
rename from python/helpers/pydev/tests/test_simpleTipper.py
rename to python/helpers/pydev/tests_pydevd/test_simpleTipper.py
diff --git a/python/helpers/pydev/tests_mainloop/README b/python/helpers/pydev/tests_pydevd_mainloop/README
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/README
rename to python/helpers/pydev/tests_pydevd_mainloop/README
diff --git a/python/helpers/pydev/tests_mainloop/__init__.py b/python/helpers/pydev/tests_pydevd_mainloop/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/__init__.py
rename to python/helpers/pydev/tests_pydevd_mainloop/__init__.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-glut.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-glut.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-glut.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-glut.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-gtk.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-gtk.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-gtk.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-gtk.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-gtk3.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-gtk3.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-gtk3.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-gtk3.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-pyglet.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-pyglet.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-pyglet.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-pyglet.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-qt.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-qt.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-qt.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-qt.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-tk.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-tk.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-tk.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-tk.py
diff --git a/python/helpers/pydev/tests_mainloop/gui-wx.py b/python/helpers/pydev/tests_pydevd_mainloop/gui-wx.py
similarity index 100%
rename from python/helpers/pydev/tests_mainloop/gui-wx.py
rename to python/helpers/pydev/tests_pydevd_mainloop/gui-wx.py
diff --git a/python/helpers/pydev/tests_python/__init__.py b/python/helpers/pydev/tests_pydevd_python/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_python/__init__.py
rename to python/helpers/pydev/tests_pydevd_python/__init__.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case1.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case1.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case1.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case1.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case10.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case10.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case10.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case10.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case13.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case13.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case13.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case13.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case14.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case14.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case14.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case14.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case15.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case15.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case15.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case15.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case15_execfile.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case15_execfile.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case15_execfile.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case15_execfile.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case16.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case16.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case16.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case16.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case17.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case17.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case17.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case17.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case17a.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case17a.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case17a.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case17a.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case18.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case18.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case18.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case18.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case19.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case19.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case19.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case19.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case2.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case2.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case2.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case2.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case3.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case3.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case3.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case3.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case4.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case4.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case4.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case4.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case56.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case56.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case56.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case56.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case7.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case7.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case7.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case7.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case89.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case89.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case89.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case89.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case_qthread1.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case_qthread1.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case_qthread1.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case_qthread1.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case_qthread2.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case_qthread2.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case_qthread2.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case_qthread2.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case_qthread3.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case_qthread3.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case_qthread3.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case_qthread3.py
diff --git a/python/helpers/pydev/tests_python/_debugger_case_set_next_statement.py b/python/helpers/pydev/tests_pydevd_python/_debugger_case_set_next_statement.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_debugger_case_set_next_statement.py
rename to python/helpers/pydev/tests_pydevd_python/_debugger_case_set_next_statement.py
diff --git a/python/helpers/pydev/tests_python/_performance_1.py b/python/helpers/pydev/tests_pydevd_python/_performance_1.py
similarity index 100%
rename from python/helpers/pydev/tests_python/_performance_1.py
rename to python/helpers/pydev/tests_pydevd_python/_performance_1.py
diff --git a/python/helpers/pydev/tests_python/debugger_unittest.py b/python/helpers/pydev/tests_pydevd_python/debugger_unittest.py
similarity index 100%
rename from python/helpers/pydev/tests_python/debugger_unittest.py
rename to python/helpers/pydev/tests_pydevd_python/debugger_unittest.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/manage.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/manage.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/manage.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/manage.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/__init__.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/__init__.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/__init__.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/admin.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/admin.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/admin.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/admin.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/models.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/models.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/models.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/models.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/templates/my_app/index.html b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/index.html
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/templates/my_app/index.html
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/index.html
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/tests.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/tests.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/tests.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/tests.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/urls.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/urls.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/urls.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/urls.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/views.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/views.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/views.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/views.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/__init__.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/__init__.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/__init__.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/settings.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/settings.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/settings.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/settings.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/urls.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/urls.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/urls.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/urls.py
diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/wsgi.py b/python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/wsgi.py
similarity index 100%
rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/wsgi.py
rename to python/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/wsgi.py
diff --git a/python/helpers/pydev/tests_python/performance_check.py b/python/helpers/pydev/tests_pydevd_python/performance_check.py
similarity index 100%
rename from python/helpers/pydev/tests_python/performance_check.py
rename to python/helpers/pydev/tests_pydevd_python/performance_check.py
diff --git a/python/helpers/pydev/tests_python/test_additional_thread_info.py b/python/helpers/pydev/tests_pydevd_python/test_additional_thread_info.py
similarity index 100%
rename from python/helpers/pydev/tests_python/test_additional_thread_info.py
rename to python/helpers/pydev/tests_pydevd_python/test_additional_thread_info.py
diff --git a/python/helpers/pydev/tests_python/test_debugger.py b/python/helpers/pydev/tests_pydevd_python/test_debugger.py
similarity index 100%
rename from python/helpers/pydev/tests_python/test_debugger.py
rename to python/helpers/pydev/tests_pydevd_python/test_debugger.py
diff --git a/python/helpers/pydev/tests_python/test_pydev_monkey.py b/python/helpers/pydev/tests_pydevd_python/test_pydev_monkey.py
similarity index 100%
rename from python/helpers/pydev/tests_python/test_pydev_monkey.py
rename to python/helpers/pydev/tests_pydevd_python/test_pydev_monkey.py
diff --git a/python/helpers/pydev/tests_python/test_save_locals.py b/python/helpers/pydev/tests_pydevd_python/test_save_locals.py
similarity index 100%
rename from python/helpers/pydev/tests_python/test_save_locals.py
rename to python/helpers/pydev/tests_pydevd_python/test_save_locals.py
diff --git a/python/helpers/pydev/tests_runfiles/not_in_default_pythonpath.txt b/python/helpers/pydev/tests_pydevd_runfiles/not_in_default_pythonpath.txt
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/not_in_default_pythonpath.txt
rename to python/helpers/pydev/tests_pydevd_runfiles/not_in_default_pythonpath.txt
diff --git a/python/helpers/pydev/tests_runfiles/samples/.cvsignore b/python/helpers/pydev/tests_pydevd_runfiles/samples/.cvsignore
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/.cvsignore
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/.cvsignore
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/.cvsignore b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/.cvsignore
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/.cvsignore
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/.cvsignore
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/__init__.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/__init__.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/__init__.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/.cvsignore b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/.cvsignore
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/.cvsignore
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/.cvsignore
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/__init__.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/__init__.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/__init__.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/deep_nest_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/deep_nest_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/deep_nest_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/deep_nest_test.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/non_test_file.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/non_test_file.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/non_test_file.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/non_test_file.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/.cvsignore b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/.cvsignore
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/.cvsignore
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/.cvsignore
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/__init__.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/__init__.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/__init__.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/__init__.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/junk.txt b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/junk.txt
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/junk.txt
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/junk.txt
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/non_test_file.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/non_test_file.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/non_test_file.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/non_test_file.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/non_test_file.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/non_test_file.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/non_test_file.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/non_test_file.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/simple4_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/simple4_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/simple4_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/simple4_test.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/non_test_file.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/non_test_file.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/non_test_file.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/non_test_file.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/not_in_default_pythonpath.txt b/python/helpers/pydev/tests_pydevd_runfiles/samples/not_in_default_pythonpath.txt
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/not_in_default_pythonpath.txt
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/not_in_default_pythonpath.txt
diff --git a/python/helpers/pydev/tests_runfiles/samples/simple2_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/simple2_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/simple2_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/simple2_test.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/simple3_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/simple3_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/simple3_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/simple3_test.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/simpleClass_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/simpleClass_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/simpleClass_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/simpleClass_test.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/simpleModule_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/simpleModule_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/simpleModule_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/simpleModule_test.py
diff --git a/python/helpers/pydev/tests_runfiles/samples/simple_test.py b/python/helpers/pydev/tests_pydevd_runfiles/samples/simple_test.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/samples/simple_test.py
rename to python/helpers/pydev/tests_pydevd_runfiles/samples/simple_test.py
diff --git a/python/helpers/pydev/tests_runfiles/test_pydevd_property.py b/python/helpers/pydev/tests_pydevd_runfiles/test_pydevd_property.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/test_pydevd_property.py
rename to python/helpers/pydev/tests_pydevd_runfiles/test_pydevd_property.py
diff --git a/python/helpers/pydev/tests_runfiles/test_pydevdio.py b/python/helpers/pydev/tests_pydevd_runfiles/test_pydevdio.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/test_pydevdio.py
rename to python/helpers/pydev/tests_pydevd_runfiles/test_pydevdio.py
diff --git a/python/helpers/pydev/tests_runfiles/test_runfiles.py b/python/helpers/pydev/tests_pydevd_runfiles/test_runfiles.py
similarity index 100%
rename from python/helpers/pydev/tests_runfiles/test_runfiles.py
rename to python/helpers/pydev/tests_pydevd_runfiles/test_runfiles.py