 +                   tests_dltk_console/,\
 +                   tests_navigator/
  output.pydev.jar = bin/
+ bin.excludes = pysrc/__pycache__/,\
+                pysrc/*$py.class,\
 diff --git a/plugins/pom.xml b/plugins/pom.xml
-index fd6367d..a4ec154 100644
+index 5060896..ad4afea 100644
 --- a/plugins/pom.xml
 +++ b/plugins/pom.xml
 @@ -30,6 +30,7 @@

+                         tests/
 output.shared_core.jar = bin/
diff --git a/plugins/org.python.pydev/build.properties b/plugins/org.python.pydev/build.properties
index 707f797..e66e016 100644
--- a/plugins/org.python.pydev/build.properties
+++ b/plugins/org.python.pydev/build.properties
@@ -14,5 +14,9 @@ bin.includes = plugin.xml,\
 jars.compile.order = pydev.jar
 source.pydev.jar = src/,\
                    src_navigator/,\

                LICENSE.txt
+jars.compile.order = parser.jar
diff --git a/plugins/org.python.pydev.refactoring/.classpath b/plugins/org.python.pydev.refactoring/.classpath
index 125bfd7..d35ec53 100644
--- a/plugins/org.python.pydev.refactoring/.classpath
+++ b/plugins/org.python.pydev.refactoring/.classpath
@@ -5,9 +5,9 @@
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar"/>
-	<classpathentry kind="lib" path="tests/lib/xpp3-1.1.3.4.O.jar"/>
