diff --git a/.c8rc.json b/.c8rc.json
index 3409cc347..6fcd26a66 100644
--- a/.c8rc.json
+++ b/.c8rc.json
@@ -1,7 +1,7 @@
 {
 	"all": true,
 	"exclude": [
-		"{coverage,examples,media,test,test-d,test-tap,types}/**",
+		"{coverage,examples,media,test,test-types,test-tap,types}/**",
 		"*.config.cjs",
 		"*.d.*(c|m)ts"
 	],
diff --git a/.xo-config.cjs b/.xo-config.cjs
index 50684ea66..896e8001f 100644
--- a/.xo-config.cjs
+++ b/.xo-config.cjs
@@ -50,7 +50,7 @@ module.exports = {
 			},
 		},
 		{
-			files: 'test-d/**',
+			files: 'test-types/**',
 			rules: {
 				'ava/assertion-arguments': 'off',
 				'ava/no-ignored-test-files': 'off',
diff --git a/ava.config.js b/ava.config.js
index 6a542a4e9..57992596c 100644
--- a/ava.config.js
+++ b/ava.config.js
@@ -1,6 +1,6 @@
 export default { // eslint-disable-line import/no-anonymous-default-export
 	files: ['test/**', '!test/**/{fixtures,helpers}/**'],
-	ignoredByWatcher: ['{coverage,docs,media,test-d,test-tap}/**'],
+	ignoredByWatcher: ['{coverage,docs,media,test-types,test-tap}/**'],
 	environmentVariables: {
 		AVA_FAKE_SCM_ROOT: '.fake-root', // This is an internal test flag.
 	},
diff --git a/test-d/.gitignore b/test-types/.gitignore
similarity index 100%
rename from test-d/.gitignore
rename to test-types/.gitignore
diff --git a/test-d/assertions-as-type-guards.cts b/test-types/import-in-cts/assertions-as-type-guards.cts
similarity index 100%
rename from test-d/assertions-as-type-guards.cts
rename to test-types/import-in-cts/assertions-as-type-guards.cts
diff --git a/test-d/context.cts b/test-types/import-in-cts/context.cts
similarity index 100%
rename from test-d/context.cts
rename to test-types/import-in-cts/context.cts
diff --git a/test-d/deep-equal.cts b/test-types/import-in-cts/deep-equal.cts
similarity index 100%
rename from test-d/deep-equal.cts
rename to test-types/import-in-cts/deep-equal.cts
diff --git a/test-d/implementation-result.cts b/test-types/import-in-cts/implementation-result.cts
similarity index 100%
rename from test-d/implementation-result.cts
rename to test-types/import-in-cts/implementation-result.cts
diff --git a/test-d/like.cts b/test-types/import-in-cts/like.cts
similarity index 100%
rename from test-d/like.cts
rename to test-types/import-in-cts/like.cts
diff --git a/test-d/macros.cts b/test-types/import-in-cts/macros.cts
similarity index 100%
rename from test-d/macros.cts
rename to test-types/import-in-cts/macros.cts
diff --git a/test-d/plugin.cts b/test-types/import-in-cts/plugin.cts
similarity index 100%
rename from test-d/plugin.cts
rename to test-types/import-in-cts/plugin.cts
diff --git a/test-d/snapshot.cts b/test-types/import-in-cts/snapshot.cts
similarity index 100%
rename from test-d/snapshot.cts
rename to test-types/import-in-cts/snapshot.cts
diff --git a/test-d/teardown.cts b/test-types/import-in-cts/teardown.cts
similarity index 100%
rename from test-d/teardown.cts
rename to test-types/import-in-cts/teardown.cts
diff --git a/test-d/throws.cts b/test-types/import-in-cts/throws.cts
similarity index 100%
rename from test-d/throws.cts
rename to test-types/import-in-cts/throws.cts
diff --git a/test-d/try-commit.cts b/test-types/import-in-cts/try-commit.cts
similarity index 100%
rename from test-d/try-commit.cts
rename to test-types/import-in-cts/try-commit.cts
diff --git a/test-d/assertions-as-type-guards.ts b/test-types/module/assertions-as-type-guards.ts
similarity index 100%
rename from test-d/assertions-as-type-guards.ts
rename to test-types/module/assertions-as-type-guards.ts
diff --git a/test-d/context.ts b/test-types/module/context.ts
similarity index 100%
rename from test-d/context.ts
rename to test-types/module/context.ts
diff --git a/test-d/deep-equal.ts b/test-types/module/deep-equal.ts
similarity index 100%
rename from test-d/deep-equal.ts
rename to test-types/module/deep-equal.ts
diff --git a/test-d/implementation-result.ts b/test-types/module/implementation-result.ts
similarity index 100%
rename from test-d/implementation-result.ts
rename to test-types/module/implementation-result.ts
diff --git a/test-d/like.ts b/test-types/module/like.ts
similarity index 100%
rename from test-d/like.ts
rename to test-types/module/like.ts
diff --git a/test-d/macros.ts b/test-types/module/macros.ts
similarity index 100%
rename from test-d/macros.ts
rename to test-types/module/macros.ts
diff --git a/test-d/plugin.ts b/test-types/module/plugin.ts
similarity index 100%
rename from test-d/plugin.ts
rename to test-types/module/plugin.ts
diff --git a/test-d/snapshot.ts b/test-types/module/snapshot.ts
similarity index 100%
rename from test-d/snapshot.ts
rename to test-types/module/snapshot.ts
diff --git a/test-d/teardown.ts b/test-types/module/teardown.ts
similarity index 100%
rename from test-d/teardown.ts
rename to test-types/module/teardown.ts
diff --git a/test-d/throws.ts b/test-types/module/throws.ts
similarity index 100%
rename from test-d/throws.ts
rename to test-types/module/throws.ts
diff --git a/test-d/try-commit.ts b/test-types/module/try-commit.ts
similarity index 100%
rename from test-d/try-commit.ts
rename to test-types/module/try-commit.ts
diff --git a/tsconfig.json b/tsconfig.json
index 072cb3801..5c8401b8f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
 	"extends": "@sindresorhus/tsconfig",
 	"include": [
 		"test",
-		"test-d",
-		"test-tap"
+		"test-tap",
+		"test-types"
 	]
 }