diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
index 3e88e6a3272..5399706d733 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
@@ -218,7 +218,7 @@ public class BaseUITestCase extends BaseTestCase {
 
 	final protected TreeItem checkTreeNode(Tree tree, int i0, String label) {
 		TreeItem root= null;
-		for (int i=0; i<200; i++) {
+		for (int i=0; i<400; i++) {
 			try {
 				root= tree.getItem(i0);
 				if (label.equals(root.getText())) {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java
index 2d37d844b27..3671301e77d 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java
@@ -294,8 +294,10 @@ public abstract class CPPSelectionTestsAnyIndexer extends BaseSelectionTestsInde
     // };
 	
 	// #include "testBug86829B.h"
+	// void testfunc() {
     // Y a;
     // int c = X(a); // OK: a.operator X().operator int()
+	// }
 	public void _testBug86829B() throws Exception {
         StringBuffer[] buffers= getContents(2);
         String hcode= buffers[0].toString();
@@ -591,9 +593,9 @@ public abstract class CPPSelectionTestsAnyIndexer extends BaseSelectionTestsInde
 	
 	// #include "testBug101287.h"
 	// int main(int argc, char **argv) {
-	//    abc
+	//    abc;
 	// }
-	public void _testBug101287() throws Exception {
+	public void testBug101287() throws Exception {
         StringBuffer[] buffers= getContents(2);
         String hcode= buffers[0].toString();
         String scode= buffers[1].toString();
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java
index 58817f0c3c5..20f84770caf 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java
@@ -284,9 +284,9 @@ public abstract class CSelectionTestsAnyIndexer extends BaseSelectionTestsIndexe
 	
 	// #include "testBug101287.h"
 	// int main(int argc, char **argv) {
-	//    abc
+	//    abc;
 	// }
-	public void _testBug101287() throws Exception {
+	public void testBug101287() throws Exception {
         StringBuffer[] buffers= getContents(2);
         String hcode= buffers[0].toString();
         String scode= buffers[1].toString();