diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java
index fe995ae5789..eb8a7ec788e 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java
@@ -33,6 +33,9 @@ public class AutomatedIntegrationSuite extends TestSuite {
 		suite.addTestSuite(UPCC99DigraphTrigraphTests.class);
 		suite.addTestSuite(UPCC99GCCTests.class);
 		suite.addTestSuite(UPCC99UtilOldTests.class);
+		suite.addTestSuite(UPCC99UtilTests.class);
+		suite.addTestSuite(UPCC99CompleteParser2Tests.class);
+		suite.addTestSuite(UPCC99TaskParserTest.class);
 		
 		return suite;
 	}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java
new file mode 100644
index 00000000000..ac2577df7cc
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.c99.BaseExtensibleLanguage;
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.parser.c99.tests.C99CompleteParser2Tests;
+
+public class UPCC99CompleteParser2Tests extends C99CompleteParser2Tests {
+
+	protected BaseExtensibleLanguage getLanguage() {
+		return UPCLanguage.getDefault();
+	}
+
+}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java
index 5df62c990ad..829ed9c1bff 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java
@@ -16,19 +16,11 @@ import org.eclipse.cdt.core.parser.c99.tests.C99SelectionParseTest;
 
 public class UPCC99SelectionParseTest extends C99SelectionParseTest {
 
-	public UPCC99SelectionParseTest() {
-	}
-
-	public UPCC99SelectionParseTest(String name, Class className) {
-		super(name, className);
-	}
-
-	public UPCC99SelectionParseTest(String name) {
-		super(name);
-	}
+	public UPCC99SelectionParseTest() { }
+	public UPCC99SelectionParseTest(String name) { super(name); }
 
+	
 	protected BaseExtensibleLanguage getLanguage() {
 		return UPCLanguage.getDefault();
 	}
-
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java
new file mode 100644
index 00000000000..bce6d652516
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.c99.BaseExtensibleLanguage;
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.parser.c99.tests.C99TaskParserTest;
+
+public class UPCC99TaskParserTest extends C99TaskParserTest {
+
+	protected BaseExtensibleLanguage getLanguage() {
+		return UPCLanguage.getDefault();
+	}
+
+}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java
new file mode 100644
index 00000000000..ac174646d32
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.c99.BaseExtensibleLanguage;
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.parser.c99.tests.C99UtilTests;
+
+public class UPCC99UtilTests extends C99UtilTests {
+
+	protected BaseExtensibleLanguage getLanguage() {
+		return UPCLanguage.getDefault();
+	}
+
+}