diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
index 52ffc91fb51..1c71311173e 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
@@ -295,12 +295,18 @@ public class CModelTests extends TestCase {
 		testProject.accept(new ICElementVisitor() {
 			@Override
 			public boolean visit(ICElement element) throws CoreException {
+				if (".settings".equals(element.getElementName())) {
+					return false;
+				}
 				actual.add("visit " + element.getResource().getName());
 				return true;
 			}
 
 			@Override
 			public void leave(ICElement element) throws CoreException {
+				if (".settings".equals(element.getElementName())) {
+					return;
+				}
 				actual.add("leave " + element.getResource().getName());
 			}
 		});
@@ -335,6 +341,7 @@ public class CModelTests extends TestCase {
 			ISourceRoot sourceRoot = (ISourceRoot) cSourceRoots.get(0);
 
 			List<ICElement> cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
+			cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
 			assertEquals(1, cContainers.size());
 			assertEquals("test", cContainers.get(0).getElementName());
 
@@ -373,6 +380,7 @@ public class CModelTests extends TestCase {
 			sourceRoot = (ISourceRoot) cSourceRoots.get(0);
 
 			cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
+			cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
 			assertEquals(1, cContainers.size());
 			assertEquals("test", cContainers.get(0).getElementName());
 
@@ -421,6 +429,7 @@ public class CModelTests extends TestCase {
 			ISourceRoot sourceRoot = (ISourceRoot) cSourceRoots.get(0);
 
 			List<ICElement> cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
+			cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
 			assertEquals(1, cContainers.size());
 			assertEquals(subFolder.getName(), cContainers.get(0).getElementName());
 
@@ -456,6 +465,7 @@ public class CModelTests extends TestCase {
 			sourceRoot = (ISourceRoot) cSourceRoots.get(0);
 
 			cContainers = sourceRoot.getChildrenOfType(ICElement.C_CCONTAINER);
+			cContainers.removeIf(element -> ".settings".equals(element.getElementName()));
 			assertEquals(1, cContainers.size());
 			assertEquals(subFolder.getName(), cContainers.get(0).getElementName());
 
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
index cb051436426..ba66e60b3d4 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java
@@ -182,7 +182,9 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase {
 
 		ContentAssistResult r = invokeContentAssist(offset, length, isCompletion, isTemplate, filterResults);
 
-		String[] resultStrings = toStringArray(r.results, compareType);
+		List<String> resultStringList = new ArrayList<>(Arrays.asList(toStringArray(r.results, compareType)));
+		resultStringList.removeIf(string -> string != null && string.contains(".settings"));
+		String[] resultStrings = resultStringList.toArray(String[]::new);
 		if (!checkOrder) {
 			Arrays.sort(expected);
 			Arrays.sort(resultStrings);