diff --git a/common/web/types/.eslintrc.cjs b/common/web/types/.eslintrc.cjs
index b28ba0941b1..4fd5954e495 100644
--- a/common/web/types/.eslintrc.cjs
+++ b/common/web/types/.eslintrc.cjs
@@ -1,13 +1,13 @@
 module.exports = {
   parserOptions: {
-    project: ["./tsconfig.json", "./test/tsconfig.json"],
+    project: ["./tsconfig.json", "./tests/tsconfig.json"],
   },
   ignorePatterns: [
     ".*/*",
     "build/*",
     "coverage/*",
     "node_modules/*",
-    "test/fixtures/*",
+    "tests/fixtures/*",
     "tools/*",
     "src/schemas/*"
   ],
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 75273aaa2c9..418840d1a85 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -88,7 +88,7 @@ function do_test() {
   fi
 
   eslint .
-  tsc --build test
+  tsc --build tests
 
   readonly C8_THRESHOLD=60
 
diff --git a/common/web/types/package.json b/common/web/types/package.json
index e9f7c412947..d6efc635039 100644
--- a/common/web/types/package.json
+++ b/common/web/types/package.json
@@ -23,7 +23,7 @@
     "build": "tsc -b",
     "build:schema": "ajv compile",
     "lint": "eslint .",
-    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --skip-full --reporter=lcov --reporter=text mocha"
+    "test": "npm run lint && cd tests && tsc -b && cd .. && c8 --skip-full --reporter=lcov --reporter=text mocha"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "typescript": "^5.4.5"
   },
   "mocha": {
-    "spec": "build/test/**/test-*.js",
+    "spec": "build/tests/**/*.tests.js",
     "require": [
       "source-map-support/register"
     ]
@@ -76,7 +76,7 @@
       "src/keyman-touch-layout/keyman-touch-layout-file-writer.ts",
       "src/osk/osk.ts",
       "src/schemas/*",
-      "test/"
+      "tests/"
     ]
   },
   "sideEffects": false
diff --git a/common/web/types/test/fixtures/kmx/khmer_angkor.kmx b/common/web/types/tests/fixtures/kmx/khmer_angkor.kmx
similarity index 100%
rename from common/web/types/test/fixtures/kmx/khmer_angkor.kmx
rename to common/web/types/tests/fixtures/kmx/khmer_angkor.kmx
diff --git a/common/web/types/test/fixtures/kvk/balochi_inpage.kvk b/common/web/types/tests/fixtures/kvk/balochi_inpage.kvk
similarity index 100%
rename from common/web/types/test/fixtures/kvk/balochi_inpage.kvk
rename to common/web/types/tests/fixtures/kvk/balochi_inpage.kvk
diff --git a/common/web/types/test/fixtures/kvk/khmer_angkor.kvk b/common/web/types/tests/fixtures/kvk/khmer_angkor.kvk
similarity index 100%
rename from common/web/types/test/fixtures/kvk/khmer_angkor.kvk
rename to common/web/types/tests/fixtures/kvk/khmer_angkor.kvk
diff --git a/common/web/types/test/helpers/index.ts b/common/web/types/tests/helpers/index.ts
similarity index 87%
rename from common/web/types/test/helpers/index.ts
rename to common/web/types/tests/helpers/index.ts
index 3e305eeca8a..717b2e75191 100644
--- a/common/web/types/test/helpers/index.ts
+++ b/common/web/types/tests/helpers/index.ts
@@ -9,5 +9,5 @@ import { fileURLToPath } from "url";
  * @param components One or more path components.
  */
 export function makePathToFixture(...components: string[]): string {
-  return fileURLToPath(new URL(path.join('..', '..', '..', 'test', 'fixtures', ...components), import.meta.url));
+  return fileURLToPath(new URL(path.join('..', '..', '..', 'tests', 'fixtures', ...components), import.meta.url));
 }
