diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v
index 5bc0cdd28f..fa0207eeb5 100644
--- a/cmd/tools/vtest-self.v
+++ b/cmd/tools/vtest-self.v
@@ -53,7 +53,7 @@ const essential_list = [
 	'vlib/encoding/utf8/encoding_utf8_test.v',
 	'vlib/encoding/utf8/utf8_util_test.v',
 	'vlib/flag/flag_test.v',
-	'vlib/json/json_decode_test.v',
+	'vlib/json/tests/json_decode_test.v',
 	'vlib/math/math_test.v',
 	'vlib/net/tcp_test.v',
 	'vlib/net/http/http_test.v',
diff --git a/vlib/json/json_alias_test.v b/vlib/json/tests/json_alias_test.v
similarity index 100%
rename from vlib/json/json_alias_test.v
rename to vlib/json/tests/json_alias_test.v
diff --git a/vlib/json/json_decode_anon_struct_test.v b/vlib/json/tests/json_decode_anon_struct_test.v
similarity index 100%
rename from vlib/json/json_decode_anon_struct_test.v
rename to vlib/json/tests/json_decode_anon_struct_test.v
diff --git a/vlib/json/json_decode_embed_test.v b/vlib/json/tests/json_decode_embed_test.v
similarity index 100%
rename from vlib/json/json_decode_embed_test.v
rename to vlib/json/tests/json_decode_embed_test.v
diff --git a/vlib/json/json_decode_option_enum_test.v b/vlib/json/tests/json_decode_option_enum_test.v
similarity index 100%
rename from vlib/json/json_decode_option_enum_test.v
rename to vlib/json/tests/json_decode_option_enum_test.v
diff --git a/vlib/json/json_decode_struct_ptr_test.v b/vlib/json/tests/json_decode_struct_ptr_test.v
similarity index 100%
rename from vlib/json/json_decode_struct_ptr_test.v
rename to vlib/json/tests/json_decode_struct_ptr_test.v
diff --git a/vlib/json/json_decode_test.v b/vlib/json/tests/json_decode_test.v
similarity index 100%
rename from vlib/json/json_decode_test.v
rename to vlib/json/tests/json_decode_test.v
diff --git a/vlib/json/json_decode_with_encode_arg_test.v b/vlib/json/tests/json_decode_with_encode_arg_test.v
similarity index 100%
rename from vlib/json/json_decode_with_encode_arg_test.v
rename to vlib/json/tests/json_decode_with_encode_arg_test.v
diff --git a/vlib/json/json_decode_with_generic_array_test.v b/vlib/json/tests/json_decode_with_generic_array_test.v
similarity index 100%
rename from vlib/json/json_decode_with_generic_array_test.v
rename to vlib/json/tests/json_decode_with_generic_array_test.v
diff --git a/vlib/json/json_decode_with_generic_test.v b/vlib/json/tests/json_decode_with_generic_test.v
similarity index 100%
rename from vlib/json/json_decode_with_generic_test.v
rename to vlib/json/tests/json_decode_with_generic_test.v
diff --git a/vlib/json/json_decode_with_option_arg_test.v b/vlib/json/tests/json_decode_with_option_arg_test.v
similarity index 100%
rename from vlib/json/json_decode_with_option_arg_test.v
rename to vlib/json/tests/json_decode_with_option_arg_test.v
diff --git a/vlib/json/json_decode_with_sumtype_test.v b/vlib/json/tests/json_decode_with_sumtype_test.v
similarity index 100%
rename from vlib/json/json_decode_with_sumtype_test.v
rename to vlib/json/tests/json_decode_with_sumtype_test.v
diff --git a/vlib/json/json_embed_test.v b/vlib/json/tests/json_embed_test.v
similarity index 100%
rename from vlib/json/json_embed_test.v
rename to vlib/json/tests/json_embed_test.v
diff --git a/vlib/json/json_encode_embed_test.v b/vlib/json/tests/json_encode_embed_test.v
similarity index 100%
rename from vlib/json/json_encode_embed_test.v
rename to vlib/json/tests/json_encode_embed_test.v
diff --git a/vlib/json/json_encode_enum_test.v b/vlib/json/tests/json_encode_enum_test.v
similarity index 100%
rename from vlib/json/json_encode_enum_test.v
rename to vlib/json/tests/json_encode_enum_test.v
diff --git a/vlib/json/json_encode_map_test.v b/vlib/json/tests/json_encode_map_test.v
similarity index 100%
rename from vlib/json/json_encode_map_test.v
rename to vlib/json/tests/json_encode_map_test.v
diff --git a/vlib/json/json_encode_primite_test.v b/vlib/json/tests/json_encode_primite_test.v
similarity index 100%
rename from vlib/json/json_encode_primite_test.v
rename to vlib/json/tests/json_encode_primite_test.v
diff --git a/vlib/json/json_encode_ptr_test.v b/vlib/json/tests/json_encode_ptr_test.v
similarity index 100%
rename from vlib/json/json_encode_ptr_test.v
rename to vlib/json/tests/json_encode_ptr_test.v
diff --git a/vlib/json/json_encode_recursive_ptr_test.v b/vlib/json/tests/json_encode_recursive_ptr_test.v
similarity index 100%
rename from vlib/json/json_encode_recursive_ptr_test.v
rename to vlib/json/tests/json_encode_recursive_ptr_test.v
diff --git a/vlib/json/json_encode_struct_with_option_field_test.v b/vlib/json/tests/json_encode_struct_with_option_field_test.v
similarity index 100%
rename from vlib/json/json_encode_struct_with_option_field_test.v
rename to vlib/json/tests/json_encode_struct_with_option_field_test.v
diff --git a/vlib/json/json_encode_sumtype_test.v b/vlib/json/tests/json_encode_sumtype_test.v
similarity index 100%
rename from vlib/json/json_encode_sumtype_test.v
rename to vlib/json/tests/json_encode_sumtype_test.v
diff --git a/vlib/json/json_encode_with_mut_test.v b/vlib/json/tests/json_encode_with_mut_test.v
similarity index 100%
rename from vlib/json/json_encode_with_mut_test.v
rename to vlib/json/tests/json_encode_with_mut_test.v
diff --git a/vlib/json/json_encode_with_ptr_test.v b/vlib/json/tests/json_encode_with_ptr_test.v
similarity index 100%
rename from vlib/json/json_encode_with_ptr_test.v
rename to vlib/json/tests/json_encode_with_ptr_test.v
diff --git a/vlib/json/json_fixed_array_test.v b/vlib/json/tests/json_fixed_array_test.v
similarity index 100%
rename from vlib/json/json_fixed_array_test.v
rename to vlib/json/tests/json_fixed_array_test.v
diff --git a/vlib/json/json_generic_array_test.v b/vlib/json/tests/json_generic_array_test.v
similarity index 100%
rename from vlib/json/json_generic_array_test.v
rename to vlib/json/tests/json_generic_array_test.v
diff --git a/vlib/json/json_i32_test.v b/vlib/json/tests/json_i32_test.v
similarity index 100%
rename from vlib/json/json_i32_test.v
rename to vlib/json/tests/json_i32_test.v
diff --git a/vlib/json/json_omitempty_test.v b/vlib/json/tests/json_omitempty_test.v
similarity index 100%
rename from vlib/json/json_omitempty_test.v
rename to vlib/json/tests/json_omitempty_test.v
diff --git a/vlib/json/json_omitempty_types_test.v b/vlib/json/tests/json_omitempty_types_test.v
similarity index 100%
rename from vlib/json/json_omitempty_types_test.v
rename to vlib/json/tests/json_omitempty_types_test.v
diff --git a/vlib/json/json_option_alias_test.v b/vlib/json/tests/json_option_alias_test.v
similarity index 100%
rename from vlib/json/json_option_alias_test.v
rename to vlib/json/tests/json_option_alias_test.v
diff --git a/vlib/json/json_option_none_test.v b/vlib/json/tests/json_option_none_test.v
similarity index 100%
rename from vlib/json/json_option_none_test.v
rename to vlib/json/tests/json_option_none_test.v
diff --git a/vlib/json/json_option_raw_test.v b/vlib/json/tests/json_option_raw_test.v
similarity index 100%
rename from vlib/json/json_option_raw_test.v
rename to vlib/json/tests/json_option_raw_test.v
diff --git a/vlib/json/json_option_struct_test.v b/vlib/json/tests/json_option_struct_test.v
similarity index 100%
rename from vlib/json/json_option_struct_test.v
rename to vlib/json/tests/json_option_struct_test.v
diff --git a/vlib/json/json_option_test.v b/vlib/json/tests/json_option_test.v
similarity index 100%
rename from vlib/json/json_option_test.v
rename to vlib/json/tests/json_option_test.v
diff --git a/vlib/json/json_raw_test.v b/vlib/json/tests/json_raw_test.v
similarity index 100%
rename from vlib/json/json_raw_test.v
rename to vlib/json/tests/json_raw_test.v
diff --git a/vlib/json/json_struct_option_test.v b/vlib/json/tests/json_struct_option_test.v
similarity index 100%
rename from vlib/json/json_struct_option_test.v
rename to vlib/json/tests/json_struct_option_test.v
diff --git a/vlib/json/json_sumtype_test.v b/vlib/json/tests/json_sumtype_test.v
similarity index 100%
rename from vlib/json/json_sumtype_test.v
rename to vlib/json/tests/json_sumtype_test.v
diff --git a/vlib/json/json_test.v b/vlib/json/tests/json_test.v
similarity index 100%
rename from vlib/json/json_test.v
rename to vlib/json/tests/json_test.v