diff --git a/packages/babel-generator/src/generators/modules.ts b/packages/babel-generator/src/generators/modules.ts
index abffa0c1a1fc..33b754920382 100644
--- a/packages/babel-generator/src/generators/modules.ts
+++ b/packages/babel-generator/src/generators/modules.ts
@@ -186,6 +186,7 @@ export function ExportDefaultDeclaration(
   }
 
   this.word("export");
+  this.printInnerComments(node);
   this.space();
   this.word("default");
   this.space();
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-after-export/input.js b/packages/babel-generator/test/fixtures/comments/decorators-after-export/input.js
new file mode 100644
index 000000000000..1f389f07c313
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-after-export/input.js
@@ -0,0 +1,5 @@
+/* 1 */ export /* 2 */ @dec1 /* 3 */ @dec2
+/* 4 */ class /* 5 */ C /* 6 */ { /* 7 */ } /* 8 */
+
+/* A */ export /* B */ default /* C */ @dec1 /* D */ @dec2
+/* E */ class /* F */ { /* G */ } /* H */
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-after-export/options.json b/packages/babel-generator/test/fixtures/comments/decorators-after-export/options.json
new file mode 100644
index 000000000000..7ebfdd91777b
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-after-export/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["decorators", { "decoratorsBeforeExport": false }]],
+  "decoratorsBeforeExport": false
+}
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-after-export/output.js b/packages/babel-generator/test/fixtures/comments/decorators-after-export/output.js
new file mode 100644
index 000000000000..f10c90922bd6
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-after-export/output.js
@@ -0,0 +1,9 @@
+/* 1 */export /* 2 */@dec1
+/* 3 */@dec2
+/* 4 */class /* 5 */C /* 6 */ {/* 7 */} /* 8 */
+
+/* A */
+export /* B */
+default /* C */@dec1
+/* D */@dec2
+/* E */class /* F */{/* G */} /* H */
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-before-export/input.js b/packages/babel-generator/test/fixtures/comments/decorators-before-export/input.js
new file mode 100644
index 000000000000..83739b654ed7
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-before-export/input.js
@@ -0,0 +1,5 @@
+/* 1 */ @dec1 /* 2 */ @dec2 /* 3 */
+export /* 4 */ class /* 5 */ C /* 6 */ { /* 7 */ } /* 8 */
+
+/* A */ @dec1 /* B */ @dec2 /* C */
+export /* D */ default /* E */ class /* F */ { /* G */ } /* H */
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-before-export/options.json b/packages/babel-generator/test/fixtures/comments/decorators-before-export/options.json
new file mode 100644
index 000000000000..f82968d9ccb5
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-before-export/options.json
@@ -0,0 +1,5 @@
+{
+  "BABEL_8_BREAKING": false,
+  "plugins": [["decorators", { "decoratorsBeforeExport": true }]],
+  "decoratorsBeforeExport": true
+}
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-before-export/output.js b/packages/babel-generator/test/fixtures/comments/decorators-before-export/output.js
new file mode 100644
index 000000000000..eded9751d133
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-before-export/output.js
@@ -0,0 +1,9 @@
+/* 1 */@dec1
+/* 2 */@dec2
+/* 3 */export /* 4 */class /* 5 */C /* 6 */ {/* 7 */} /* 8 */
+
+/* A */
+@dec1
+/* B */@dec2
+/* C */export
+  /* D */ default /* E */class /* F */{/* G */} /* H */
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/input.js b/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/input.js
new file mode 100644
index 000000000000..83739b654ed7
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/input.js
@@ -0,0 +1,5 @@
+/* 1 */ @dec1 /* 2 */ @dec2 /* 3 */
+export /* 4 */ class /* 5 */ C /* 6 */ { /* 7 */ } /* 8 */
+
+/* A */ @dec1 /* B */ @dec2 /* C */
+export /* D */ default /* E */ class /* F */ { /* G */ } /* H */
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/options.json b/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/options.json
new file mode 100644
index 000000000000..eb02a2a23e19
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/options.json
@@ -0,0 +1,5 @@
+{
+  "BABEL_8_BREAKING": false,
+  "plugins": ["decorators-legacy"],
+  "decoratorsBeforeExport": true
+}
diff --git a/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/output.js b/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/output.js
new file mode 100644
index 000000000000..eded9751d133
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/decorators-legacy-before-export/output.js
@@ -0,0 +1,9 @@
+/* 1 */@dec1
+/* 2 */@dec2
+/* 3 */export /* 4 */class /* 5 */C /* 6 */ {/* 7 */} /* 8 */
+
+/* A */
+@dec1
+/* B */@dec2
+/* C */export
+  /* D */ default /* E */class /* F */{/* G */} /* H */
\ No newline at end of file
diff --git a/packages/babel-parser/src/parser/expression.ts b/packages/babel-parser/src/parser/expression.ts
index 3f6ea34b224a..426e28b1b9d3 100644
--- a/packages/babel-parser/src/parser/expression.ts
+++ b/packages/babel-parser/src/parser/expression.ts
@@ -100,7 +100,6 @@ export default abstract class ExpressionParser extends LValParser {
     node: N.Function,
     allowModifiers?: boolean,
   ): void;
