diff --git a/build/birt-packages/birt-runtime-test/src/test/java/org/eclipse/birt/sdk/RuntimeOSGiTest.java b/build/birt-packages/birt-runtime-test/src/test/java/org/eclipse/birt/sdk/RuntimeOSGiTest.java
index d14926fb07..c75d4084d8 100644
--- a/build/birt-packages/birt-runtime-test/src/test/java/org/eclipse/birt/sdk/RuntimeOSGiTest.java
+++ b/build/birt-packages/birt-runtime-test/src/test/java/org/eclipse/birt/sdk/RuntimeOSGiTest.java
@@ -11,13 +11,14 @@
 package org.eclipse.birt.sdk;
 
 import java.io.File;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 @SuppressWarnings("javadoc")
-// TODO This works locally for me on Windows but fails on the Linux build machines.
-// One must first do a full Maven build for these artifacts to be available in the target folder.
-public abstract class RuntimeOSGiTest extends BaseTestTemplate {
+public class RuntimeOSGiTest extends BaseTestTemplate {
 	public int run(String[] args) throws Exception {
 		System.setProperty("BIRT_HOME",
 				new File("./target/birt-runtime-osgi/ReportEngine/platform/").getAbsolutePath());
@@ -26,7 +27,13 @@ public int run(String[] args) throws Exception {
 
 		// Start the Platform to start the Equinox framework.
 		Class<?> platformClass = loader.loadClass("org.eclipse.birt.core.framework.Platform"); //$NON-NLS-1$
-		platformClass.getMethod("startup").invoke(null);
+		MethodHandle startup = MethodHandles.publicLookup().findStatic(platformClass, "startup",
+				MethodType.methodType(void.class));
+		try {
+			startup.invoke();
+		} catch (Throwable e) {
+			throw new Exception(e);
+		}
 
 		// Get the launcher from the started Platform.
 		Field launcherField = platformClass.getDeclaredField("launcher");
diff --git a/build/org.eclipse.birt.api/build.xml b/build/org.eclipse.birt.api/build.xml
index fce9c6a5e3..fc93569c7e 100644
--- a/build/org.eclipse.birt.api/build.xml
+++ b/build/org.eclipse.birt.api/build.xml
@@ -85,7 +85,9 @@
 				<include name="org.eclipse.emf.common_*.jar" />
 				<include name="org.eclipse.emf.ecore.xmi_*.jar" />
 				<include name="org.eclipse.emf.ecore_*.jar" />
+				<!--
 				<include name="org.eclipse.equinox.common_*.jar" />
+				-->
 				<include name="org.w3c.css.sac_*.jar" />
 				<include name="com.ibm.icu_*.jar" />
 				<include name="javax*.jar" />