diff --git a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
index cb6c37c..0493024 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@
   org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.19.0,1.20.0)",
   org.eclipse.emf.ecp.common.ui;bundle-version="[1.19.0,1.20.0)",
   org.eclipse.emfforms.view.annotation.model;bundle-version="[1.19.0,1.20.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/typedElementBoundsControlService.xml,OSGI-INF/ecoreAttachmentStrategyProvider.xml,OSGI-INF/ecoreEObjectSelectionStrategyProvider.xml,OSGI-INF/ecoreOpenInNewContextStrategyProvider.xml,OSGI-INF/ecoreReferenceStrategyProvider.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index 913efb0..198920c 100644
--- a/releng/org.eclipse.emf.ecp.releng/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -56,19 +56,6 @@
 					<name>build-server</name>
 				</property>
 			</activation>
-			<build>
-				<plugins>
-					<!-- Configure build to use the jdk specified in manifest -->
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-compiler-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<configuration>
-							<useJDK>BREE</useJDK>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 	</profiles>
 
@@ -285,6 +272,7 @@
 				</executions>
 			</plugin>
 
+			<!-- Configure build to use the jdk specified in manifest -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
@@ -294,6 +282,7 @@
 					<logEnabled>true</logEnabled>
 					<logDirectory>${project.build.directory}/logfiles</logDirectory>
 					<log>xml</log>
+					<useJDK>BREE</useJDK>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
index 504dc2b..dfeea5d 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@
   org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
   org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.19.0,1.20.0)",
   org.objenesis;bundle-version="[1.0.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.default.tests
 Import-Package: org.osgi.framework;version="1.3.0"