diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeProjectAnalyzer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeProjectAnalyzer.java
index c9751deafbd..d1e54445e80 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeProjectAnalyzer.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeProjectAnalyzer.java
@@ -37,7 +37,7 @@ public PdeProjectAnalyzer(IProject project, boolean includeTest) throws Exceptio
 			IJavaProject javaProject = JavaCore.create(project);
 			IClasspathEntry[] classpath = javaProject.getResolvedClasspath(true);
 			for (IClasspathEntry cp : classpath) {
-				if (cp.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+				if (cp.getEntryKind() == IClasspathEntry.CPE_LIBRARY && (includeTest || !cp.isTest())) {
 					IPath path = cp.getPath();
 					File file = path.toFile();
 					if (file != null && file.getName().endsWith(".jar") && !file.getName().equals("jrt-fs.jar") //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeTestProjectJar.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeTestProjectJar.java
index 394e8571229..d4e945332ba 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeTestProjectJar.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bnd/PdeTestProjectJar.java
@@ -38,7 +38,10 @@ public PdeTestProjectJar(IProject project) throws CoreException {
 			for (IClasspathEntry cp : classpath) {
 				if (cp.getEntryKind() == IClasspathEntry.CPE_SOURCE && cp.isTest()) {
 					IPath location = cp.getOutputLocation();
-					if (location != null) {
+					if (location == null) {
+						IPath defaultOutputLocation = javaProject.getOutputLocation();
+						FileResource.addResources(this, workspaceRoot.getFolder(defaultOutputLocation), null);
+					} else {
 						IFolder otherOutputFolder = workspaceRoot.getFolder(location);
 						FileResource.addResources(this, otherOutputFolder, null);
 					}