diff --git a/org.eclipse.mat.product/mat.product b/org.eclipse.mat.product/mat.product
index 124d5c639..a5e228c6c 100644
--- a/org.eclipse.mat.product/mat.product
+++ b/org.eclipse.mat.product/mat.product
@@ -194,17 +194,16 @@ Contributors:
    </features>
 
    <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
 
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/>
-
-      <property name="osgi.requiredJavaVersion" value="1.8" />
       <property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default" />
+      <property name="osgi.requiredJavaVersion" value="1.8" />
       <property name="applicationCSSResources" value="platform:/plugin/org.eclipse.platform/images/" />
+      <property name="org.eclipse.update.reconcile" value="false" />
    </configurations>
 
 </product>
diff --git a/org.eclipse.mat.targetdef/mat-2020-03.target b/org.eclipse.mat.targetdef/mat-2020-03.target
new file mode 100644
index 000000000..fc57a1413
--- /dev/null
+++ b/org.eclipse.mat.targetdef/mat-2020-03.target
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+<target name="MAT 2020-03 Target" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.birt.chart.engine" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.device.extension" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.device.swt" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.engine.extension" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.help.feature.group" version="0.0.0"/>
+<unit id="org.junit" version="0.0.0"/>
+<unit id="org.eclipse.ui.themes" version="0.0.0"/>
+<unit id="org.eclipse.ui.net" version="0.0.0"/>
+<unit id="org.eclipse.platform" version="0.0.0"/>
+<unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
+<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2020-03"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="com.ibm.dtfj.feature.feature.group" version="0.0.0"/>
+<repository location="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/runtimes/tools/dtfj/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+</location>
+</locations>
+<implicitDependencies>
+<plugin id="org.eclipse.ui.views.log"/>
+<plugin id="org.eclipse.equinox.event"/>
+<plugin id="org.eclipse.equinox.ds"/>
+</implicitDependencies>
+</target>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index a8165bd69..49e4f4fd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -16,12 +16,12 @@
 	<name>MAT Parent</name>
 
 	<properties>
-		<tycho-version>1.3.0</tycho-version>
+		<tycho-version>1.7.0</tycho-version>
 		<signer-input-directory>/home/data/httpd/download-staging.priv/tools/mat</signer-input-directory>
 		<download-publish-path>/home/data/httpd/download.eclipse.org/mat/snapshots/update-site</download-publish-path>
 		<download-publish-rcp-path>/home/data/httpd/download.eclipse.org/mat/snapshots/rcp</download-publish-rcp-path>
 		<!-- mat-target specifies which .target definition file will be used -->
-		<mat-target>mat-photon</mat-target>
+		<mat-target>mat-2020-03</mat-target>
 		<!-- mat-release-repo-url specifies from which p2 repo the MAT bundles 
 			come, when the build-release profile is used -->
 		<mat-release-repo-url>http://download.eclipse.org/mat/latest/update-site/</mat-release-repo-url>
@@ -221,11 +221,6 @@
 				<configuration>
 					<resolver>p2</resolver>
 					<environments>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
@@ -236,21 +231,11 @@
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>ppc64</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
diff --git a/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml b/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml
index 6ac61d022..708d7066b 100644
--- a/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml
+++ b/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml
@@ -15,8 +15,9 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Xmx512m
-			-XX:MaxPermSize=256m</uitest.vmparams>
+		<!-- Please don't pretty-format the vmparams line -->
+		<!-- a new line in the vmparams caused issues with starting the tests, at least on Mac -->
+		<uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Xmx512m -XX:MaxPermSize=256m</uitest.vmparams>
 	</properties>
 
 	<profiles>