diff --git a/common/web/types/test/kmx/test-keyman-targets.ts b/common/web/types/tests/kmx/keyman-targets.tests.ts
similarity index 100%
rename from common/web/types/test/kmx/test-keyman-targets.ts
rename to common/web/types/tests/kmx/keyman-targets.tests.ts
diff --git a/common/web/types/test/kmx/test-kmx-file.ts b/common/web/types/tests/kmx/kmx-file.tests.ts
similarity index 100%
rename from common/web/types/test/kmx/test-kmx-file.ts
rename to common/web/types/tests/kmx/kmx-file.tests.ts
diff --git a/common/web/types/test/kvk/test-kvk-file.ts b/common/web/types/tests/kvk/kvk-file.tests.ts
similarity index 90%
rename from common/web/types/test/kvk/test-kvk-file.ts
rename to common/web/types/tests/kvk/kvk-file.tests.ts
index 8a1179b67b2..8e0387fefe3 100644
--- a/common/web/types/test/kvk/test-kvk-file.ts
+++ b/common/web/types/tests/kvk/kvk-file.tests.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import 'mocha';
 import { makePathToFixture } from '../helpers/index.js';
 import KvkFileReader from "../../src/kvk/kvk-file-reader.js";
-import { verify_balochi_inpage, verify_khmer_angkor } from './test-kvk-utils.js';
+import { verify_balochi_inpage, verify_khmer_angkor } from './kvk-utils.tests.js';
 
 describe('kvk-file-reader', function () {
   it('kvk-file-reader should read a valid file', function() {
diff --git a/common/web/types/test/kvk/test-kvk-utils.ts b/common/web/types/tests/kvk/kvk-utils.tests.ts
similarity index 100%
rename from common/web/types/test/kvk/test-kvk-utils.ts
rename to common/web/types/tests/kvk/kvk-utils.tests.ts
diff --git a/common/web/types/test/ldml-keyboard/test-pattern-parser.ts b/common/web/types/tests/ldml-keyboard/pattern-parser.tests.ts
similarity index 100%
rename from common/web/types/test/ldml-keyboard/test-pattern-parser.ts
rename to common/web/types/tests/ldml-keyboard/pattern-parser.tests.ts
diff --git a/common/web/types/test/ldml-keyboard/test-string-list.ts b/common/web/types/tests/ldml-keyboard/string-list.tests.ts
similarity index 100%
rename from common/web/types/test/ldml-keyboard/test-string-list.ts
rename to common/web/types/tests/ldml-keyboard/string-list.tests.ts
diff --git a/common/web/types/test/lexical-model-types.tests.ts b/common/web/types/tests/lexical-model-types.tests.ts
similarity index 100%
rename from common/web/types/test/lexical-model-types.tests.ts
rename to common/web/types/tests/lexical-model-types.tests.ts
diff --git a/common/web/types/test/tsconfig.json b/common/web/types/tests/tsconfig.json
similarity index 90%
rename from common/web/types/test/tsconfig.json
rename to common/web/types/tests/tsconfig.json
index 9678c49945f..45e5311fdc0 100644
--- a/common/web/types/test/tsconfig.json
+++ b/common/web/types/tests/tsconfig.json
@@ -4,13 +4,12 @@
   "compilerOptions": {
     "rootDir": ".",
     "rootDirs": ["./", "../src/"],
-    "outDir": "../build/test",
+    "outDir": "../build/tests",
     "baseUrl": ".",
     "strictNullChecks": false, // TODO: get rid of this as some point
     "allowSyntheticDefaultImports": true
   },
   "include": [
-    "**/test-*.ts",
     "**/*.tests.ts",
     "./helpers/*.ts",
   ],
diff --git a/common/web/types/test/util/test-unescape.ts b/common/web/types/tests/util/unescape.tests.ts
similarity index 100%
rename from common/web/types/test/util/test-unescape.ts
rename to common/web/types/tests/util/unescape.tests.ts