diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
index 1f7f26443fa..110bbbcf47b 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
@@ -27,27 +27,19 @@ public class CompletionTest_MacroRef_NoPrefix  extends CompletionProposalsBaseTe
 	private final String headerFileFullPath ="resources/contentassist/" + headerFileName;
 	private final String expectedPrefix = ""; 
 	private final String[] expectedResults = {
-			// missing results:
-			"aMacro(x)",
-			"Debug",
-			"xMacro(x,y)"
-			/* superfluous results:
-			AStruct
-			XStruct
-			aClass
-			aNamespace
-			anEnumeration
-			anotherClass
-			xEnumeration
-			xNamespace
-			xOtherClass
-*/
+			"AMacro(x)",
+			"DEBUG",
+			"XMacro(x, y)",
+			"__DATE__",
+			"__FILE__",
+			"__LINE__",
+			"__TIME__"
 	};
 	
 	public CompletionTest_MacroRef_NoPrefix(String name) {
 		super(name);
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708
-		setExpectFailure(171708);
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=172158
+		setExpectFailure(172158);
 	}
 
 	public static Test suite() {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java
index e09a44baed4..6105923f054 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java
@@ -28,13 +28,13 @@ public class CompletionTest_MacroRef_Prefix  extends CompletionProposalsBaseTest
 	private final String expectedPrefix = "D"; 
 	private final String[] expectedResults = {
 			// missing result:
-			"Debug"
+			"DEBUG"
 	};
 	
 	public CompletionTest_MacroRef_Prefix(String name) {
 		super(name);
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708
-		setExpectFailure(171708);
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=172158
+		setExpectFailure(172158);
 	}
 
 	public static Test suite() {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java
index 2c048ea9e76..716277e77ca 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java
@@ -58,8 +58,8 @@ public class CompletionTest_SingleName_Method_NoPrefix  extends CompletionPropos
 	
 	public CompletionTest_SingleName_Method_NoPrefix(String name) {
 		super(name);
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860
-		setExpectFailure(169860);
+		// operators should not be proposed
+		setExpectFailure(77777);
 	}
 	
 	public static Test suite() {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java
index f16bfd56d44..377f795ff3c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java
@@ -31,7 +31,7 @@ public class CompletionTest_SingleName_NoPrefix  extends CompletionProposalsBase
 			"xVariable : int",
 			"aFunction(void) bool",
 			"anotherFunction(void) void",
-			"foo(int) void",
+			"foo(int x) void",
 			"xFunction(void) bool",
 			"xOtherFunction(void) void",
 			"aClass",
@@ -49,24 +49,12 @@ public class CompletionTest_SingleName_NoPrefix  extends CompletionProposalsBase
 			"xFirstEnum",
 			"xSecondEnum",
 			"xThirdEnum",
-			// missing:
-			"__cplusplus", 
-			"__DATE__",
-			"__FILE__",
-			"__LINE__",
-			"__STDC__",
-			"__STDC_HOSTED__",
-			"__STDC_VERSION__",
-			"__TIME__",
-			"AMacro(x)",
-			"DEBUG",
-			"XMacro(x,y)"
+			"y : int"
+			// note: macros are omitted intentionally
 	};
 	
 	public CompletionTest_SingleName_NoPrefix(String name) {
 		super(name);
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708
-		setExpectFailure(171708);
 	}
 	
 	public static Test suite() {