diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/NodeModelTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/NodeModelTest.java
index 877f71eb1..d198ea0b3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/NodeModelTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/NodeModelTest.java
@@ -61,18 +61,6 @@ public class NodeModelTest extends AbstractGeneratorTest {
 				LeafNode leafNode = (LeafNode) next;
 				EObject grammarElement = leafNode.getGrammarElement();
 				assertNotNull(grammarElement);
-//TODO is this test obsolete since we've removed the tokenType feature?
-				//				if (grammarElement instanceof Keyword) {
-//					assertEquals(ITokenTypes.KEYWORD, tokenType);
-//				} else if (GrammarUtil.isWhitespaceLexerRule(grammarElement)) {
-//					assertEquals(ITokenTypes.WHITESPACE, tokenType);
-//				} else if (GrammarUtil.isLexerRuleCall(grammarElement)) {
-//					assertEquals(((LexerRule) GrammarUtil
-//							.calledRule((RuleCall) grammarElement))
-//							.getTokenType(), tokenType);
-//				} else {
-//					fail("LeafNodes must correspond to keywords, whitespaces or lexerRules "+grammarElement);
-//				}
 			}
 		}
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java
index 4d20cdfed..cffffae55 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java
@@ -9,6 +9,8 @@
 package org.eclipse.xtext.parsetree.reconstr;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.RuleCall;
+import org.eclipse.xtext.parsetree.CompositeNode;
 import org.eclipse.xtext.parsetree.IParseTreeConstructor;
 import org.eclipse.xtext.parsetree.NodeUtil;
 import org.eclipse.xtext.tests.AbstractGeneratorTest;
@@ -38,4 +40,12 @@ public class ComplexReconstrTest extends AbstractGeneratorTest {
 		String resultString = NodeUtil.getRootNode(result).serialize();
 		return resultString;
 	}
+	
+//	public void testNormalizableCompositeNodesIncluded() throws Exception {
+//		EObject model = getModel("a");
+//		IParseTreeConstructor con = getParseTreeConstructor();
+//		con.update(model);
+//		CompositeNode node = NodeUtil.getRootNode(model);
+//		assertEquals("Op",((RuleCall)node.getGrammarElement()).getName());
+//	}
 }