-  abstract takeDecorators(node: N.HasDecorators): void;
   abstract parseBlockOrModuleBlockBody(
     body: N.Statement[],
     directives: N.Directive[] | null | undefined,
@@ -1102,6 +1101,7 @@ export default abstract class ExpressionParser extends LValParser {
     refExpressionErrors?: ExpressionErrors | null,
   ): N.Expression {
     let node;
+    let decorators: N.Decorator[] | null = null;
 
     const { type } = this.state;
     switch (type) {
@@ -1198,12 +1198,13 @@ export default abstract class ExpressionParser extends LValParser {
         return this.parseFunctionOrFunctionSent();
 
       case tt.at:
-        this.parseDecorators();
+        decorators = this.parseDecorators();
       // fall through
       case tt._class:
-        node = this.startNode<N.Class>();
-        this.takeDecorators(node);
-        return this.parseClass(node, false);
+        return this.parseClass(
+          this.maybeTakeDecorators(decorators, this.startNode()),
+          false,
+        );
 
       case tt._new:
         return this.parseNewOrNewTarget();
diff --git a/packages/babel-parser/src/parser/statement.ts b/packages/babel-parser/src/parser/statement.ts
index 56481df9aae0..8fe7f45e423f 100644
--- a/packages/babel-parser/src/parser/statement.ts
+++ b/packages/babel-parser/src/parser/statement.ts
@@ -340,16 +340,19 @@ export default abstract class StatementParser extends ExpressionParser {
     context?: string | null,
     topLevel?: boolean,
   ): N.Statement {
+    let decorators: N.Decorator[] | null = null;
+
     if (this.match(tt.at)) {
-      this.parseDecorators(true);
+      decorators = this.parseDecorators(true);
     }
-    return this.parseStatementContent(context, topLevel);
+    return this.parseStatementContent(context, topLevel, decorators);
   }
 
   parseStatementContent(
     this: Parser,
     context?: string | null,
     topLevel?: boolean | null,
+    decorators?: N.Decorator[] | null,
   ): N.Statement {
     let starttype = this.state.type;
     const node = this.startNode();
@@ -392,7 +395,13 @@ export default abstract class StatementParser extends ExpressionParser {
 
       case tt._class:
         if (context) this.unexpected();
-        return this.parseClass(node as Undone<N.ClassDeclaration>, true);
+        return this.parseClass(
+          this.maybeTakeDecorators(
+            decorators,
+            node as Undone<N.ClassDeclaration>,
+          ),
+          true,
+        );
 
       case tt._if:
         return this.parseIfStatement(node as Undone<N.IfStatement>);
@@ -462,6 +471,7 @@ export default abstract class StatementParser extends ExpressionParser {
               | N.ExportDefaultDeclaration
               | N.ExportDefaultDeclaration
             >,
+            decorators,
           );
 
           if (
@@ -521,6 +531,7 @@ export default abstract class StatementParser extends ExpressionParser {
       return this.parseExpressionStatement(
         node as Undone<N.ExpressionStatement>,
         expr,
+        decorators,
       );
     }
   }
@@ -531,37 +542,49 @@ export default abstract class StatementParser extends ExpressionParser {
     }
   }
 
-  takeDecorators(node: N.HasDecorators): void {
-    const decorators =
-      this.state.decoratorStack[this.state.decoratorStack.length - 1];
-    if (decorators.length) {
-      node.decorators = decorators;
-      this.resetStartLocationFromNode(node, decorators[0]);
-      this.state.decoratorStack[this.state.decoratorStack.length - 1] = [];
+  decoratorsEnabledBeforeExport(): boolean {
+    if (this.hasPlugin("decorators-legacy")) return true;
+    return (
+      this.hasPlugin("decorators") &&
+      !!this.getPluginOption("decorators", "decoratorsBeforeExport")
+    );
+  }
+
+  // Attach the decorators to the given class.
+  // NOTE: This method changes the .start location of the class, and thus
+  // can affect comment attachment. Calling it before or after finalizing
+  // the class node (and thus finalizing its comments) changes how comments
+  // before the `class` keyword or before the final .start location of the
+  // class are attached.
+  maybeTakeDecorators<T extends Undone<N.Class>>(
+    maybeDecorators: N.Decorator[] | null,
+    classNode: T,
+    exportNode?: Undone<N.ExportDefaultDeclaration | N.ExportNamedDeclaration>,
+  ): T {
+    if (maybeDecorators) {
+      classNode.decorators = maybeDecorators;
+      this.resetStartLocationFromNode(classNode, maybeDecorators[0]);
+      if (exportNode) this.resetStartLocationFromNode(exportNode, classNode);
     }
+    return classNode;
   }
 
   canHaveLeadingDecorator(): boolean {
     return this.match(tt._class);
   }
 
-  parseDecorators(this: Parser, allowExport?: boolean): void {
-    const currentContextDecorators =
-      this.state.decoratorStack[this.state.decoratorStack.length - 1];
-    while (this.match(tt.at)) {
-      const decorator = this.parseDecorator();
-      currentContextDecorators.push(decorator);
-    }
+  parseDecorators(this: Parser, allowExport?: boolean): N.Decorator[] {
+    const decorators = [];
+    do {
+      decorators.push(this.parseDecorator());
+    } while (this.match(tt.at));
 
     if (this.match(tt._export)) {
       if (!allowExport) {
         this.unexpected();
       }
 
-      if (
-        this.hasPlugin("decorators") &&
-        !this.getPluginOption("decorators", "decoratorsBeforeExport")
-      ) {
+      if (!this.decoratorsEnabledBeforeExport()) {
         this.raise(Errors.DecoratorExportClass, { at: this.state.startLoc });
       }
     } else if (!this.canHaveLeadingDecorator()) {
@@ -569,6 +592,8 @@ export default abstract class StatementParser extends ExpressionParser {
         at: this.state.startLoc,
       });
     }
+
+    return decorators;
   }
 
   parseDecorator(this: Parser): N.Decorator {
@@ -578,10 +603,6 @@ export default abstract class StatementParser extends ExpressionParser {
     this.next();
 
     if (this.hasPlugin("decorators")) {
-      // Every time a decorator class expression is evaluated, a new empty array is pushed onto the stack
-      // So that the decorators of any nested class expressions will be dealt with separately
-      this.state.decoratorStack.push([]);
-
       const startLoc = this.state.startLoc;
       let expr: N.Expression;
 
@@ -624,8 +645,6 @@ export default abstract class StatementParser extends ExpressionParser {
 
         node.expression = this.parseMaybeDecoratorArguments(expr);
       }
-
-      this.state.decoratorStack.pop();
     } else {
       node.expression = this.parseExprSubscripts();
     }
@@ -1102,6 +1121,8 @@ export default abstract class StatementParser extends ExpressionParser {
   parseExpressionStatement(
     node: Undone<N.ExpressionStatement>,
     expr: N.Expression,
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars -- used in TypeScript parser */
+    decorators: N.Decorator[] | null,
   ) {
     node.expression = expr;
     this.semicolon();
@@ -1480,8 +1501,7 @@ export default abstract class StatementParser extends ExpressionParser {
     isStatement: /* T === ClassDeclaration */ boolean,
     optionalId?: boolean,
   ): T {
-    this.next();
-    this.takeDecorators(node);
+    this.next(); // 'class'
 
     // A class definition is always strict mode code.
     const oldStrict = this.state.strict;
@@ -2110,6 +2130,7 @@ export default abstract class StatementParser extends ExpressionParser {
       | N.ExportAllDeclaration
       | N.ExportNamedDeclaration
     >,
+    decorators: N.Decorator[] | null,
   ): N.AnyExport {
     const hasDefault = this.maybeParseExportDefaultSpecifier(
       // @ts-expect-error todo(flow->ts)
@@ -2134,6 +2155,9 @@ export default abstract class StatementParser extends ExpressionParser {
 
     if (hasStar && !hasNamespace) {
       if (hasDefault) this.unexpected();
+      if (decorators) {
+        throw this.raise(Errors.UnsupportedDecoratorExport, { at: node });
+      }
       this.parseExportFrom(node as Undone<N.ExportNamedDeclaration>, true);
 
       return this.finishNode(node, "ExportAllDeclaration");
@@ -2154,6 +2178,9 @@ export default abstract class StatementParser extends ExpressionParser {
     let hasDeclaration;
     if (isFromRequired || hasSpecifiers) {
       hasDeclaration = false;
+      if (decorators) {
+        throw this.raise(Errors.UnsupportedDecoratorExport, { at: node });
+      }
       this.parseExportFrom(
         node as Undone<N.ExportNamedDeclaration>,
         isFromRequired,
@@ -2165,22 +2192,31 @@ export default abstract class StatementParser extends ExpressionParser {
     }
 
     if (isFromRequired || hasSpecifiers || hasDeclaration) {
-      this.checkExport(
-        node as Undone<N.ExportNamedDeclaration>,
-        true,
-        false,
-        !!(node as Undone<N.ExportNamedDeclaration>).source,
-      );
-      return this.finishNode(node, "ExportNamedDeclaration");
+      const node2 = node as Undone<N.ExportNamedDeclaration>;
+      this.checkExport(node2, true, false, !!node2.source);
+      if (node2.declaration?.type === "ClassDeclaration") {
+        this.maybeTakeDecorators(decorators, node2.declaration, node2);
+      } else if (decorators) {
+        throw this.raise(Errors.UnsupportedDecoratorExport, { at: node });
+      }
+      return this.finishNode(node2, "ExportNamedDeclaration");
     }
 
     if (this.eat(tt._default)) {
+      const node2 = node as Undone<N.ExportDefaultDeclaration>;
       // export default ...
-      (node as Undone<N.ExportDefaultDeclaration>).declaration =
-        this.parseExportDefaultExpression();
-      this.checkExport(node as Undone<N.ExportDefaultDeclaration>, true, true);
+      const decl = this.parseExportDefaultExpression();
+      node2.declaration = decl;
 
-      return this.finishNode(node, "ExportDefaultDeclaration");
+      if (decl.type === "ClassDeclaration") {
+        this.maybeTakeDecorators(decorators, decl as N.ClassDeclaration, node2);
+      } else if (decorators) {
+        throw this.raise(Errors.UnsupportedDecoratorExport, { at: node });
+      }
+
+      this.checkExport(node2, true, true);
+
+      return this.finishNode(node2, "ExportDefaultDeclaration");
     }
 
     throw this.unexpected(null, tt.braceL);
@@ -2291,8 +2327,14 @@ export default abstract class StatementParser extends ExpressionParser {
       ) {
         this.raise(Errors.DecoratorBeforeExport, { at: this.state.startLoc });
       }
-      this.parseDecorators(false);
-      return this.parseClass(expr as Undone<N.ClassExpression>, true, true);
+      return this.parseClass(
+        this.maybeTakeDecorators(
+          this.parseDecorators(false),
+          this.startNode<N.ClassDeclaration>(),
+        ),
+        true,
+        true,
+      );
     }
 
     if (this.match(tt._const) || this.match(tt._var) || this.isLet()) {
@@ -2311,6 +2353,14 @@ export default abstract class StatementParser extends ExpressionParser {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     node: Undone<N.ExportNamedDeclaration>,
   ): N.Declaration | undefined | null {
+    if (this.match(tt._class)) {
+      const node = this.parseClass(
+        this.startNode<N.ClassDeclaration>(),
+        true,
+        false,
+      );
+      return node;
+    }
     return this.parseStatement(null) as N.Declaration;
   }
 
@@ -2474,14 +2524,6 @@ export default abstract class StatementParser extends ExpressionParser {
         }
       }
     }
-
-    const currentContextDecorators =
-      this.state.decoratorStack[this.state.decoratorStack.length - 1];
-    // If node.declaration is a class, it will take all decorators in the current context.
-    // Thus we should throw if we see non-empty decorators here.
-    if (currentContextDecorators.length) {
-      throw this.raise(Errors.UnsupportedDecoratorExport, { at: node });
-    }
   }
 
   checkDeclaration(node: N.Pattern | N.ObjectProperty): void {
diff --git a/packages/babel-parser/src/plugins/estree.ts b/packages/babel-parser/src/plugins/estree.ts
index 0e0c2fb1f8bb..6a1797fc29f5 100644
--- a/packages/babel-parser/src/plugins/estree.ts
+++ b/packages/babel-parser/src/plugins/estree.ts
@@ -451,8 +451,11 @@ export default (superClass: typeof Parser) =>
       super.toReferencedArguments(node);
     }
 
-    parseExport(unfinished: Undone<N.AnyExport>) {
-      const node = super.parseExport(unfinished);
+    parseExport(
+      unfinished: Undone<N.AnyExport>,
+      decorators: N.Decorator[] | null,
+    ) {
+      const node = super.parseExport(unfinished, decorators);
 
       switch (node.type) {
         case "ExportAllDeclaration":
diff --git a/packages/babel-parser/src/plugins/flow/index.ts b/packages/babel-parser/src/plugins/flow/index.ts
index 62fd136c83ef..7cc0a5afb648 100644
--- a/packages/babel-parser/src/plugins/flow/index.ts
+++ b/packages/babel-parser/src/plugins/flow/index.ts
@@ -637,6 +637,7 @@ export default (superClass: typeof Parser) =>
         ) {
           node = this.parseExport(
             node as Undone<N.ExportNamedDeclaration | N.ExportAllDeclaration>,
+            /* decorators */ null,
           );
           if (node.type === "ExportNamedDeclaration") {
             node.type = "ExportDeclaration";
@@ -1955,6 +1956,7 @@ export default (superClass: typeof Parser) =>
     parseExpressionStatement(
       node: N.ExpressionStatement,
       expr: N.Expression,
+      decorators: N.Decorator[] | null,
     ): N.ExpressionStatement {
       if (expr.type === "Identifier") {
         if (expr.name === "declare") {
@@ -1982,7 +1984,7 @@ export default (superClass: typeof Parser) =>
         }
       }
 
-      return super.parseExpressionStatement(node, expr);
+      return super.parseExpressionStatement(node, expr, decorators);
     }
 
     // export type
@@ -2228,8 +2230,9 @@ export default (superClass: typeof Parser) =>
 
     parseExport(
       node: Undone<N.ExportNamedDeclaration | N.ExportAllDeclaration>,
+      decorators: N.Decorator[] | null,
     ): N.AnyExport {
-      const decl = super.parseExport(node);
+      const decl = super.parseExport(node, decorators);
       if (
         decl.type === "ExportNamedDeclaration" ||
         decl.type === "ExportAllDeclaration"
diff --git a/packages/babel-parser/src/plugins/placeholders.ts b/packages/babel-parser/src/plugins/placeholders.ts
index a89b150f8c9b..d7a93656d2c3 100644
--- a/packages/babel-parser/src/plugins/placeholders.ts
+++ b/packages/babel-parser/src/plugins/placeholders.ts
@@ -241,7 +241,6 @@ export default (superClass: typeof Parser) =>
       const type = isStatement ? "ClassDeclaration" : "ClassExpression";
 
       this.next();
-      this.takeDecorators(node);
       const oldStrict = this.state.strict;
 
       const placeholder = this.parsePlaceholder("Identifier");
@@ -272,9 +271,9 @@ export default (superClass: typeof Parser) =>
       return this.finishNode(node, type);
     }
 
-    parseExport(node: N.Node): N.AnyExport {
+    parseExport(node: N.Node, decorators: N.Decorator[] | null): N.AnyExport {
       const placeholder = this.parsePlaceholder("Identifier");
-      if (!placeholder) return super.parseExport(node);
+      if (!placeholder) return super.parseExport(node, decorators);
 
       if (!this.isContextual(tt._from) && !this.match(tt.comma)) {
         // export %%DECL%%;
@@ -290,7 +289,7 @@ export default (superClass: typeof Parser) =>
       specifier.exported = placeholder;
       node.specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
 
-      return super.parseExport(node);
+      return super.parseExport(node, decorators);
     }
 
     isExportDefaultSpecifier(): boolean {
diff --git a/packages/babel-parser/src/plugins/typescript/index.ts b/packages/babel-parser/src/plugins/typescript/index.ts
index af522420fb6e..46c214214ff5 100644
--- a/packages/babel-parser/src/plugins/typescript/index.ts
+++ b/packages/babel-parser/src/plugins/typescript/index.ts
@@ -2073,6 +2073,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
             nany,
             this.state.value,
             /* next */ true,
+            /* decorators */ null,
           );
         }
       });
@@ -2084,12 +2085,14 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
         this.startNode(),
         this.state.value,
         /* next */ true,
+        /* decorators */ null,
       );
     }
 
     tsParseExpressionStatement(
       node: Undone<N.TsModuleDeclaration>,
       expr: N.Identifier,
+      decorators: N.Decorator[] | null,
     ): N.Declaration | undefined | null {
       switch (expr.name) {
         case "declare": {
@@ -2117,7 +2120,12 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
           break;
 
         default:
-          return this.tsParseDeclaration(node, expr.name, /* next */ false);
+          return this.tsParseDeclaration(
+            node,
+            expr.name,
+            /* next */ false,
+            decorators,
+          );
       }
     }
 
@@ -2126,6 +2134,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
       node: any,
       value: string,
       next: boolean,
+      decorators: N.Decorator[] | null,
     ): N.Declaration | undefined | null {
       // no declaration apart from enum can be followed by a line break.
       switch (value) {
@@ -2134,7 +2143,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
             this.tsCheckLineTerminator(next) &&
             (this.match(tt._class) || tokenIsIdentifier(this.state.type))
           ) {
-            return this.tsParseAbstractDeclaration(node);
+            return this.tsParseAbstractDeclaration(node, decorators);
           }
           break;
 
@@ -2659,7 +2668,10 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
       return importNode;
     }
 
-    parseExport(node: Undone<N.Node>): N.AnyExport {
+    parseExport(
+      node: Undone<N.Node>,
+      decorators: N.Decorator[] | null,
+    ): N.AnyExport {
       if (this.match(tt._import)) {
         // `export import A = B;`
         this.next(); // eat `tt._import`
@@ -2703,6 +2715,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
 
         return super.parseExport(
           node as Undone<N.ExportAllDeclaration | N.ExportDefaultDeclaration>,
+          decorators,
         );
       }
     }
@@ -2784,6 +2797,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
     parseStatementContent(
       context?: string | null,
       topLevel?: boolean | null,
+      decorators?: N.Decorator[] | null,
     ): N.Statement {
       if (this.match(tt._const) && this.isLookaheadContextual("enum")) {
         const node = this.startNode<N.TsEnumDeclaration>();
@@ -2802,7 +2816,7 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
         if (result) return result;
       }
 
-      return super.parseStatementContent(context, topLevel);
+      return super.parseStatementContent(context, topLevel, decorators);
     }
 
     parseAccessModifier(): N.Accessibility | undefined | null {
@@ -2953,13 +2967,14 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
     parseExpressionStatement(
       node: Undone<N.ExpressionStatement>,
       expr: N.Expression,
+      decorators: N.Decorator[] | null,
     ): N.Statement {
       const decl =
         expr.type === "Identifier"
           ? // @ts-expect-error refine typings
-            this.tsParseExpressionStatement(node, expr)
+            this.tsParseExpressionStatement(node, expr, decorators)
           : undefined;
-      return decl || super.parseExpressionStatement(node, expr);
+      return decl || super.parseExpressionStatement(node, expr, decorators);
     }
 
     // export type
@@ -3808,13 +3823,17 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
 
     tsParseAbstractDeclaration(
       node: any,
+      decorators: N.Decorator[] | null,
     ): N.ClassDeclaration | N.TsInterfaceDeclaration | undefined | null {
       if (this.match(tt._class)) {
         node.abstract = true;
-        return this.parseClass<N.ClassDeclaration>(
-          node as N.ClassDeclaration,
-          /* isStatement */ true,
-          /* optionalId */ false,
+        return this.maybeTakeDecorators(
+          decorators,
+          this.parseClass<N.ClassDeclaration>(
+            node as N.ClassDeclaration,
+            /* isStatement */ true,
+            /* optionalId */ false,
+          ),
         );
       } else if (this.isContextual(tt._interface)) {
         // for invalid abstract interface
diff --git a/packages/babel-parser/src/tokenizer/state.ts b/packages/babel-parser/src/tokenizer/state.ts
index e5667faf2dfd..15dc028efe15 100644
--- a/packages/babel-parser/src/tokenizer/state.ts
+++ b/packages/babel-parser/src/tokenizer/state.ts
@@ -92,11 +92,6 @@ export default class State {
     statementStart?: number;
   }> = [];
 
-  // Leading decorators. Last element of the stack represents the decorators in current context.
-  // Supports nesting of decorators, e.g. @foo(@bar class inner {}) class outer {}
-  // where @foo belongs to the outer class and @bar to the inner
-  decoratorStack: Array<Array<N.Decorator>> = [[]];
-
   // Comment store for Program.comments
   comments: Array<N.Comment> = [];
 
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/input.js b/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/input.js
new file mode 100644
index 000000000000..1f389f07c313
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/input.js
@@ -0,0 +1,5 @@
+/* 1 */ export /* 2 */ @dec1 /* 3 */ @dec2
+/* 4 */ class /* 5 */ C /* 6 */ { /* 7 */ } /* 8 */
+
+/* A */ export /* B */ default /* C */ @dec1 /* D */ @dec2
+/* E */ class /* F */ { /* G */ } /* H */
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/options.json b/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/options.json
new file mode 100644
index 000000000000..ca59dc053473
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": [["decorators", { "decoratorsBeforeExport": false }]]
+}
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/output.json b/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/output.json
new file mode 100644
index 000000000000..636dddcb25e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-after-export/output.json
@@ -0,0 +1,314 @@
+{
+  "type": "File",
+  "start":0,"end":196,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":5,"column":41,"index":196}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":196,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":5,"column":41,"index":196}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start":8,"end":86,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":2,"column":43,"index":86}},
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "ClassDeclaration",
+          "start":23,"end":86,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":2,"column":43,"index":86}},
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":23,"end":28,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":28,"index":28}},
+              "expression": {
+                "type": "Identifier",
+                "start":24,"end":28,"loc":{"start":{"line":1,"column":24,"index":24},"end":{"line":1,"column":28,"index":28},"identifierName":"dec1"},
+                "name": "dec1"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 3 ",
+                  "start":29,"end":36,"loc":{"start":{"line":1,"column":29,"index":29},"end":{"line":1,"column":36,"index":36}}
+                }
+              ]
+            },
+            {
+              "type": "Decorator",
+              "start":37,"end":42,"loc":{"start":{"line":1,"column":37,"index":37},"end":{"line":1,"column":42,"index":42}},
+              "expression": {
+                "type": "Identifier",
+                "start":38,"end":42,"loc":{"start":{"line":1,"column":38,"index":38},"end":{"line":1,"column":42,"index":42},"identifierName":"dec2"},
+                "name": "dec2"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 4 ",
+                  "start":43,"end":50,"loc":{"start":{"line":2,"column":0,"index":43},"end":{"line":2,"column":7,"index":50}}
+                }
+              ],
+              "leadingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 3 ",
+                  "start":29,"end":36,"loc":{"start":{"line":1,"column":29,"index":29},"end":{"line":1,"column":36,"index":36}}
+                }
+              ]
+            }
+          ],
+          "id": {
+            "type": "Identifier",
+            "start":65,"end":66,"loc":{"start":{"line":2,"column":22,"index":65},"end":{"line":2,"column":23,"index":66},"identifierName":"C"},
+            "name": "C",
+            "trailingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 6 ",
+                "start":67,"end":74,"loc":{"start":{"line":2,"column":24,"index":67},"end":{"line":2,"column":31,"index":74}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 5 ",
+                "start":57,"end":64,"loc":{"start":{"line":2,"column":14,"index":57},"end":{"line":2,"column":21,"index":64}}
+              }
+            ]
+          },
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":75,"end":86,"loc":{"start":{"line":2,"column":32,"index":75},"end":{"line":2,"column":43,"index":86}},
+            "body": [],
+            "innerComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 7 ",
+                "start":77,"end":84,"loc":{"start":{"line":2,"column":34,"index":77},"end":{"line":2,"column":41,"index":84}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 6 ",
+                "start":67,"end":74,"loc":{"start":{"line":2,"column":24,"index":67},"end":{"line":2,"column":31,"index":74}}
+              }
+            ]
+          },
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " 2 ",
+              "start":15,"end":22,"loc":{"start":{"line":1,"column":15,"index":15},"end":{"line":1,"column":22,"index":22}}
+            }
+          ]
+        },
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 8 ",
+            "start":87,"end":94,"loc":{"start":{"line":2,"column":44,"index":87},"end":{"line":2,"column":51,"index":94}}
+          },
+          {
+            "type": "CommentBlock",
+            "value": " A ",
+            "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+          }
+        ],
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 1 ",
+            "start":0,"end":7,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":7,"index":7}}
+          }
+        ]
+      },
+      {
+        "type": "ExportDefaultDeclaration",
+        "start":104,"end":188,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":5,"column":33,"index":188}},
+        "declaration": {
+          "type": "ClassDeclaration",
+          "start":135,"end":188,"loc":{"start":{"line":4,"column":39,"index":135},"end":{"line":5,"column":33,"index":188}},
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":135,"end":140,"loc":{"start":{"line":4,"column":39,"index":135},"end":{"line":4,"column":44,"index":140}},
+              "expression": {
+                "type": "Identifier",
+                "start":136,"end":140,"loc":{"start":{"line":4,"column":40,"index":136},"end":{"line":4,"column":44,"index":140},"identifierName":"dec1"},
+                "name": "dec1"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " D ",
+                  "start":141,"end":148,"loc":{"start":{"line":4,"column":45,"index":141},"end":{"line":4,"column":52,"index":148}}
+                }
+              ]
+            },
+            {
+              "type": "Decorator",
+              "start":149,"end":154,"loc":{"start":{"line":4,"column":53,"index":149},"end":{"line":4,"column":58,"index":154}},
+              "expression": {
+                "type": "Identifier",
+                "start":150,"end":154,"loc":{"start":{"line":4,"column":54,"index":150},"end":{"line":4,"column":58,"index":154},"identifierName":"dec2"},
+                "name": "dec2"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " E ",
+                  "start":155,"end":162,"loc":{"start":{"line":5,"column":0,"index":155},"end":{"line":5,"column":7,"index":162}}
+                }
+              ],
+              "leadingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " D ",
+                  "start":141,"end":148,"loc":{"start":{"line":4,"column":45,"index":141},"end":{"line":4,"column":52,"index":148}}
+                }
+              ]
+            }
+          ],
+          "id": null,
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":177,"end":188,"loc":{"start":{"line":5,"column":22,"index":177},"end":{"line":5,"column":33,"index":188}},
+            "body": [],
+            "innerComments": [
+              {
+                "type": "CommentBlock",
+                "value": " G ",
+                "start":179,"end":186,"loc":{"start":{"line":5,"column":24,"index":179},"end":{"line":5,"column":31,"index":186}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " F ",
+                "start":169,"end":176,"loc":{"start":{"line":5,"column":14,"index":169},"end":{"line":5,"column":21,"index":176}}
+              }
+            ]
+          },
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " C ",
+              "start":127,"end":134,"loc":{"start":{"line":4,"column":31,"index":127},"end":{"line":4,"column":38,"index":134}}
+            }
+          ]
+        },
+        "innerComments": [
+          {
+            "type": "CommentBlock",
+            "value": " B ",
+            "start":111,"end":118,"loc":{"start":{"line":4,"column":15,"index":111},"end":{"line":4,"column":22,"index":118}}
+          }
+        ],
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " H ",
+            "start":189,"end":196,"loc":{"start":{"line":5,"column":34,"index":189},"end":{"line":5,"column":41,"index":196}}
+          }
+        ],
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 8 ",
+            "start":87,"end":94,"loc":{"start":{"line":2,"column":44,"index":87},"end":{"line":2,"column":51,"index":94}}
+          },
+          {
+            "type": "CommentBlock",
+            "value": " A ",
+            "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentBlock",
+      "value": " 1 ",
+      "start":0,"end":7,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":7,"index":7}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 2 ",
+      "start":15,"end":22,"loc":{"start":{"line":1,"column":15,"index":15},"end":{"line":1,"column":22,"index":22}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 3 ",
+      "start":29,"end":36,"loc":{"start":{"line":1,"column":29,"index":29},"end":{"line":1,"column":36,"index":36}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 4 ",
+      "start":43,"end":50,"loc":{"start":{"line":2,"column":0,"index":43},"end":{"line":2,"column":7,"index":50}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 5 ",
+      "start":57,"end":64,"loc":{"start":{"line":2,"column":14,"index":57},"end":{"line":2,"column":21,"index":64}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 6 ",
+      "start":67,"end":74,"loc":{"start":{"line":2,"column":24,"index":67},"end":{"line":2,"column":31,"index":74}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 7 ",
+      "start":77,"end":84,"loc":{"start":{"line":2,"column":34,"index":77},"end":{"line":2,"column":41,"index":84}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 8 ",
+      "start":87,"end":94,"loc":{"start":{"line":2,"column":44,"index":87},"end":{"line":2,"column":51,"index":94}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " A ",
+      "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " B ",
+      "start":111,"end":118,"loc":{"start":{"line":4,"column":15,"index":111},"end":{"line":4,"column":22,"index":118}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " C ",
+      "start":127,"end":134,"loc":{"start":{"line":4,"column":31,"index":127},"end":{"line":4,"column":38,"index":134}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " D ",
+      "start":141,"end":148,"loc":{"start":{"line":4,"column":45,"index":141},"end":{"line":4,"column":52,"index":148}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " E ",
+      "start":155,"end":162,"loc":{"start":{"line":5,"column":0,"index":155},"end":{"line":5,"column":7,"index":162}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " F ",
+      "start":169,"end":176,"loc":{"start":{"line":5,"column":14,"index":169},"end":{"line":5,"column":21,"index":176}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " G ",
+      "start":179,"end":186,"loc":{"start":{"line":5,"column":24,"index":179},"end":{"line":5,"column":31,"index":186}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " H ",
+      "start":189,"end":196,"loc":{"start":{"line":5,"column":34,"index":189},"end":{"line":5,"column":41,"index":196}}
+    }
+  ]
+}
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/input.js b/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/input.js
new file mode 100644
index 000000000000..83739b654ed7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/input.js
@@ -0,0 +1,5 @@
+/* 1 */ @dec1 /* 2 */ @dec2 /* 3 */
+export /* 4 */ class /* 5 */ C /* 6 */ { /* 7 */ } /* 8 */
+
+/* A */ @dec1 /* B */ @dec2 /* C */
+export /* D */ default /* E */ class /* F */ { /* G */ } /* H */
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/options.json b/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/options.json
new file mode 100644
index 000000000000..3d20bee94540
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": [["decorators", { "decoratorsBeforeExport": true }]]
+}
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/output.json b/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/output.json
new file mode 100644
index 000000000000..416965a2800d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-before-export/output.json
@@ -0,0 +1,314 @@
+{
+  "type": "File",
+  "start":0,"end":196,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":5,"column":64,"index":196}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":196,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":5,"column":64,"index":196}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start":8,"end":86,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":2,"column":50,"index":86}},
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "ClassDeclaration",
+          "start":8,"end":86,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":2,"column":50,"index":86}},
+          "id": {
+            "type": "Identifier",
+            "start":65,"end":66,"loc":{"start":{"line":2,"column":29,"index":65},"end":{"line":2,"column":30,"index":66},"identifierName":"C"},
+            "name": "C",
+            "trailingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 6 ",
+                "start":67,"end":74,"loc":{"start":{"line":2,"column":31,"index":67},"end":{"line":2,"column":38,"index":74}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 5 ",
+                "start":57,"end":64,"loc":{"start":{"line":2,"column":21,"index":57},"end":{"line":2,"column":28,"index":64}}
+              }
+            ]
+          },
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":75,"end":86,"loc":{"start":{"line":2,"column":39,"index":75},"end":{"line":2,"column":50,"index":86}},
+            "body": [],
+            "innerComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 7 ",
+                "start":77,"end":84,"loc":{"start":{"line":2,"column":41,"index":77},"end":{"line":2,"column":48,"index":84}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 6 ",
+                "start":67,"end":74,"loc":{"start":{"line":2,"column":31,"index":67},"end":{"line":2,"column":38,"index":74}}
+              }
+            ]
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":8,"end":13,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":13,"index":13}},
+              "expression": {
+                "type": "Identifier",
+                "start":9,"end":13,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":13,"index":13},"identifierName":"dec1"},
+                "name": "dec1"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 2 ",
+                  "start":14,"end":21,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":21,"index":21}}
+                }
+              ]
+            },
+            {
+              "type": "Decorator",
+              "start":22,"end":27,"loc":{"start":{"line":1,"column":22,"index":22},"end":{"line":1,"column":27,"index":27}},
+              "expression": {
+                "type": "Identifier",
+                "start":23,"end":27,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":27,"index":27},"identifierName":"dec2"},
+                "name": "dec2"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 3 ",
+                  "start":28,"end":35,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":35,"index":35}}
+                }
+              ],
+              "leadingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 2 ",
+                  "start":14,"end":21,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":21,"index":21}}
+                }
+              ]
+            }
+          ],
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " 4 ",
+              "start":43,"end":50,"loc":{"start":{"line":2,"column":7,"index":43},"end":{"line":2,"column":14,"index":50}}
+            }
+          ]
+        },
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 8 ",
+            "start":87,"end":94,"loc":{"start":{"line":2,"column":51,"index":87},"end":{"line":2,"column":58,"index":94}}
+          },
+          {
+            "type": "CommentBlock",
+            "value": " A ",
+            "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+          }
+        ],
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 1 ",
+            "start":0,"end":7,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":7,"index":7}}
+          }
+        ]
+      },
+      {
+        "type": "ExportDefaultDeclaration",
+        "start":104,"end":188,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":5,"column":56,"index":188}},
+        "declaration": {
+          "type": "ClassDeclaration",
+          "start":104,"end":188,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":5,"column":56,"index":188}},
+          "id": null,
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":177,"end":188,"loc":{"start":{"line":5,"column":45,"index":177},"end":{"line":5,"column":56,"index":188}},
+            "body": [],
+            "innerComments": [
+              {
+                "type": "CommentBlock",
+                "value": " G ",
+                "start":179,"end":186,"loc":{"start":{"line":5,"column":47,"index":179},"end":{"line":5,"column":54,"index":186}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " F ",
+                "start":169,"end":176,"loc":{"start":{"line":5,"column":37,"index":169},"end":{"line":5,"column":44,"index":176}}
+              }
+            ]
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":104,"end":109,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":4,"column":13,"index":109}},
+              "expression": {
+                "type": "Identifier",
+                "start":105,"end":109,"loc":{"start":{"line":4,"column":9,"index":105},"end":{"line":4,"column":13,"index":109},"identifierName":"dec1"},
+                "name": "dec1"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " B ",
+                  "start":110,"end":117,"loc":{"start":{"line":4,"column":14,"index":110},"end":{"line":4,"column":21,"index":117}}
+                }
+              ]
+            },
+            {
+              "type": "Decorator",
+              "start":118,"end":123,"loc":{"start":{"line":4,"column":22,"index":118},"end":{"line":4,"column":27,"index":123}},
+              "expression": {
+                "type": "Identifier",
+                "start":119,"end":123,"loc":{"start":{"line":4,"column":23,"index":119},"end":{"line":4,"column":27,"index":123},"identifierName":"dec2"},
+                "name": "dec2"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " C ",
+                  "start":124,"end":131,"loc":{"start":{"line":4,"column":28,"index":124},"end":{"line":4,"column":35,"index":131}}
+                }
+              ],
+              "leadingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " B ",
+                  "start":110,"end":117,"loc":{"start":{"line":4,"column":14,"index":110},"end":{"line":4,"column":21,"index":117}}
+                }
+              ]
+            }
+          ],
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " E ",
+              "start":155,"end":162,"loc":{"start":{"line":5,"column":23,"index":155},"end":{"line":5,"column":30,"index":162}}
+            }
+          ]
+        },
+        "innerComments": [
+          {
+            "type": "CommentBlock",
+            "value": " D ",
+            "start":139,"end":146,"loc":{"start":{"line":5,"column":7,"index":139},"end":{"line":5,"column":14,"index":146}}
+          }
+        ],
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " H ",
+            "start":189,"end":196,"loc":{"start":{"line":5,"column":57,"index":189},"end":{"line":5,"column":64,"index":196}}
+          }
+        ],
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 8 ",
+            "start":87,"end":94,"loc":{"start":{"line":2,"column":51,"index":87},"end":{"line":2,"column":58,"index":94}}
+          },
+          {
+            "type": "CommentBlock",
+            "value": " A ",
+            "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentBlock",
+      "value": " 1 ",
+      "start":0,"end":7,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":7,"index":7}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 2 ",
+      "start":14,"end":21,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":21,"index":21}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 3 ",
+      "start":28,"end":35,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":35,"index":35}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 4 ",
+      "start":43,"end":50,"loc":{"start":{"line":2,"column":7,"index":43},"end":{"line":2,"column":14,"index":50}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 5 ",
+      "start":57,"end":64,"loc":{"start":{"line":2,"column":21,"index":57},"end":{"line":2,"column":28,"index":64}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 6 ",
+      "start":67,"end":74,"loc":{"start":{"line":2,"column":31,"index":67},"end":{"line":2,"column":38,"index":74}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 7 ",
+      "start":77,"end":84,"loc":{"start":{"line":2,"column":41,"index":77},"end":{"line":2,"column":48,"index":84}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 8 ",
+      "start":87,"end":94,"loc":{"start":{"line":2,"column":51,"index":87},"end":{"line":2,"column":58,"index":94}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " A ",
+      "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " B ",
+      "start":110,"end":117,"loc":{"start":{"line":4,"column":14,"index":110},"end":{"line":4,"column":21,"index":117}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " C ",
+      "start":124,"end":131,"loc":{"start":{"line":4,"column":28,"index":124},"end":{"line":4,"column":35,"index":131}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " D ",
+      "start":139,"end":146,"loc":{"start":{"line":5,"column":7,"index":139},"end":{"line":5,"column":14,"index":146}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " E ",
+      "start":155,"end":162,"loc":{"start":{"line":5,"column":23,"index":155},"end":{"line":5,"column":30,"index":162}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " F ",
+      "start":169,"end":176,"loc":{"start":{"line":5,"column":37,"index":169},"end":{"line":5,"column":44,"index":176}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " G ",
+      "start":179,"end":186,"loc":{"start":{"line":5,"column":47,"index":179},"end":{"line":5,"column":54,"index":186}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " H ",
+      "start":189,"end":196,"loc":{"start":{"line":5,"column":57,"index":189},"end":{"line":5,"column":64,"index":196}}
+    }
+  ]
+}
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/input.js b/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/input.js
new file mode 100644
index 000000000000..83739b654ed7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/input.js
@@ -0,0 +1,5 @@
+/* 1 */ @dec1 /* 2 */ @dec2 /* 3 */
+export /* 4 */ class /* 5 */ C /* 6 */ { /* 7 */ } /* 8 */
+
+/* A */ @dec1 /* B */ @dec2 /* C */
+export /* D */ default /* E */ class /* F */ { /* G */ } /* H */
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/options.json b/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/options.json
new file mode 100644
index 000000000000..5e6a01579b8a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["decorators-legacy"]
+}
diff --git a/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/output.json b/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/output.json
new file mode 100644
index 000000000000..416965a2800d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/decorators/decorators-legacy-before-export/output.json
@@ -0,0 +1,314 @@
+{
+  "type": "File",
+  "start":0,"end":196,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":5,"column":64,"index":196}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":196,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":5,"column":64,"index":196}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start":8,"end":86,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":2,"column":50,"index":86}},
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "ClassDeclaration",
+          "start":8,"end":86,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":2,"column":50,"index":86}},
+          "id": {
+            "type": "Identifier",
+            "start":65,"end":66,"loc":{"start":{"line":2,"column":29,"index":65},"end":{"line":2,"column":30,"index":66},"identifierName":"C"},
+            "name": "C",
+            "trailingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 6 ",
+                "start":67,"end":74,"loc":{"start":{"line":2,"column":31,"index":67},"end":{"line":2,"column":38,"index":74}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 5 ",
+                "start":57,"end":64,"loc":{"start":{"line":2,"column":21,"index":57},"end":{"line":2,"column":28,"index":64}}
+              }
+            ]
+          },
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":75,"end":86,"loc":{"start":{"line":2,"column":39,"index":75},"end":{"line":2,"column":50,"index":86}},
+            "body": [],
+            "innerComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 7 ",
+                "start":77,"end":84,"loc":{"start":{"line":2,"column":41,"index":77},"end":{"line":2,"column":48,"index":84}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " 6 ",
+                "start":67,"end":74,"loc":{"start":{"line":2,"column":31,"index":67},"end":{"line":2,"column":38,"index":74}}
+              }
+            ]
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":8,"end":13,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":13,"index":13}},
+              "expression": {
+                "type": "Identifier",
+                "start":9,"end":13,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":13,"index":13},"identifierName":"dec1"},
+                "name": "dec1"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 2 ",
+                  "start":14,"end":21,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":21,"index":21}}
+                }
+              ]
+            },
+            {
+              "type": "Decorator",
+              "start":22,"end":27,"loc":{"start":{"line":1,"column":22,"index":22},"end":{"line":1,"column":27,"index":27}},
+              "expression": {
+                "type": "Identifier",
+                "start":23,"end":27,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":27,"index":27},"identifierName":"dec2"},
+                "name": "dec2"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 3 ",
+                  "start":28,"end":35,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":35,"index":35}}
+                }
+              ],
+              "leadingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " 2 ",
+                  "start":14,"end":21,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":21,"index":21}}
+                }
+              ]
+            }
+          ],
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " 4 ",
+              "start":43,"end":50,"loc":{"start":{"line":2,"column":7,"index":43},"end":{"line":2,"column":14,"index":50}}
+            }
+          ]
+        },
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 8 ",
+            "start":87,"end":94,"loc":{"start":{"line":2,"column":51,"index":87},"end":{"line":2,"column":58,"index":94}}
+          },
+          {
+            "type": "CommentBlock",
+            "value": " A ",
+            "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+          }
+        ],
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 1 ",
+            "start":0,"end":7,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":7,"index":7}}
+          }
+        ]
+      },
+      {
+        "type": "ExportDefaultDeclaration",
+        "start":104,"end":188,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":5,"column":56,"index":188}},
+        "declaration": {
+          "type": "ClassDeclaration",
+          "start":104,"end":188,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":5,"column":56,"index":188}},
+          "id": null,
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":177,"end":188,"loc":{"start":{"line":5,"column":45,"index":177},"end":{"line":5,"column":56,"index":188}},
+            "body": [],
+            "innerComments": [
+              {
+                "type": "CommentBlock",
+                "value": " G ",
+                "start":179,"end":186,"loc":{"start":{"line":5,"column":47,"index":179},"end":{"line":5,"column":54,"index":186}}
+              }
+            ],
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " F ",
+                "start":169,"end":176,"loc":{"start":{"line":5,"column":37,"index":169},"end":{"line":5,"column":44,"index":176}}
+              }
+            ]
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":104,"end":109,"loc":{"start":{"line":4,"column":8,"index":104},"end":{"line":4,"column":13,"index":109}},
+              "expression": {
+                "type": "Identifier",
+                "start":105,"end":109,"loc":{"start":{"line":4,"column":9,"index":105},"end":{"line":4,"column":13,"index":109},"identifierName":"dec1"},
+                "name": "dec1"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " B ",
+                  "start":110,"end":117,"loc":{"start":{"line":4,"column":14,"index":110},"end":{"line":4,"column":21,"index":117}}
+                }
+              ]
+            },
+            {
+              "type": "Decorator",
+              "start":118,"end":123,"loc":{"start":{"line":4,"column":22,"index":118},"end":{"line":4,"column":27,"index":123}},
+              "expression": {
+                "type": "Identifier",
+                "start":119,"end":123,"loc":{"start":{"line":4,"column":23,"index":119},"end":{"line":4,"column":27,"index":123},"identifierName":"dec2"},
+                "name": "dec2"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " C ",
+                  "start":124,"end":131,"loc":{"start":{"line":4,"column":28,"index":124},"end":{"line":4,"column":35,"index":131}}
+                }
+              ],
+              "leadingComments": [
+                {
+                  "type": "CommentBlock",
+                  "value": " B ",
+                  "start":110,"end":117,"loc":{"start":{"line":4,"column":14,"index":110},"end":{"line":4,"column":21,"index":117}}
+                }
+              ]
+            }
+          ],
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " E ",
+              "start":155,"end":162,"loc":{"start":{"line":5,"column":23,"index":155},"end":{"line":5,"column":30,"index":162}}
+            }
+          ]
+        },
+        "innerComments": [
+          {
+            "type": "CommentBlock",
+            "value": " D ",
+            "start":139,"end":146,"loc":{"start":{"line":5,"column":7,"index":139},"end":{"line":5,"column":14,"index":146}}
+          }
+        ],
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " H ",
+            "start":189,"end":196,"loc":{"start":{"line":5,"column":57,"index":189},"end":{"line":5,"column":64,"index":196}}
+          }
+        ],
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " 8 ",
+            "start":87,"end":94,"loc":{"start":{"line":2,"column":51,"index":87},"end":{"line":2,"column":58,"index":94}}
+          },
+          {
+            "type": "CommentBlock",
+            "value": " A ",
+            "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentBlock",
+      "value": " 1 ",
+      "start":0,"end":7,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":7,"index":7}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 2 ",
+      "start":14,"end":21,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":21,"index":21}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 3 ",
+      "start":28,"end":35,"loc":{"start":{"line":1,"column":28,"index":28},"end":{"line":1,"column":35,"index":35}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 4 ",
+      "start":43,"end":50,"loc":{"start":{"line":2,"column":7,"index":43},"end":{"line":2,"column":14,"index":50}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 5 ",
+      "start":57,"end":64,"loc":{"start":{"line":2,"column":21,"index":57},"end":{"line":2,"column":28,"index":64}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 6 ",
+      "start":67,"end":74,"loc":{"start":{"line":2,"column":31,"index":67},"end":{"line":2,"column":38,"index":74}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 7 ",
+      "start":77,"end":84,"loc":{"start":{"line":2,"column":41,"index":77},"end":{"line":2,"column":48,"index":84}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " 8 ",
+      "start":87,"end":94,"loc":{"start":{"line":2,"column":51,"index":87},"end":{"line":2,"column":58,"index":94}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " A ",
+      "start":96,"end":103,"loc":{"start":{"line":4,"column":0,"index":96},"end":{"line":4,"column":7,"index":103}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " B ",
+      "start":110,"end":117,"loc":{"start":{"line":4,"column":14,"index":110},"end":{"line":4,"column":21,"index":117}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " C ",
+      "start":124,"end":131,"loc":{"start":{"line":4,"column":28,"index":124},"end":{"line":4,"column":35,"index":131}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " D ",
+      "start":139,"end":146,"loc":{"start":{"line":5,"column":7,"index":139},"end":{"line":5,"column":14,"index":146}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " E ",
+      "start":155,"end":162,"loc":{"start":{"line":5,"column":23,"index":155},"end":{"line":5,"column":30,"index":162}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " F ",
+      "start":169,"end":176,"loc":{"start":{"line":5,"column":37,"index":169},"end":{"line":5,"column":44,"index":176}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " G ",
+      "start":179,"end":186,"loc":{"start":{"line":5,"column":47,"index":179},"end":{"line":5,"column":54,"index":186}}
+    },
+    {
+      "type": "CommentBlock",
+      "value": " H ",
+      "start":189,"end":196,"loc":{"start":{"line":5,"column":57,"index":189},"end":{"line":5,"column":64,"index":196}}
+    }
+  ]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-decorators-on-class/output.json b/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-decorators-on-class/output.json
index 9d20bae87a35..64e76a94ac0b 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-decorators-on-class/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-decorators-on-class/output.json
@@ -9,23 +9,12 @@
     "body": [
       {
         "type": "ExportNamedDeclaration",
-        "start":5,"end":22,"loc":{"start":{"line":2,"column":0,"index":5},"end":{"line":2,"column":17,"index":22}},
+        "start":0,"end":22,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":17,"index":22}},
         "specifiers": [],
         "source": null,
         "declaration": {
           "type": "ClassDeclaration",
           "start":0,"end":22,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":17,"index":22}},
-          "decorators": [
-            {
-              "type": "Decorator",
-              "start":0,"end":4,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":4,"index":4}},
-              "expression": {
-                "type": "Identifier",
-                "start":1,"end":4,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":4,"index":4},"identifierName":"foo"},
-                "name": "foo"
-              }
-            }
-          ],
           "id": {
             "type": "Identifier",
             "start":18,"end":19,"loc":{"start":{"line":2,"column":13,"index":18},"end":{"line":2,"column":14,"index":19},"identifierName":"A"},
@@ -36,7 +25,18 @@
             "type": "ClassBody",
             "start":20,"end":22,"loc":{"start":{"line":2,"column":15,"index":20},"end":{"line":2,"column":17,"index":22}},
             "body": []
-          }
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":0,"end":4,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":4,"index":4}},
+              "expression": {
+                "type": "Identifier",
+                "start":1,"end":4,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":4,"index":4},"identifierName":"foo"},
+                "name": "foo"
+              }
+            }
+          ]
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-decorators-on-class/output.json b/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-decorators-on-class/output.json
index 83645ba2321c..7127a662debc 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-decorators-on-class/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-decorators-on-class/output.json
@@ -9,10 +9,17 @@
     "body": [
       {
         "type": "ExportDefaultDeclaration",
-        "start":5,"end":28,"loc":{"start":{"line":2,"column":0,"index":5},"end":{"line":2,"column":23,"index":28}},
+        "start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":23,"index":28}},
         "declaration": {
           "type": "ClassDeclaration",
           "start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":23,"index":28}},
+          "id": null,
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":26,"end":28,"loc":{"start":{"line":2,"column":21,"index":26},"end":{"line":2,"column":23,"index":28}},
+            "body": []
+          },
           "decorators": [
             {
               "type": "Decorator",
@@ -23,14 +30,7 @@
                 "name": "foo"
               }
             }
-          ],
-          "id": null,
-          "superClass": null,
-          "body": {
-            "type": "ClassBody",
-            "start":26,"end":28,"loc":{"start":{"line":2,"column":21,"index":26},"end":{"line":2,"column":23,"index":28}},
-            "body": []
-          }
+          ]
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-with-nested-class/output.json b/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-with-nested-class/output.json
index ff21aa7dea8e..fb492bc67c09 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-with-nested-class/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-legacy/export-default-with-nested-class/output.json
@@ -9,21 +9,10 @@
     "body": [
       {
         "type": "ExportDefaultDeclaration",
-        "start":17,"end":109,"loc":{"start":{"line":2,"column":0,"index":17},"end":{"line":7,"column":1,"index":109}},
+        "start":0,"end":109,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":7,"column":1,"index":109}},
         "declaration": {
           "type": "ClassDeclaration",
           "start":0,"end":109,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":7,"column":1,"index":109}},
-          "decorators": [
-            {
-              "type": "Decorator",
-              "start":0,"end":16,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":16,"index":16}},
-              "expression": {
-                "type": "Identifier",
-                "start":1,"end":16,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":16,"index":16},"identifierName":"ParentDecorator"},
-                "name": "ParentDecorator"
-              }
-            }
-          ],
           "id": {
             "type": "Identifier",
             "start":38,"end":49,"loc":{"start":{"line":2,"column":21,"index":38},"end":{"line":2,"column":32,"index":49},"identifierName":"ParentClass"},
@@ -73,7 +62,18 @@
                 }
               }
             ]
-          }
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":0,"end":16,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":16,"index":16}},
+              "expression": {
+                "type": "Identifier",
+                "start":1,"end":16,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":16,"index":16},"identifierName":"ParentDecorator"},
+                "name": "ParentDecorator"
+              }
+            }
+          ]
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export-default/output.json b/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export-default/output.json
index 4a0f55b9b6ed..c6a48d26b178 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export-default/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export-default/output.json
@@ -9,21 +9,10 @@
     "body": [
       {
         "type": "ExportDefaultDeclaration",
-        "start":11,"end":38,"loc":{"start":{"line":2,"column":0,"index":11},"end":{"line":2,"column":27,"index":38}},
+        "start":0,"end":38,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":27,"index":38}},
         "declaration": {
           "type": "ClassDeclaration",
           "start":0,"end":38,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":27,"index":38}},
-          "decorators": [
-            {
-              "type": "Decorator",
-              "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}},
-              "expression": {
-                "type": "Identifier",
-                "start":1,"end":10,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":10,"index":10},"identifierName":"decorator"},
-                "name": "decorator"
-              }
-            }
-          ],
           "id": {
             "type": "Identifier",
             "start":32,"end":35,"loc":{"start":{"line":2,"column":21,"index":32},"end":{"line":2,"column":24,"index":35},"identifierName":"Foo"},
@@ -34,7 +23,18 @@
             "type": "ClassBody",
             "start":36,"end":38,"loc":{"start":{"line":2,"column":25,"index":36},"end":{"line":2,"column":27,"index":38}},
             "body": []
-          }
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}},
+              "expression": {
+                "type": "Identifier",
+                "start":1,"end":10,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":10,"index":10},"identifierName":"decorator"},
+                "name": "decorator"
+              }
+            }
+          ]
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export/output.json b/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export/output.json
index 0cc486e341f1..6e2ccfcb4cf0 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/decoratorsBeforeExport-export/output.json
@@ -9,23 +9,12 @@
     "body": [
       {
         "type": "ExportNamedDeclaration",
-        "start":11,"end":30,"loc":{"start":{"line":2,"column":0,"index":11},"end":{"line":2,"column":19,"index":30}},
+        "start":0,"end":30,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":19,"index":30}},
         "specifiers": [],
         "source": null,
         "declaration": {
           "type": "ClassDeclaration",
           "start":0,"end":30,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":19,"index":30}},
-          "decorators": [
-            {
-              "type": "Decorator",
-              "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}},
-              "expression": {
-                "type": "Identifier",
-                "start":1,"end":10,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":10,"index":10},"identifierName":"decorator"},
-                "name": "decorator"
-              }
-            }
-          ],
           "id": {
             "type": "Identifier",
             "start":24,"end":27,"loc":{"start":{"line":2,"column":13,"index":24},"end":{"line":2,"column":16,"index":27},"identifierName":"Foo"},
@@ -36,7 +25,18 @@
             "type": "ClassBody",
             "start":28,"end":30,"loc":{"start":{"line":2,"column":17,"index":28},"end":{"line":2,"column":19,"index":30}},
             "body": []
-          }
+          },
+          "decorators": [
+            {
+              "type": "Decorator",
+              "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}},
+              "expression": {
+                "type": "Identifier",
+                "start":1,"end":10,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":10,"index":10},"identifierName":"decorator"},
+                "name": "decorator"
+              }
+            }
+          ]
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-on-class/output.json b/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-on-class/output.json
index bebb8ae7a9b9..4f2b0e7f3213 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-on-class/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-on-class/output.json
@@ -12,10 +12,17 @@
     "body": [
       {
         "type": "ExportDefaultDeclaration",
-        "start":5,"end":28,"loc":{"start":{"line":2,"column":0,"index":5},"end":{"line":2,"column":23,"index":28}},
+        "start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":23,"index":28}},
         "declaration": {
           "type": "ClassDeclaration",
           "start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":2,"column":23,"index":28}},
+          "id": null,
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start":26,"end":28,"loc":{"start":{"line":2,"column":21,"index":26},"end":{"line":2,"column":23,"index":28}},
+            "body": []
+          },
           "decorators": [
             {
               "type": "Decorator",
@@ -26,14 +33,7 @@
                 "name": "foo"
               }
             }
-          ],
-          "id": null,
-          "superClass": null,
-          "body": {
-            "type": "ClassBody",
-            "start":26,"end":28,"loc":{"start":{"line":2,"column":21,"index":26},"end":{"line":2,"column":23,"index":28}},
-            "body": []
-          }
+          ]
         }
       }
     ],