diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
index 19cb68d96..2a3837e51 100644
--- a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
+++ b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
@@ -471,27 +471,23 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
 							<artifactId>maven-clean-plugin</artifactId>
 							<configuration>
 								<filesets combine.children="append">
-									<fileset>
-										<directory>${basedir}/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
-									</fileset>
+									«FOR p : #[this, config.ideProject, config.uiProject, config.webProject]»
+										«IF p.enabled»
+											<fileset>
+												<directory>${basedir}/../«p.name»/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
+											</fileset>
+											«IF p instanceof TestedProjectDescriptor»
+												«IF p.testProject.enabled»
+													<fileset>
+														<directory>${basedir}/../«if(p.testProject.isInlined) p.name else p.testProject.name»/«Outlet.TEST_SRC_GEN.sourceFolder»/</directory>
+													</fileset>
+												«ENDIF»
+											«ENDIF»
+										«ENDIF»
+									«ENDFOR»
 									<fileset>
 										<directory>${basedir}/model/generated/</directory>
 									</fileset>
-									«IF config.ideProject.enabled»
-										<fileset>
-											<directory>${basedir}/../${project.artifactId}.ide/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
-										</fileset>
-									«ENDIF»
-									«IF config.uiProject.enabled»
-										<fileset>
-											<directory>${basedir}/../${project.artifactId}.ui/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
-										</fileset>
-									«ENDIF»
-									«IF config.webProject.enabled»
-										<fileset>
-											<directory>${basedir}/../${project.artifactId}.web/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
-										</fileset>
-									«ENDIF»
 								</filesets>
 							</configuration>
 						</plugin>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
index d4f33bf83..3f74a98f0 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml
@@ -62,20 +62,26 @@
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
-							<directory>${basedir}/src-gen/</directory>
+							<directory>${basedir}/../org.xtext.example.full/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.full.tests/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.full.ide/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.full.ui/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.full.ui.tests/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.full.web/src-gen/</directory>
 						</fileset>
 						<fileset>
 							<directory>${basedir}/model/generated/</directory>
 						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.ide/src-gen/</directory>
-						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.ui/src-gen/</directory>
-						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.web/src-gen/</directory>
-						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
index 7891ba03e..67f0f5328 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml
@@ -62,20 +62,26 @@
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
-							<directory>${basedir}/src-gen/</directory>
+							<directory>${basedir}/../org.xtext.example.mavenTycho/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.mavenTycho.tests/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.mavenTycho.ide/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.mavenTycho.ui/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.mavenTycho.ui.tests/src-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.mavenTycho.web/src-gen/</directory>
 						</fileset>
 						<fileset>
 							<directory>${basedir}/model/generated/</directory>
 						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.ide/src-gen/</directory>
-						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.ui/src-gen/</directory>
-						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.web/src-gen/</directory>
-						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>
diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml
index 82230669d..b1cbcbbfa 100644
--- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml
+++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven/pom.xml
@@ -62,17 +62,20 @@
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
-							<directory>${basedir}/src/main/xtext-gen/</directory>
+							<directory>${basedir}/../org.xtext.example.plainMaven/src/main/xtext-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.plainMaven/src/test/xtext-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.plainMaven.ide/src/main/xtext-gen/</directory>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../org.xtext.example.plainMaven.web/src/main/xtext-gen/</directory>
 						</fileset>
 						<fileset>
 							<directory>${basedir}/model/generated/</directory>
 						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.ide/src/main/xtext-gen/</directory>
-						</fileset>
-						<fileset>
-							<directory>${basedir}/../${project.artifactId}.web/src/main/xtext-gen/</directory>
-						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>