diff --git a/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScannerTokens.scala b/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScannerTokens.scala
index 604cf618af..6757c98c16 100644
--- a/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScannerTokens.scala
+++ b/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScannerTokens.scala
@@ -617,8 +617,7 @@ final class ScannerTokens(val tokens: Tokens)(implicit dialect: Dialect) {
             // !next.is[RightBrace] - braces can sometimes have -1 and we can start indent on }
             prev match {
               case _ if nextIndent < 0 || next.is[RightBrace] => None
-              case _ if prevToken.is[Indentation.Indent] => None
-              case _ if prevToken.is[Indentation.Outdent] => None
+              case _ if prevToken.is[Indentation] => None
               // if does not work with indentation in pattern matches
               case _: KwIf if sepRegions.headOption.contains(RegionArrow) => None
               case _: KwCatch | _: KwMatch =>
diff --git a/scalameta/tokens/shared/src/main/scala/scala/meta/tokens/Token.scala b/scalameta/tokens/shared/src/main/scala/scala/meta/tokens/Token.scala
index 3883ac0dd6..8989a791ce 100644
--- a/scalameta/tokens/shared/src/main/scala/scala/meta/tokens/Token.scala
+++ b/scalameta/tokens/shared/src/main/scala/scala/meta/tokens/Token.scala
@@ -150,9 +150,10 @@ object Token {
     @freeform("xml end") class End extends Token
   }
 
+  @branch trait Indentation extends Whitespace
   object Indentation {
-    @freeform("indent") class Indent extends Token
-    @freeform("outdent") class Outdent extends Token
+    @freeform("indent") class Indent extends Indentation
+    @freeform("outdent") class Outdent extends Indentation
   }
 
   // Trivia
diff --git a/tests/jvm/src/test/scala-2.13/scala/meta/tests/api/SurfaceSuite.scala b/tests/jvm/src/test/scala-2.13/scala/meta/tests/api/SurfaceSuite.scala
index f5b0664ab9..824dbd4453 100644
--- a/tests/jvm/src/test/scala-2.13/scala/meta/tests/api/SurfaceSuite.scala
+++ b/tests/jvm/src/test/scala-2.13/scala/meta/tests/api/SurfaceSuite.scala
@@ -163,7 +163,6 @@ class SurfaceSuite extends FunSuite {
       |scala.meta.tokenizers.Tokenized.Success *
       |scala.meta.tokens
       |scala.meta.tokens.Token
-      |scala.meta.tokens.Token.Indentation *
       |scala.meta.tokens.Token.Interpolation *
       |scala.meta.tokens.Token.Xml *
       |scala.meta.tokens.Tokens