diff --git a/clang/unittests/Tooling/Syntax/TreeTest.cpp b/clang/unittests/Tooling/Syntax/TreeTest.cpp
--- a/clang/unittests/Tooling/Syntax/TreeTest.cpp
+++ b/clang/unittests/Tooling/Syntax/TreeTest.cpp
@@ -308,45 +308,45 @@
 }
 )cpp",
       R"txt(
-*: TranslationUnit
+TranslationUnit Detached
 `-SimpleDeclaration
-  |-int
-  |-SimpleDeclarator
-  | |-main
+  |-'int'
+  |-SimpleDeclarator SimpleDeclaration_declarator
+  | |-'main'
   | `-ParametersAndQualifiers
-  |   |-(
-  |   `-)
+  |   |-'(' OpenParen
+  |   `-')' CloseParen
   `-CompoundStatement
-    |-{
-    |-IfStatement
-    | |-if
-    | |-(
+    |-'{' OpenParen
+    |-IfStatement CompoundStatement_statement
+    | |-'if' IntroducerKeyword
+    | |-'('
     | |-IntegerLiteralExpression
-    | | `-1
-    | |-)
-    | `-CompoundStatement
-    |   |-{
-    |   `-}
-    |-IfStatement
-    | |-if
-    | |-(
+    | | `-'1' LiteralToken
+    | |-')'
+    | `-CompoundStatement IfStatement_thenStatement
+    |   |-'{' OpenParen
+    |   `-'}' CloseParen
+    |-IfStatement CompoundStatement_statement
+    | |-'if' IntroducerKeyword
+    | |-'('
     | |-IntegerLiteralExpression
-    | | `-1
-    | |-)
-    | |-CompoundStatement
-    | | |-{
-    | | `-}
-    | |-else
-    | `-IfStatement
-    |   |-if
-    |   |-(
+    | | `-'1' LiteralToken
+    | |-')'
+    | |-CompoundStatement IfStatement_thenStatement
+    | | |-'{' OpenParen
+    | | `-'}' CloseParen
+    | |-'else' IfStatement_elseKeyword
+    | `-IfStatement IfStatement_elseStatement
+    |   |-'if' IntroducerKeyword
+    |   |-'('
     |   |-IntegerLiteralExpression
-    |   | `-0
-    |   |-)
-    |   `-CompoundStatement
-    |     |-{
-    |     `-}
-    `-}
+    |   | `-'0' LiteralToken
+    |   |-')'
+    |   `-CompoundStatement IfStatement_thenStatement
+    |     |-'{' OpenParen
+    |     `-'}' CloseParen
+    `-'}' CloseParen
 )txt"));
 }