diff --git a/.mocharc.js b/.mocharc.js
index 4b1374481b4..accd94b6b85 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -1,7 +1,7 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'test';
 
 module.exports = {
-  require: ['./spec/javascripts/support/mocha.js'],
-  file: 'spec/javascripts/spec_helper.js',
+  require: ['./spec/javascript/support/mocha.js'],
+  file: 'spec/javascript/spec_helper.js',
   extension: ['js', 'jsx', 'ts', 'tsx'],
 };
diff --git a/package.json b/package.json
index 770ee51d421..0a582219ca5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "typecheck": "tsc",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:css": "stylelint 'app/assets/stylesheets/**/*.scss' 'app/javascript/**/*.scss'",
-    "test": "mocha 'spec/javascripts/**/**spec.+(j|t)s?(x)' 'app/javascript/packages/**/*.spec.+(j|t)s?(x)'",
+    "test": "mocha 'spec/javascript/**/**spec.+(j|t)s?(x)' 'app/javascript/packages/**/*.spec.+(j|t)s?(x)'",
     "normalize-yaml": "normalize-yaml",
     "generate-browsers-json": "./scripts/generate-browsers-json.js",
     "clean": "rm -rf public/packs/*",
diff --git a/spec/javascripts/app/webauthn_spec.js b/spec/javascript/app/webauthn_spec.js
similarity index 100%
rename from spec/javascripts/app/webauthn_spec.js
rename to spec/javascript/app/webauthn_spec.js
diff --git a/spec/javascripts/packages/device/index-spec.js b/spec/javascript/packages/device/index-spec.js
similarity index 100%
rename from spec/javascripts/packages/device/index-spec.js
rename to spec/javascript/packages/device/index-spec.js
diff --git a/spec/javascripts/packages/document-capture-polling/index-spec.js b/spec/javascript/packages/document-capture-polling/index-spec.js
similarity index 100%
rename from spec/javascripts/packages/document-capture-polling/index-spec.js
rename to spec/javascript/packages/document-capture-polling/index-spec.js
diff --git a/spec/javascripts/packages/document-capture/components/acuant-camera-spec.jsx b/spec/javascript/packages/document-capture/components/acuant-camera-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/acuant-camera-spec.jsx
rename to spec/javascript/packages/document-capture/components/acuant-camera-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/acuant-capture-canvas-spec.jsx b/spec/javascript/packages/document-capture/components/acuant-capture-canvas-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/acuant-capture-canvas-spec.jsx
rename to spec/javascript/packages/document-capture/components/acuant-capture-canvas-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/acuant-capture-spec.jsx b/spec/javascript/packages/document-capture/components/acuant-capture-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/acuant-capture-spec.jsx
rename to spec/javascript/packages/document-capture/components/acuant-capture-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/acuant-sdk-spec.js b/spec/javascript/packages/document-capture/components/acuant-sdk-spec.js
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/acuant-sdk-spec.js
rename to spec/javascript/packages/document-capture/components/acuant-sdk-spec.js
diff --git a/spec/javascripts/packages/document-capture/components/callback-on-mount-spec.jsx b/spec/javascript/packages/document-capture/components/callback-on-mount-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/callback-on-mount-spec.jsx
rename to spec/javascript/packages/document-capture/components/callback-on-mount-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/capture-advice-spec.jsx b/spec/javascript/packages/document-capture/components/capture-advice-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/capture-advice-spec.jsx
rename to spec/javascript/packages/document-capture/components/capture-advice-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/capture-troubleshooting-spec.jsx b/spec/javascript/packages/document-capture/components/capture-troubleshooting-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/capture-troubleshooting-spec.jsx
rename to spec/javascript/packages/document-capture/components/capture-troubleshooting-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/document-capture-spec.jsx b/spec/javascript/packages/document-capture/components/document-capture-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/document-capture-spec.jsx
rename to spec/javascript/packages/document-capture/components/document-capture-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/documents-step-spec.jsx b/spec/javascript/packages/document-capture/components/documents-step-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/documents-step-spec.jsx
rename to spec/javascript/packages/document-capture/components/documents-step-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/file-image-spec.jsx b/spec/javascript/packages/document-capture/components/file-image-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/file-image-spec.jsx
rename to spec/javascript/packages/document-capture/components/file-image-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/file-input-spec.jsx b/spec/javascript/packages/document-capture/components/file-input-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/file-input-spec.jsx
rename to spec/javascript/packages/document-capture/components/file-input-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/review-issues-step-spec.jsx b/spec/javascript/packages/document-capture/components/review-issues-step-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/review-issues-step-spec.jsx
rename to spec/javascript/packages/document-capture/components/review-issues-step-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/submission-complete-spec.jsx b/spec/javascript/packages/document-capture/components/submission-complete-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/submission-complete-spec.jsx
rename to spec/javascript/packages/document-capture/components/submission-complete-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/submission-interstitial-spec.jsx b/spec/javascript/packages/document-capture/components/submission-interstitial-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/submission-interstitial-spec.jsx
rename to spec/javascript/packages/document-capture/components/submission-interstitial-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/submission-spec.jsx b/spec/javascript/packages/document-capture/components/submission-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/submission-spec.jsx
rename to spec/javascript/packages/document-capture/components/submission-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/suspense-error-boundary-spec.jsx b/spec/javascript/packages/document-capture/components/suspense-error-boundary-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/suspense-error-boundary-spec.jsx
rename to spec/javascript/packages/document-capture/components/suspense-error-boundary-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/components/warning-spec.jsx b/spec/javascript/packages/document-capture/components/warning-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/components/warning-spec.jsx
rename to spec/javascript/packages/document-capture/components/warning-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/context/acuant-spec.jsx b/spec/javascript/packages/document-capture/context/acuant-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/acuant-spec.jsx
rename to spec/javascript/packages/document-capture/context/acuant-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/context/device-spec.jsx b/spec/javascript/packages/document-capture/context/device-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/device-spec.jsx
rename to spec/javascript/packages/document-capture/context/device-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/context/failed-capture-attempts-spec.jsx b/spec/javascript/packages/document-capture/context/failed-capture-attempts-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/failed-capture-attempts-spec.jsx
rename to spec/javascript/packages/document-capture/context/failed-capture-attempts-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/context/file-base64-cache-spec.js b/spec/javascript/packages/document-capture/context/file-base64-cache-spec.js
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/file-base64-cache-spec.js
rename to spec/javascript/packages/document-capture/context/file-base64-cache-spec.js
diff --git a/spec/javascripts/packages/document-capture/context/index-spec.js b/spec/javascript/packages/document-capture/context/index-spec.js
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/index-spec.js
rename to spec/javascript/packages/document-capture/context/index-spec.js
diff --git a/spec/javascripts/packages/document-capture/context/service-provider-spec.jsx b/spec/javascript/packages/document-capture/context/service-provider-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/service-provider-spec.jsx
rename to spec/javascript/packages/document-capture/context/service-provider-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/context/upload-spec.jsx b/spec/javascript/packages/document-capture/context/upload-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/context/upload-spec.jsx
rename to spec/javascript/packages/document-capture/context/upload-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/higher-order/with-background-encrypted-upload-spec.jsx b/spec/javascript/packages/document-capture/higher-order/with-background-encrypted-upload-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/higher-order/with-background-encrypted-upload-spec.jsx
rename to spec/javascript/packages/document-capture/higher-order/with-background-encrypted-upload-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/higher-order/with-props-spec.jsx b/spec/javascript/packages/document-capture/higher-order/with-props-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/higher-order/with-props-spec.jsx
rename to spec/javascript/packages/document-capture/higher-order/with-props-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/hooks/use-async-spec.jsx b/spec/javascript/packages/document-capture/hooks/use-async-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/hooks/use-async-spec.jsx
rename to spec/javascript/packages/document-capture/hooks/use-async-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/hooks/use-cookie-spec.jsx b/spec/javascript/packages/document-capture/hooks/use-cookie-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/hooks/use-cookie-spec.jsx
rename to spec/javascript/packages/document-capture/hooks/use-cookie-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/hooks/use-counter-spec.jsx b/spec/javascript/packages/document-capture/hooks/use-counter-spec.jsx
similarity index 100%
rename from spec/javascripts/packages/document-capture/hooks/use-counter-spec.jsx
rename to spec/javascript/packages/document-capture/hooks/use-counter-spec.jsx
diff --git a/spec/javascripts/packages/document-capture/hooks/use-previous.spec.js b/spec/javascript/packages/document-capture/hooks/use-previous.spec.js
similarity index 100%
rename from spec/javascripts/packages/document-capture/hooks/use-previous.spec.js
rename to spec/javascript/packages/document-capture/hooks/use-previous.spec.js
diff --git a/spec/javascripts/packages/document-capture/services/upload-spec.js b/spec/javascript/packages/document-capture/services/upload-spec.js
similarity index 100%
rename from spec/javascripts/packages/document-capture/services/upload-spec.js
rename to spec/javascript/packages/document-capture/services/upload-spec.js
diff --git a/spec/javascripts/packages/masked-text-toggle/index-spec.js b/spec/javascript/packages/masked-text-toggle/index-spec.js
similarity index 100%
rename from spec/javascripts/packages/masked-text-toggle/index-spec.js
rename to spec/javascript/packages/masked-text-toggle/index-spec.js
diff --git a/spec/javascripts/packs/form-steps-wait-spec.js b/spec/javascript/packs/form-steps-wait-spec.js
similarity index 100%
rename from spec/javascripts/packs/form-steps-wait-spec.js
rename to spec/javascript/packs/form-steps-wait-spec.js
diff --git a/spec/javascripts/packs/pw-strength-spec.js b/spec/javascript/packs/pw-strength-spec.js
similarity index 100%
rename from spec/javascripts/packs/pw-strength-spec.js
rename to spec/javascript/packs/pw-strength-spec.js
diff --git a/spec/javascripts/packs/webauthn-setup-spec.js b/spec/javascript/packs/webauthn-setup-spec.js
similarity index 100%
rename from spec/javascripts/packs/webauthn-setup-spec.js
rename to spec/javascript/packs/webauthn-setup-spec.js
diff --git a/spec/javascripts/packs/webauthn-unhide-spec.js b/spec/javascript/packs/webauthn-unhide-spec.js
similarity index 100%
rename from spec/javascripts/packs/webauthn-unhide-spec.js
rename to spec/javascript/packs/webauthn-unhide-spec.js
diff --git a/spec/javascripts/spec_helper.d.ts b/spec/javascript/spec_helper.d.ts
similarity index 100%
rename from spec/javascripts/spec_helper.d.ts
rename to spec/javascript/spec_helper.d.ts
diff --git a/spec/javascripts/spec_helper.js b/spec/javascript/spec_helper.js
similarity index 100%
rename from spec/javascripts/spec_helper.js
rename to spec/javascript/spec_helper.js
diff --git a/spec/javascripts/support/console.js b/spec/javascript/support/console.js
similarity index 100%
rename from spec/javascripts/support/console.js
rename to spec/javascript/support/console.js
diff --git a/spec/javascripts/support/document-capture.jsx b/spec/javascript/support/document-capture.jsx
similarity index 100%
rename from spec/javascripts/support/document-capture.jsx
rename to spec/javascript/support/document-capture.jsx
diff --git a/spec/javascripts/support/dom.js b/spec/javascript/support/dom.js
similarity index 100%
rename from spec/javascripts/support/dom.js
rename to spec/javascript/support/dom.js
diff --git a/spec/javascripts/support/file.js b/spec/javascript/support/file.js
similarity index 100%
rename from spec/javascripts/support/file.js
rename to spec/javascript/support/file.js
diff --git a/spec/javascripts/support/mocha.js b/spec/javascript/support/mocha.js
similarity index 100%
rename from spec/javascripts/support/mocha.js
rename to spec/javascript/support/mocha.js
diff --git a/spec/javascripts/support/sinon.ts b/spec/javascript/support/sinon.ts
similarity index 100%
rename from spec/javascripts/support/sinon.ts
rename to spec/javascript/support/sinon.ts
diff --git a/tsconfig.json b/tsconfig.json
index 54510067dec..ef74bbd2346 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,8 +21,8 @@
     "app/javascript/app",
     "app/javascript/packages",
     "app/javascript/packs",
-    "spec/javascripts/spec_helper.d.ts",
-    "spec/javascripts/**/*.ts",
+    "spec/javascript/spec_helper.d.ts",
+    "spec/javascript/**/*.ts",
     "scripts"
   ],
   "exclude": [