diff --git a/.changeset/itchy-brooms-end.md b/.changeset/itchy-brooms-end.md
new file mode 100644
index 0000000000..632eb33d97
--- /dev/null
+++ b/.changeset/itchy-brooms-end.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fix issue when using `.jsx` files inside tests
diff --git a/.changeset/shaggy-buses-juggle.md b/.changeset/shaggy-buses-juggle.md
new file mode 100644
index 0000000000..f43747a877
--- /dev/null
+++ b/.changeset/shaggy-buses-juggle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-graphiql': patch
+---
+
+Internal refactor
diff --git a/packages/app/src/components/Root/LogoIcon.tsx b/packages/app/src/components/Root/LogoIcon.jsx
similarity index 96%
rename from packages/app/src/components/Root/LogoIcon.tsx
rename to packages/app/src/components/Root/LogoIcon.jsx
index 073cf6edad..5ec778cca2 100644
--- a/packages/app/src/components/Root/LogoIcon.tsx
+++ b/packages/app/src/components/Root/LogoIcon.jsx
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// @ts-check
+// NOTE: This file is intentionally .jsx, so that there is one file in this repo where we make sure .jsx files work.
 
 import React from 'react';
 import { makeStyles } from '@material-ui/core';
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index 028cc8d389..9d113989ff 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -131,10 +131,60 @@ async function getProjectConfig(targetPath, displayName) {
     },
 
     transform: {
-      '\\.(js|jsx|ts|tsx|mjs|cjs)$': [
+      '\\.(mjs|cjs|js)$': [
         require.resolve('./jestSwcTransform'),
         {
           sourceMaps: envOptions.enableSourceMaps || envOptions.nextTests,
+          jsc: {
+            parser: {
+              syntax: 'ecmascript',
+            },
+          },
+        },
+      ],
+      '\\.jsx$': [
+        require.resolve('./jestSwcTransform'),
+        {
+          sourceMaps: envOptions.enableSourceMaps || envOptions.nextTests,
+          jsc: {
+            parser: {
+              syntax: 'ecmascript',
+              jsx: true,
+            },
+            transform: {
+              react: {
+                runtime: 'automatic',
+              },
+            },
+          },
+        },
+      ],
+      '\\.ts$': [
+        require.resolve('./jestSwcTransform'),
+        {
+          sourceMaps: envOptions.enableSourceMaps || envOptions.nextTests,
+          jsc: {
+            parser: {
+              syntax: 'typescript',
+            },
+          },
+        },
+      ],
+      '\\.tsx$': [
+        require.resolve('./jestSwcTransform'),
+        {
+          sourceMaps: envOptions.enableSourceMaps || envOptions.nextTests,
+          jsc: {
+            parser: {
+              syntax: 'typescript',
+              tsx: true,
+            },
+            transform: {
+              react: {
+                runtime: 'automatic',
+              },
+            },
+          },
         },
       ],
       '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg|eot|woff|woff2|ttf)$':