diff --git a/releng/org.eclipse.ocl.releng.tycho/.launches/Test OCL CodeGen.launch b/releng/org.eclipse.ocl.releng.tycho/.launches/Test OCL CodeGen.launch
new file mode 100644
index 0000000..8012ed7
--- /dev/null
+++ b/releng/org.eclipse.ocl.releng.tycho/.launches/Test OCL CodeGen.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean test"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="branchTestsLatest"/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.ocl.codegen.tests}"/>
+</launchConfiguration>
diff --git a/releng/org.eclipse.ocl.releng.tycho/pom.xml b/releng/org.eclipse.ocl.releng.tycho/pom.xml
index 22577a5..b5bd5a0 100644
--- a/releng/org.eclipse.ocl.releng.tycho/pom.xml
+++ b/releng/org.eclipse.ocl.releng.tycho/pom.xml
@@ -175,21 +175,11 @@
             </extraRequirements>
           </dependency-resolution>
           <environments>
-            <!--environment>
-              <os>win32</os>
-              <ws>win32</ws>
-              <arch>x86</arch>
-            </environment-->
-            <environment>
+           <environment>
               <os>win32</os>
               <ws>win32</ws>
               <arch>x86_64</arch>
             </environment>
-            <!--environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>x86</arch>
-            </environment-->
             <environment>
               <os>linux</os>
               <ws>gtk</ws>
