diff --git a/tests/format/misc/embedded_language_formatting/mdx/__snapshots__/format.test.js.snap b/tests/format/misc/embedded_language_formatting/mdx/__snapshots__/format.test.js.snap
index fd9d32247c70..530ca4448071 100644
--- a/tests/format/misc/embedded_language_formatting/mdx/__snapshots__/format.test.js.snap
+++ b/tests/format/misc/embedded_language_formatting/mdx/__snapshots__/format.test.js.snap
@@ -84,14 +84,16 @@ parsers: ["mdx"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
-<Heading hi='there'>Hello, world!
+<Heading hi='there'>
+Hello, world!
 </Heading>
 
 ---
 
 <Hello>
     test   <World />   test
-</Hello>123
+</Hello>
+123
 
 ---
 
@@ -100,22 +102,26 @@ printWidth: 80
 </Hello>
 <Hello>
     test   <World />   test
-</Hello>123
+</Hello>
+123
 
 ---
 
 <Hello>
     test   <World />   test
-</Hello>       123
+</Hello>
+123
 <Hello>
     test   <World />   test
-</Hello>       234
+</Hello>
+234
 
 ---
 
 <>
     test   <World        />   test
-</>       123
+</>
+123
 
 ---
 
@@ -123,39 +129,53 @@ printWidth: 80
 |---|---|
 | Text | <Hello>Text</Hello> |
 
+---
+
+<Hello attr={{   ab: 'cd'}} />
+
+---
+
+Hello, {  javascript .    expression }!
+
 =====================================output=====================================
-<Heading hi='there'>Hello, world!
+<Heading hi="there">
+  Hello, world!
 </Heading>
 
 ---
 
 <Hello>
-    test   <World />   test
-</Hello>123
+  test <World /> test
+</Hello>
+123
 
 ---
 
 <Hello>
-    test   <World />   test
+  test <World /> test
 </Hello>
 <Hello>
-    test   <World />   test
-</Hello>123
+  test <World /> test
+</Hello>
+123
 
 ---
 
 <Hello>
-    test   <World />   test
-</Hello>       123
+  test <World /> test
+</Hello>
+123
 <Hello>
-    test   <World />   test
-</Hello>       234
+  test <World /> test
+</Hello>
+234
 
 ---
 
 <>
-    test   <World        />   test
-</>       123
+  test <World /> test
+</>
+123
 
 ---
 
@@ -163,5 +183,13 @@ printWidth: 80
 | -------- | ------------------- |
 | Text     | <Hello>Text</Hello> |
 
+---
+
+<Hello attr={{   ab: 'cd'}} />
+
+---
+
+Hello, {javascript .    expression}!
+
 ================================================================================
 `;
diff --git a/tests/format/misc/embedded_language_formatting/mdx/jsx.mdx b/tests/format/misc/embedded_language_formatting/mdx/jsx.mdx
index 85961c373e72..4a9b4743ebb5 100644
--- a/tests/format/misc/embedded_language_formatting/mdx/jsx.mdx
+++ b/tests/format/misc/embedded_language_formatting/mdx/jsx.mdx
@@ -1,11 +1,13 @@
-<Heading hi='there'>Hello, world!
+<Heading hi='there'>
+Hello, world!
 </Heading>
 
 ---
 
 <Hello>
     test   <World />   test
-</Hello>123
+</Hello>
+123
 
 ---
 
@@ -14,25 +16,37 @@
 </Hello>
 <Hello>
     test   <World />   test
-</Hello>123
+</Hello>
+123
 
 ---
 
 <Hello>
     test   <World />   test
-</Hello>       123
+</Hello>
+123
 <Hello>
     test   <World />   test
-</Hello>       234
+</Hello>
+234
 
 ---
 
 <>
     test   <World        />   test
-</>       123
+</>
+123
 
 ---
 
 | Column 1 | Column 2 |
 |---|---|
 | Text | <Hello>Text</Hello> |
+
+---
+
+<Hello attr={{   ab: 'cd'}} />
+
+---
+
+Hello, {  javascript .    expression }!
diff --git a/tests/unit/__snapshots__/visitor-keys.js.snap b/tests/unit/__snapshots__/visitor-keys.js.snap
index 90d31eeec109..a1e7fff98ddc 100644
--- a/tests/unit/__snapshots__/visitor-keys.js.snap
+++ b/tests/unit/__snapshots__/visitor-keys.js.snap
@@ -1617,6 +1617,7 @@ exports[`visitor keys remark 1`] = `
   ],
   "break": [],
   "code": [],
+  "comment": [],
   "definition": [],
   "delete": [
     "children",
@@ -1624,8 +1625,6 @@ exports[`visitor keys remark 1`] = `
   "emphasis": [
     "children",
   ],
-  "esComment": [],
-  "export": [],
   "footnote": [
     "children",
   ],
@@ -1639,10 +1638,8 @@ exports[`visitor keys remark 1`] = `
   "html": [],
   "image": [],
   "imageReference": [],
-  "import": [],
   "inlineCode": [],
   "inlineMath": [],
-  "jsx": [],
   "link": [
     "children",
   ],
@@ -1657,6 +1654,21 @@ exports[`visitor keys remark 1`] = `
     "children",
   ],
   "math": [],
+  "mdxFlowExpression": [],
+  "mdxJsxAttribute": [
+    "value",
+  ],
+  "mdxJsxAttributeValueExpression": [],
+  "mdxJsxFlowElement": [
+    "attributes",
+    "children",
+  ],
+  "mdxJsxTextElement": [
+    "attributes",
+    "children",
+  ],
+  "mdxTextExpression": [],
+  "mdxjsEsm": [],
   "paragraph": [
     "children",
   ],