diff --git a/vlib/x/json2/any_test.v b/vlib/x/json2/tests/any_test.v
similarity index 100%
rename from vlib/x/json2/any_test.v
rename to vlib/x/json2/tests/any_test.v
diff --git a/vlib/x/json2/decode_struct_test.v b/vlib/x/json2/tests/decode_struct_test.v
similarity index 100%
rename from vlib/x/json2/decode_struct_test.v
rename to vlib/x/json2/tests/decode_struct_test.v
diff --git a/vlib/x/json2/decode_struct_todo_test.vv b/vlib/x/json2/tests/decode_struct_todo_test.vv
similarity index 100%
rename from vlib/x/json2/decode_struct_todo_test.vv
rename to vlib/x/json2/tests/decode_struct_todo_test.vv
diff --git a/vlib/x/json2/decoder_test.v b/vlib/x/json2/tests/decoder_test.v
similarity index 100%
rename from vlib/x/json2/decoder_test.v
rename to vlib/x/json2/tests/decoder_test.v
diff --git a/vlib/x/json2/encode_option_test.v b/vlib/x/json2/tests/encode_option_test.v
similarity index 100%
rename from vlib/x/json2/encode_option_test.v
rename to vlib/x/json2/tests/encode_option_test.v
diff --git a/vlib/x/json2/encode_struct_test.v b/vlib/x/json2/tests/encode_struct_test.v
similarity index 100%
rename from vlib/x/json2/encode_struct_test.v
rename to vlib/x/json2/tests/encode_struct_test.v
diff --git a/vlib/x/json2/encode_struct_todo_test.vv b/vlib/x/json2/tests/encode_struct_todo_test.vv
similarity index 100%
rename from vlib/x/json2/encode_struct_todo_test.vv
rename to vlib/x/json2/tests/encode_struct_todo_test.vv
diff --git a/vlib/x/json2/encoder_test.v b/vlib/x/json2/tests/encoder_test.v
similarity index 100%
rename from vlib/x/json2/encoder_test.v
rename to vlib/x/json2/tests/encoder_test.v
diff --git a/vlib/x/json2/integer_primitives_test.v b/vlib/x/json2/tests/integer_primitives_test.v
similarity index 100%
rename from vlib/x/json2/integer_primitives_test.v
rename to vlib/x/json2/tests/integer_primitives_test.v
diff --git a/vlib/x/json2/json2_test.v b/vlib/x/json2/tests/json2_test.v
similarity index 100%
rename from vlib/x/json2/json2_test.v
rename to vlib/x/json2/tests/json2_test.v
diff --git a/vlib/x/json2/json_module_compatibility_test/json_decode_todo_test.vv b/vlib/x/json2/tests/json_module_compatibility_test/json_decode_todo_test.vv
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_decode_todo_test.vv
rename to vlib/x/json2/tests/json_module_compatibility_test/json_decode_todo_test.vv
diff --git a/vlib/x/json2/json_module_compatibility_test/json_decode_with_encode_arg_test.v b/vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_encode_arg_test.v
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_decode_with_encode_arg_test.v
rename to vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_encode_arg_test.v
diff --git a/vlib/x/json2/json_module_compatibility_test/json_decode_with_generic_todo_test.vv b/vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_generic_todo_test.vv
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_decode_with_generic_todo_test.vv
rename to vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_generic_todo_test.vv
diff --git a/vlib/x/json2/json_module_compatibility_test/json_decode_with_option_arg_test.v b/vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_option_arg_test.v
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_decode_with_option_arg_test.v
rename to vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_option_arg_test.v
diff --git a/vlib/x/json2/json_module_compatibility_test/json_decode_with_sumtype_todo_test.vv b/vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_sumtype_todo_test.vv
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_decode_with_sumtype_todo_test.vv
rename to vlib/x/json2/tests/json_module_compatibility_test/json_decode_with_sumtype_todo_test.vv
diff --git a/vlib/x/json2/json_module_compatibility_test/json_test.v b/vlib/x/json2/tests/json_module_compatibility_test/json_test.v
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_test.v
rename to vlib/x/json2/tests/json_module_compatibility_test/json_test.v
diff --git a/vlib/x/json2/json_module_compatibility_test/json_todo_test.vv b/vlib/x/json2/tests/json_module_compatibility_test/json_todo_test.vv
similarity index 100%
rename from vlib/x/json2/json_module_compatibility_test/json_todo_test.vv
rename to vlib/x/json2/tests/json_module_compatibility_test/json_todo_test.vv