diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java
index bae3b12d150..64cb7063c1f 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java
@@ -256,7 +256,7 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase {
 		private ICProject cproject;
 		private StringBuilder[] testData;
 		private IASTTranslationUnit ast;
-		private boolean cpp;
+		private final boolean cpp;
 
 		public SinglePDOMTestFirstASTStrategy(boolean cpp) {
 			this.cpp = cpp;
@@ -342,7 +342,7 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase {
 		private ICProject cproject;
 		private StringBuilder[] testData;
 		private IASTTranslationUnit ast;
-		private boolean cpp;
+		private final boolean cpp;
 
 		public SinglePDOMTestStrategy(boolean cpp) {
 			this.cpp = cpp;
@@ -392,7 +392,7 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase {
 			assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor()));
 			
 			if (DEBUG) {
-				System.out.println("Project PDOM: "+getName());
+				System.out.println("Project PDOM: " + getName());
 				((PDOM)CCoreInternals.getPDOMManager().getPDOM(cproject)).accept(new PDOMPrettyPrinter());
 			}
 
@@ -501,7 +501,7 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase {
 			assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor()));
 			
 			if (DEBUG) {
-				System.out.println("Project PDOM: "+getName());
+				System.out.println("Project PDOM: " + getName());
 				((PDOM) CCoreInternals.getPDOMManager().getPDOM(cproject)).accept(new PDOMPrettyPrinter());
 			}
 
@@ -539,7 +539,7 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase {
 		private ICProject cproject, referenced;
 		private StringBuilder[] testData;
 		private IASTTranslationUnit ast;
-		private boolean cpp;
+		private final boolean cpp;
 
 		public ReferencedProject(boolean cpp) {
 			this.cpp = cpp;
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java
index c5c02f85a9c..cbbe0aef074 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java
@@ -17,7 +17,6 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.eclipse.cdt.core.tests.BaseTestFramework;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IStatus;
@@ -25,10 +24,12 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.text.TextSelection;
 
+import org.eclipse.cdt.core.tests.BaseTestFramework;
+
 /**
  * @author Guido Zgraggen IFS
  */
-public abstract class RefactoringBaseTest extends BaseTestFramework implements ILogListener{
+public abstract class RefactoringBaseTest extends BaseTestFramework implements ILogListener {
 	protected static final NullProgressMonitor NULL_PROGRESS_MONITOR = new NullProgressMonitor();
 	
 	protected TreeMap<String, TestSourceFile> fileMap = new TreeMap<String, TestSourceFile>();
@@ -48,7 +49,6 @@ public abstract class RefactoringBaseTest extends BaseTestFramework implements I
 
 	@Override
 	protected abstract void runTest() throws Throwable;
-	
 
 	@Override
 	protected void setUp() throws Exception {
@@ -96,14 +96,14 @@ public abstract class RefactoringBaseTest extends BaseTestFramework implements I
 	@Override
 	public void logging(IStatus status, String plugin) {
 		Throwable ex = status.getException();
-		StringBuffer stackTrace = new StringBuffer();
-		if(ex != null) {
+		StringBuilder stackTrace = new StringBuilder();
+		if (ex != null) {
 			stackTrace.append('\n');
-			for(StackTraceElement ste : ex.getStackTrace()) {
+			for (StackTraceElement ste : ex.getStackTrace()) {
 				stackTrace.append(ste.toString());
 			}
 		}
-		fail("Log-Message: " + status.getMessage() + stackTrace.toString());		 //$NON-NLS-1$
+		fail("Log-Message: " + status.getMessage() + stackTrace.toString());  //$NON-NLS-1$
 	}
 
 	public void setFileWithSelection(String fileWithSelection) {