diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 68e8c49ea..5b547c582 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -8,7 +8,7 @@
 		"tiddlywiki/confetti",
 		"tiddlywiki/dynannotate",
 		"tiddlywiki/tour",
-		"tiddlywiki/intrinsic-subplugin-tests"
+		"tiddlywiki/bundled-subplugin-tests"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
diff --git a/plugins/tiddlywiki/bundled-subplugin-tests/plugin.info b/plugins/tiddlywiki/bundled-subplugin-tests/plugin.info
new file mode 100644
index 000000000..e96ff06d9
--- /dev/null
+++ b/plugins/tiddlywiki/bundled-subplugin-tests/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/bundled-subplugin-tests",
+	"name": "bundled-subplugin-tests",
+	"description": "Bundled subplugin tests",
+	"list": "readme",
+	"stability": "STABILITY_1_EXPERIMENTAL"
+}
diff --git a/plugins/tiddlywiki/bundled-subplugin-tests/readme.tid b/plugins/tiddlywiki/bundled-subplugin-tests/readme.tid
new file mode 100644
index 000000000..44e146fc6
--- /dev/null
+++ b/plugins/tiddlywiki/bundled-subplugin-tests/readme.tid
@@ -0,0 +1,4 @@
+title: $:/plugins/tiddlywiki/bundled-subplugin-tests/readme
+
+Readme from $:/plugins/tiddlywiki/bundled-subplugin-tests
+
diff --git a/plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/plugin.info b/plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/plugin.info
similarity index 100%
rename from plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/plugin.info
rename to plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/plugin.info
diff --git a/plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/readme.tid b/plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/readme.tid
similarity index 100%
rename from plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/readme.tid
rename to plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/readme.tid
diff --git a/plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/test-subsubplugin/plugin.info b/plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/test-subsubplugin/plugin.info
similarity index 100%
rename from plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/test-subsubplugin/plugin.info
rename to plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/test-subsubplugin/plugin.info
diff --git a/plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/test-subsubplugin/readme.tid b/plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/test-subsubplugin/readme.tid
similarity index 100%
rename from plugins/tiddlywiki/intrinsic-subplugin-tests/test-subplugin/test-subsubplugin/readme.tid
rename to plugins/tiddlywiki/bundled-subplugin-tests/test-subplugin/test-subsubplugin/readme.tid
diff --git a/plugins/tiddlywiki/intrinsic-subplugin-tests/plugin.info b/plugins/tiddlywiki/intrinsic-subplugin-tests/plugin.info
deleted file mode 100644
index e48b51d57..000000000
--- a/plugins/tiddlywiki/intrinsic-subplugin-tests/plugin.info
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"title": "$:/plugins/tiddlywiki/intrinsic-subplugin-tests",
-	"name": "intrinsic-subplugin-tests",
-	"description": "Intrinsic subplugin tests",
-	"list": "readme",
-	"stability": "STABILITY_1_EXPERIMENTAL"
-}
diff --git a/plugins/tiddlywiki/intrinsic-subplugin-tests/readme.tid b/plugins/tiddlywiki/intrinsic-subplugin-tests/readme.tid
deleted file mode 100644
index 199faeb7a..000000000
--- a/plugins/tiddlywiki/intrinsic-subplugin-tests/readme.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/plugins/tiddlywiki/intrinsic-subplugin-tests/readme
-
-Readme from $:/plugins/tiddlywiki/intrinsic-subplugin-tests
-