diff --git a/tests/org.eclipse.xtext.junit4.tests/org.eclipse.xtext.junit4.tests.launch b/tests/org.eclipse.xtext.junit4.tests/org.eclipse.xtext.junit4.tests.launch
index f768da6f9..9ee87d13c 100644
--- a/tests/org.eclipse.xtext.junit4.tests/org.eclipse.xtext.junit4.tests.launch
+++ b/tests/org.eclipse.xtext.junit4.tests/org.eclipse.xtext.junit4.tests.launch
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
 <booleanAttribute key="append.args" value="true"/>
 <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
@@ -13,7 +13,7 @@
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-${project_name}-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/org.eclipse.xtext.junit4.tests"/>
 </listAttribute>
diff --git a/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch b/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch
index c8c9dda83..6a54ac512 100644
--- a/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch
+++ b/tests/org.eclipse.xtext.tests/org.eclipse.xtext.tests.launch
@@ -12,7 +12,7 @@
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-${project_name}-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/org.eclipse.xtext.tests/src"/>
 </listAttribute>