diff --git a/.project b/.project
index c6289ce77a2..175c44da63c 100644
--- a/.project
+++ b/.project
@@ -15,7 +15,7 @@
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|eclipse.platform.releng.tychoeclipsebuilder|oomph|products|scripts|sites)/.*</arguments>
+				<arguments>1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|oomph|products|scripts|sites)/.*</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile b/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile
index e1e38fa2da4..9ae40c9fcaa 100644
--- a/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile
+++ b/JenkinsJobs/AutomatedTests/integrationTests.jenkinsfile
@@ -56,8 +56,7 @@ pipeline {
 					[path: 'JenkinsJobs/buildConfigurations.json'],
 					[path: 'JenkinsJobs/shared/utilities.groovy'],
 					[path: 'scripts/releng'],
-					[path: 'eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles'],
-					
+					[path: 'scripts/testing'],
 				])])
 				script {
 					def buildConfigurations = readJSON(file: 'JenkinsJobs/buildConfigurations.json')
@@ -118,7 +117,7 @@ pipeline {
 										java \
 											-DxmlDirectory="${WORKSPACE}/${localResultsDirectory}/xml" \
 											-DtestsConfigExpected=${JOB_BASE_NAME} \
-											-DtestManifestFile="${WORKSPACE}/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml" \
+											-DtestManifestFile="${WORKSPACE}/scripts/testing/publishingFiles/testManifest.xml" \
 											TestResultsGenerator
 										popd
 										
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/.project b/eclipse.platform.releng.tychoeclipsebuilder/.project
deleted file mode 100644
index cf64e5c490a..00000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-  <name>org.eclipse.platform.releng.tychoeclipsebuilder</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-  </buildSpec>
-  <natures>
-  </natures>
-</projectDescription>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a..00000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a7..00000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/oomph/Platform.setup b/oomph/Platform.setup
index 4fe716c0803..500ecd894c3 100644
--- a/oomph/Platform.setup
+++ b/oomph/Platform.setup
@@ -737,7 +737,7 @@
             xsi:type="predicates:AndPredicate">
           <operand
               xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.platform.releng.tychoeclipsebuilder"/>
+              project="eclipse.platform.releng.aggregator"/>
           <operand
               xsi:type="workingsets:ExclusionPredicate"
               excludedWorkingSet="//'releng.aggregator.workingsets'/@workingSets[name='Platform%20Documentation'] //'releng.aggregator.workingsets'/@workingSets[name='Platform%20Releng'] //'releng.aggregator.workingsets'/@workingSets[name='Platform%20Releng%20Tests']"/>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/scripts/testing/publishingFiles/testManifest.xml
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
rename to scripts/testing/publishingFiles/testManifest.xml