diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 5fa8510509c..3008af7dfb2 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -902,6 +902,35 @@
https://download.eclipse.org/eclipse/updates/${releaseVersion}-Y-builds
+
+ skip-baseline-comparision-of-tests
+
+
+ packaging
+ eclipse-test-plugin
+
+
+
+
+
+ org.eclipse.tycho.extras
+ tycho-p2-extras-plugin
+ ${tycho.version}
+
+
+ compare-attached-artifacts-with-release
+
+ compare-version-with-baselines
+
+
+ true
+
+
+
+
+
+
+
eclipse-sign
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
index 3293c8c5597..4ed0ed4c8b2 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.test; singleton:=true
-Bundle-Version: 3.6.500.qualifier
+Bundle-Version: 3.6.600.qualifier
Eclipse-BundleShape: dir
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/build.properties b/eclipse.platform.releng/bundles/org.eclipse.test/build.properties
index 29cdac39ffd..fd0e0bfbb1d 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/build.properties
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/build.properties
@@ -20,5 +20,6 @@ bin.includes = .,\
src.includes = about.html
source.. = src/
-# Maven/Tycho pom model adjustments
+# Maven/Tycho POM adjustments
+pom.model.packaging = eclipse-plugin
pom.model.property.defaultSigning-excludeInnerJars = true
diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
index 7762d1a4f61..36df7d51e78 100644
--- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
@@ -2,7 +2,7 @@