 +	<classpathentry exported="true" kind="lib" path="tests/lib/xpp3-1.1.3.4.O.jar"/>
 +	<classpathentry exported="true" kind="lib" path="tests/lib/xstream-1.4.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
 diff --git a/plugins/org.python.pydev.refactoring/META-INF/MANIFEST.MF b/plugins/org.python.pydev.refactoring/META-INF/MANIFEST.MF
-index 1b13cf8..4e90237 100644
+index 962dd7c..e08dff3 100644
 --- a/plugins/org.python.pydev.refactoring/META-INF/MANIFEST.MF
 +++ b/plugins/org.python.pydev.refactoring/META-INF/MANIFEST.MF
 @@ -7,7 +7,8 @@ Bundle-Activator: org.python.pydev.refactoring.PepticPlugin

                LICENSE.txt
+jars.compile.order = parser.jar
diff --git a/plugins/org.python.pydev.refactoring/.classpath b/plugins/org.python.pydev.refactoring/.classpath
index 3fdd9f4..8fe147d 100644
--- a/plugins/org.python.pydev.refactoring/.classpath
+++ b/plugins/org.python.pydev.refactoring/.classpath
@@ -5,8 +5,8 @@
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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"/>

--- a/plugins/org.python.pydev.customizations/build.properties
+++ b/plugins/org.python.pydev.customizations/build.properties
@@ -5,5 +5,6 @@ bin.includes = plugin.xml,\
                icons/,\
                LICENSE.txt
 jars.compile.order = customizations.jar
-source.customizations.jar = src/
+source.customizations.jar = src/,\
+                            tests/
 output.customizations.jar = bin/
diff --git a/plugins/org.python.pydev.debug/build.properties b/plugins/org.python.pydev.debug/build.properties
index bf4b9f0..59fce78 100644
--- a/plugins/org.python.pydev.debug/build.properties
