diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java
index 684ef69fb85..a7f6122a14a 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java
@@ -50,7 +50,7 @@ public class CHeuristicScannerTest extends TestCase {
 	 */
 	protected void setUp() {
 		if (CCorePlugin.getDefault() != null) {
-			HashMap options= CCorePlugin.getDefaultOptions();
+			HashMap<String, String> options= CCorePlugin.getDefaultOptions();
 			options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.TAB);
 			options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
 
@@ -839,6 +839,5 @@ public class CHeuristicScannerTest extends TestCase {
     	
     	String indent= fScanner.computeIndentation(fDocument.getLength() - 8).toString();
     	Assert.assertEquals("					", indent);
-    	
     }
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java
index 04b8eff50ff..4b77c89ff8e 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java
@@ -96,7 +96,7 @@ public class CPartitionScanner extends RuleBasedPartitionScanner implements ICPa
 		IToken single_comment= new Token(C_SINGLE_LINE_COMMENT);
 		IToken string= new Token(C_STRING);
 		IToken character = new Token(C_CHARACTER);
-		List rules= new ArrayList();
+		List<IPredicateRule> rules= new ArrayList<IPredicateRule>();
 
 		// Minimize the number of rules, since we have duplicate rules 
 		// in the CCodeScanner...
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java
index 9a5fcc8120b..e79244eedcd 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java
@@ -55,7 +55,7 @@ public class TemplateFormatterTest extends BaseUITestCase {
 
 	private TemplateContextType fTemplateContextType;
 	private String fSelection;
-	private HashMap fDefaultOptions;
+	private HashMap<String, String> fDefaultOptions;
 
 	@Override
 	protected void setUp() throws Exception {
@@ -72,7 +72,7 @@ public class TemplateFormatterTest extends BaseUITestCase {
 	}
 	
 	private void setOption(String key, String value) {
-		HashMap options= new HashMap(1);
+		HashMap<String, String> options= new HashMap<String, String>(1);
 		options.put(key, value);
 		CCorePlugin.setOptions(options);
 	}