diff --git a/tests/org.eclipse.ocl.codegen.tests/.classpath b/tests/org.eclipse.ocl.codegen.tests/.classpath
new file mode 100644
index 0000000..eca7bdb
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.ocl.codegen.tests/.gitignore b/tests/org.eclipse.ocl.codegen.tests/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/tests/org.eclipse.ocl.codegen.tests/.project b/tests/org.eclipse.ocl.codegen.tests/.project
new file mode 100644
index 0000000..40c5b7d
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ocl.codegen.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/tests/org.eclipse.ocl.codegen.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ocl.codegen.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a265d48
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.ocl.codegen.tests;singleton:=true
+Bundle-Version: 6.12.0.qualifier
+Automatic-Module-Name: org.eclipse.ocl.codegen.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ocl.examples.xtext.tests
+Bundle-Vendor: %providerName
+Export-Package: org.eclipse.ocl.codegen.tests;x-internal:=true
diff --git a/tests/org.eclipse.ocl.codegen.tests/about.html b/tests/org.eclipse.ocl.codegen.tests/about.html
new file mode 100644
index 0000000..a22e307
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>February 15, 2011</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.ocl.codegen.tests/build.properties b/tests/org.eclipse.ocl.codegen.tests/build.properties
new file mode 100644
index 0000000..cdd2db7
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/tests/org.eclipse.ocl.codegen.tests/plugin.properties b/tests/org.eclipse.ocl.codegen.tests/plugin.properties
new file mode 100644
index 0000000..adb4885
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/plugin.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2018 Willink Transformations and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#
+# Contributors:
+#     E.D.Willink - initial API and implementation
+###############################################################################
+
+pluginName = OCL Legacy Platform Compatibility Tests
+providerName = Eclipse OCL
+
diff --git a/tests/org.eclipse.ocl.codegen.tests/pom.xml b/tests/org.eclipse.ocl.codegen.tests/pom.xml
new file mode 100644
index 0000000..0aceee7
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/pom.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2020 Willink Transformations and others.
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v2.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v20.html
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <!--prerequisites>
+    <maven>3.0</maven>
+  </prerequisites-->
+  <groupId>org.eclipse.ocl</groupId>
+  <artifactId>org.eclipse.ocl.codegen.tests</artifactId>
+  <version>6.12.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <licenses>
+    <license>
+      <name>Eclipse Public License v2.0</name>
+      <comments>
+        All rights reserved.
+
+        This program and the accompanying materials are made
+        available under the terms of the Eclipse Public License v2.0
+        which accompanies this distribution, and is available at
+        http://www.eclipse.org/legal/epl-v10.htm
+      </comments>
+    </license>
+  </licenses>
+  <properties>
+    <project.buildId>org.eclipse.ocl</project.buildId>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
+    <buildId>${buildType}${buildTimestamp}</buildId>
+    <targetRelease>unspecified</targetRelease>
+    <targetPlatform>targetPlatforms/unspecified</targetPlatform>
+
+    <tycho.scmUrl>scm:git:https://git.eclipse.org/c/ocl/org.eclipse.ocl.git</tycho.scmUrl>
+    <!--executionEnvironment>J2SE-1.5</executionEnvironment>
+    <source-java-version>1.5</source-java-version>
+    <target-java-version>${source-java-version}</target-java-version-->
+    <java-source-encoding>UTF-8</java-source-encoding>
+    <resource-encoding>UTF-8</resource-encoding>
+    <os-jvm-flags/>
+
+    <!-- plugin versions -->
+    <!-- cd to the releng/org.eclipse.ocl.releng.tycho folder then use 'mvn versions:display-plugin-updates' to check for the latest -->
+    <tycho-version>1.1.0</tycho-version>
+    <tycho-extras-version>${tycho-version}</tycho-extras-version>
+    <maven-resources-version>2.6</maven-resources-version>
+    <maven-compiler-version>3.1</maven-compiler-version>
+    <maven-clean-version>2.5</maven-clean-version>
+    <maven-surefire-version>2.17</maven-surefire-version>
+  </properties>
+
+  <build>
+    <!-- See Bug 526404 This enables maven-surefire-plugin to do standalone tests AND tycho-surefire-plugin to do plugin tests -->
+    <testOutputDirectory>${project.build.directory}/classes</testOutputDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <!--version>${tycho-version}</version-->
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <includePackedArtifacts>true</includePackedArtifacts>
+          <resolver>p2</resolver>
+          <executionEnvironment>JavaSE-1.8</executionEnvironment>
+          <target>
+            <artifact>
+              <groupId>org.eclipse.ocl</groupId>
+              <artifactId>org.eclipse.ocl.codegen.tests</artifactId>
+              <version>6.12.0-SNAPSHOT</version>
+              <classifier>targetPlatforms/${targetRelease}</classifier>
+            </artifact>
+          </target>
+          <dependency-resolution>
+            <extraRequirements>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.eclipse.jdt.annotation</id>
+                <versionRange>[2.0.0,3.0.0)</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+          <environments>
+            <environment>
+              <os>win32</os>
+              <ws>win32</ws>
+              <arch>x86_64</arch>
+            </environment>
+            <environment>
+              <os>linux</os>
+              <ws>gtk</ws>
+              <arch>x86_64</arch>
+            </environment>
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
+              <arch>x86_64</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>pivot</id>
+            <phase>test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <includes>
+                <include>**/CompatibilityCodegenTests.java</include>
+              </includes>
+              <argLine>-DtestNameSuffix="maven" -DtargetRelease=${targetRelease} -ea</argLine>
+              <reportsDirectory>${project.build.directory}/surefire-reports/${targetRelease}/standalone</reportsDirectory>
+              <workingDirectory>${project.build.directory}/test-reports</workingDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-maven-plugin</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>target-platform-configuration</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${maven-resources-version}</version>
+          <configuration>
+            <encoding>${resource-encoding}</encoding>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven-compiler-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${maven-clean-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven-surefire-version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.surefire</groupId>
+              <artifactId>surefire-junit4</artifactId>
+              <version>${maven-surefire-version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <profiles>
+    <profile>
+      <id>branchTestsLatest</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <buildType></buildType>
+        <targetRelease>branchTestsLatest</targetRelease>
+      </properties>
+    </profile>
+    <profile>
+      <id>masterLatest</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <buildType></buildType>
+        <targetRelease>masterLatest</targetRelease>
+      </properties>
+    </profile>
+    <profile>
+      <id>release</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <buildType></buildType>
+        <targetRelease>release</targetRelease>
+      </properties>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.ocl.codegen.tests/src/org/eclipse/ocl/codegen/tests/CompatibilityCodegenTests.java b/tests/org.eclipse.ocl.codegen.tests/src/org/eclipse/ocl/codegen/tests/CompatibilityCodegenTests.java
new file mode 100644
index 0000000..e9018df
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/src/org/eclipse/ocl/codegen/tests/CompatibilityCodegenTests.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ *     E.D.Willink - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ocl.codegen.tests;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.examples.pivot.tests.IteratorsTest4;
+
+public class CompatibilityCodegenTests extends org.eclipse.ocl.examples.test.xtext.AllEvaluationTests
+{
+	void dummy() {
+		@SuppressWarnings("unused")
+		@NonNull IteratorsTest4 x;
+	}
+}
diff --git a/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/branchTestsLatest.target b/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/branchTestsLatest.target
new file mode 100644
index 0000000..485cdd0
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/branchTestsLatest.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="Eclipse OCL Standalone Build Target Platform" sequenceNumber="16">
+<locations>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/releases/latest"/>
+    <repository location="https://download.eclipse.org/staging/2020-06"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.ocl.tests.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.ocl.examples.tests.feature.group" version="0.0.0"/>
+    <repository location="https://ci.eclipse.org/ocl/job/ocl-branch-tests/lastSuccessfulBuild/artifact/targetPlatform/"/>
+    <!--repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest"/-->
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="com.google.guava" version="0.0.0"/>
+    <unit id="com.google.inject" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/>
+  </location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/masterLatest.target b/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/masterLatest.target
new file mode 100644
index 0000000..4db3f0a
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/masterLatest.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="Eclipse OCL Standalone Build Target Platform" sequenceNumber="16">
+<locations>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/releases/latest"/>
+    <repository location="https://download.eclipse.org/staging/2020-06"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.ocl.tests.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.ocl.examples.tests.feature.group" version="0.0.0"/>
+    <repository location="https://ci.eclipse.org/ocl/job/ocl-master/lastSuccessfulBuild/artifact/targetPlatform/"/>
+    <!--repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest"/-->
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="com.google.guava" version="0.0.0"/>
+    <unit id="com.google.inject" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/>
+  </location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/release.target b/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/release.target
new file mode 100644
index 0000000..d3fca64
--- /dev/null
+++ b/tests/org.eclipse.ocl.codegen.tests/targetPlatforms/release.target
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="Eclipse OCL Standalone Build Target Platform" sequenceNumber="16">
+<locations>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/releases/latest"/>
+    <repository location="https://download.eclipse.org/staging/2020-06"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.ocl.master.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.ocl.tests.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.ocl.examples.tests.feature.group" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <unit id="com.google.guava" version="0.0.0"/>
+    <unit id="com.google.inject" version="0.0.0"/>
+    <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/>
+  </location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/tests/org.eclipse.ocl.standalone.ecore.tests/pom.xml b/tests/org.eclipse.ocl.standalone.ecore.tests/pom.xml
index d597376..c25a2fd 100644
--- a/tests/org.eclipse.ocl.standalone.ecore.tests/pom.xml
+++ b/tests/org.eclipse.ocl.standalone.ecore.tests/pom.xml
@@ -88,21 +88,11 @@
             <environment>
               <os>win32</os>
               <ws>win32</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</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>
diff --git a/tests/org.eclipse.ocl.standalone.pivot.tests/pom.xml b/tests/org.eclipse.ocl.standalone.pivot.tests/pom.xml
index f63bd5a..4927917 100644
--- a/tests/org.eclipse.ocl.standalone.pivot.tests/pom.xml
+++ b/tests/org.eclipse.ocl.standalone.pivot.tests/pom.xml
@@ -88,21 +88,11 @@
             <environment>
               <os>win32</os>
               <ws>win32</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</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>
diff --git a/tests/org.eclipse.ocl.standalone.uml.tests/pom.xml b/tests/org.eclipse.ocl.standalone.uml.tests/pom.xml
index 4b6569d..ed92588 100644
--- a/tests/org.eclipse.ocl.standalone.uml.tests/pom.xml
+++ b/tests/org.eclipse.ocl.standalone.uml.tests/pom.xml
@@ -88,21 +88,11 @@
             <environment>
               <os>win32</os>
               <ws>win32</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</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>