 @@ -24,7 +25,10 @@ Require-Bundle: org.eclipse.ui,
   org.python.pydev.shared_ui,
   org.junit;bundle-version="4.0.0";resolution:=optional
- Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
 -Bundle-ClassPath: refactoring.jar
 +Bundle-ClassPath: refactoring.jar,
 + tests/lib/xpp3-1.1.3.4.O.jar,

+                         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/,\

--- 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
