diff --git a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
index 482091de478ce2a22aaa4b9203fb6aeeacb97f47..35d965f4c6780bcca87d02042d1d857926d58b60 100644
--- a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
+++ b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
@@ -512,12 +512,34 @@ public class BuildTests extends TestCase {
 			System.out.println("relengTestsPropertiesFile does not exist");
 		}
 
-
-		String[] args = new String[]{qualifierArg, testToReferenceArg, referenceIDArg, referenceURLArg, listToReferenceFileArg};
+		ArrayList argsList = new ArrayList();
+		if (validValue(qualifierArg)) {
+			argsList.add(qualifierArg);
+		}
+		if (validValue(testToReferenceArg)) {
+			argsList.add(testToReferenceArg);
+		}
+		if (validValue(referenceIDArg)) {
+			argsList.add(referenceIDArg);
+		}
+		if (validValue(referenceURLArg)) {
+			argsList.add(referenceURLArg);
+		}
+		if (validValue(listToReferenceFileArg)) {
+			argsList.add(listToReferenceFileArg);
+		}
+		String[] args = (String[]) argsList.toArray(new String[]{});
 
 		return args;
 	}
 
+	private boolean validValue(String arg) {
+		if (arg != null)
+			return true;
+		return false;
+	}
+
+
 	/**
 	 * This method does not really test anything, be itself (yet) it just uses
 	 * a URL connection to access the internet just to make sure it is logged.