diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java
index cb53e45f9ff..05a85d7c12e 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java
@@ -210,7 +210,7 @@ public class CommentTests extends AST2BaseTest {
 	}
 	
 	// //comment
-	public void _testCommentLocation_bug186337() throws Exception{
+	public void testCommentLocation_bug186337() throws Exception{
 		StringBuffer code= getContents(1)[0];
 		IASTTranslationUnit tu = parse(code.toString(), ParserLanguage.CPP, false, true, true);
 		IASTComment[] comments = tu.getComments();
@@ -218,5 +218,12 @@ public class CommentTests extends AST2BaseTest {
 		assertEquals(1, comments.length);
 		assertNotNull(comments[0].getFileLocation());
 		assertNotNull(comments[0].getNodeLocations());
+
+		tu = parse(code.toString(), ParserLanguage.C, false, true, true);
+		comments = tu.getComments();
+		
+		assertEquals(1, comments.length);
+		assertNotNull(comments[0].getFileLocation());
+		assertNotNull(comments[0].getNodeLocations());
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
index f14d74d4af2..a1db07b6b08 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
@@ -3027,7 +3027,9 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
 
 	protected IASTComment createComment(IToken commentToken)
 			throws EndOfFileException {
-		return new ASTComment(commentToken);
+		ASTComment comment = new ASTComment(commentToken);
+		comment.setParent(translationUnit);
+		return comment;
 	}
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index 929c03625f1..60d77e8ecd6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -5596,6 +5596,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
 
 	protected IASTComment createComment(IToken commentToken)
 			throws EndOfFileException {
-		return new ASTComment(commentToken);
+		ASTComment comment = new ASTComment(commentToken);
+		comment.setParent(translationUnit);
+		return comment;
 	}
 }