diff --git a/encoding/jsonschema/decode_test.go b/encoding/jsonschema/decode_test.go
index 3c9472c23..9f64bcd53 100644
--- a/encoding/jsonschema/decode_test.go
+++ b/encoding/jsonschema/decode_test.go
@@ -61,7 +61,7 @@ import (
 // The #openapi tag in the txtar header enables OpenAPI extraction mode.
 func TestDecode(t *testing.T) {
 	test := cuetxtar.TxTarTest{
-		Root:   "./testdata",
+		Root:   "./testdata/txtar",
 		Name:   "decode",
 		Matrix: cuetdtest.FullMatrix,
 	}
diff --git a/encoding/jsonschema/testdata/basic.txtar b/encoding/jsonschema/testdata/txtar/basic.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/basic.txtar
rename to encoding/jsonschema/testdata/txtar/basic.txtar
diff --git a/encoding/jsonschema/testdata/boolschema.txtar b/encoding/jsonschema/testdata/txtar/boolschema.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/boolschema.txtar
rename to encoding/jsonschema/testdata/txtar/boolschema.txtar
diff --git a/encoding/jsonschema/testdata/boolschema_oldversion.txtar b/encoding/jsonschema/testdata/txtar/boolschema_oldversion.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/boolschema_oldversion.txtar
rename to encoding/jsonschema/testdata/txtar/boolschema_oldversion.txtar
diff --git a/encoding/jsonschema/testdata/boolschemaembed.txtar b/encoding/jsonschema/testdata/txtar/boolschemaembed.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/boolschemaembed.txtar
rename to encoding/jsonschema/testdata/txtar/boolschemaembed.txtar
diff --git a/encoding/jsonschema/testdata/constarray.txtar b/encoding/jsonschema/testdata/txtar/constarray.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/constarray.txtar
rename to encoding/jsonschema/testdata/txtar/constarray.txtar
diff --git a/encoding/jsonschema/testdata/constobj.txtar b/encoding/jsonschema/testdata/txtar/constobj.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/constobj.txtar
rename to encoding/jsonschema/testdata/txtar/constobj.txtar
diff --git a/encoding/jsonschema/testdata/contains.txtar b/encoding/jsonschema/testdata/txtar/contains.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/contains.txtar
rename to encoding/jsonschema/testdata/txtar/contains.txtar
diff --git a/encoding/jsonschema/testdata/def.txtar b/encoding/jsonschema/testdata/txtar/def.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/def.txtar
rename to encoding/jsonschema/testdata/txtar/def.txtar
diff --git a/encoding/jsonschema/testdata/emptyobj.txtar b/encoding/jsonschema/testdata/txtar/emptyobj.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/emptyobj.txtar
rename to encoding/jsonschema/testdata/txtar/emptyobj.txtar
diff --git a/encoding/jsonschema/testdata/emptyobjinanyof.txtar b/encoding/jsonschema/testdata/txtar/emptyobjinanyof.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/emptyobjinanyof.txtar
rename to encoding/jsonschema/testdata/txtar/emptyobjinanyof.txtar
diff --git a/encoding/jsonschema/testdata/enumexcluded.txtar b/encoding/jsonschema/testdata/txtar/enumexcluded.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/enumexcluded.txtar
rename to encoding/jsonschema/testdata/txtar/enumexcluded.txtar
diff --git a/encoding/jsonschema/testdata/id_in_oneOf.txtar b/encoding/jsonschema/testdata/txtar/id_in_oneOf.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/id_in_oneOf.txtar
rename to encoding/jsonschema/testdata/txtar/id_in_oneOf.txtar
diff --git a/encoding/jsonschema/testdata/id_scalar.txtar b/encoding/jsonschema/testdata/txtar/id_scalar.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/id_scalar.txtar
rename to encoding/jsonschema/testdata/txtar/id_scalar.txtar
diff --git a/encoding/jsonschema/testdata/impossibleallof.txtar b/encoding/jsonschema/testdata/txtar/impossibleallof.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/impossibleallof.txtar
rename to encoding/jsonschema/testdata/txtar/impossibleallof.txtar
diff --git a/encoding/jsonschema/testdata/issue3176.txtar b/encoding/jsonschema/testdata/txtar/issue3176.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/issue3176.txtar
rename to encoding/jsonschema/testdata/txtar/issue3176.txtar
diff --git a/encoding/jsonschema/testdata/issue3351.txtar b/encoding/jsonschema/testdata/txtar/issue3351.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/issue3351.txtar
rename to encoding/jsonschema/testdata/txtar/issue3351.txtar
diff --git a/encoding/jsonschema/testdata/list.txtar b/encoding/jsonschema/testdata/txtar/list.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/list.txtar
rename to encoding/jsonschema/testdata/txtar/list.txtar
diff --git a/encoding/jsonschema/testdata/newid_oldversion.txtar b/encoding/jsonschema/testdata/txtar/newid_oldversion.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/newid_oldversion.txtar
rename to encoding/jsonschema/testdata/txtar/newid_oldversion.txtar
diff --git a/encoding/jsonschema/testdata/num.txtar b/encoding/jsonschema/testdata/txtar/num.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/num.txtar
rename to encoding/jsonschema/testdata/txtar/num.txtar
diff --git a/encoding/jsonschema/testdata/numericenum.txtar b/encoding/jsonschema/testdata/txtar/numericenum.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/numericenum.txtar
rename to encoding/jsonschema/testdata/txtar/numericenum.txtar
diff --git a/encoding/jsonschema/testdata/object.txtar b/encoding/jsonschema/testdata/txtar/object.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/object.txtar
rename to encoding/jsonschema/testdata/txtar/object.txtar
diff --git a/encoding/jsonschema/testdata/oldid_newversion.txtar b/encoding/jsonschema/testdata/txtar/oldid_newversion.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/oldid_newversion.txtar
rename to encoding/jsonschema/testdata/txtar/oldid_newversion.txtar
diff --git a/encoding/jsonschema/testdata/openapi.txtar b/encoding/jsonschema/testdata/txtar/openapi.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/openapi.txtar
rename to encoding/jsonschema/testdata/txtar/openapi.txtar
diff --git a/encoding/jsonschema/testdata/ref.txtar b/encoding/jsonschema/testdata/txtar/ref.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/ref.txtar
rename to encoding/jsonschema/testdata/txtar/ref.txtar
diff --git a/encoding/jsonschema/testdata/refroot.txtar b/encoding/jsonschema/testdata/txtar/refroot.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/refroot.txtar
rename to encoding/jsonschema/testdata/txtar/refroot.txtar
diff --git a/encoding/jsonschema/testdata/refroot2.txtar b/encoding/jsonschema/testdata/txtar/refroot2.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/refroot2.txtar
rename to encoding/jsonschema/testdata/txtar/refroot2.txtar
diff --git a/encoding/jsonschema/testdata/required.txtar b/encoding/jsonschema/testdata/txtar/required.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/required.txtar
rename to encoding/jsonschema/testdata/txtar/required.txtar
diff --git a/encoding/jsonschema/testdata/type.txtar b/encoding/jsonschema/testdata/txtar/type.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/type.txtar
rename to encoding/jsonschema/testdata/txtar/type.txtar
diff --git a/encoding/jsonschema/testdata/typedis.txtar b/encoding/jsonschema/testdata/txtar/typedis.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/typedis.txtar
rename to encoding/jsonschema/testdata/txtar/typedis.txtar
diff --git a/encoding/jsonschema/testdata/typeexcluded.txtar b/encoding/jsonschema/testdata/txtar/typeexcluded.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/typeexcluded.txtar
rename to encoding/jsonschema/testdata/txtar/typeexcluded.txtar
diff --git a/encoding/jsonschema/testdata/unsupported.txtar b/encoding/jsonschema/testdata/txtar/unsupported.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/unsupported.txtar
rename to encoding/jsonschema/testdata/txtar/unsupported.txtar
diff --git a/encoding/jsonschema/testdata/used.txtar b/encoding/jsonschema/testdata/txtar/used.txtar
similarity index 100%
rename from encoding/jsonschema/testdata/used.txtar
rename to encoding/jsonschema/testdata/txtar/used.txtar