diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-argument.gd b/modules/gdscript/tests/scripts/parser/errors/missing_argument.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-argument.gd
rename to modules/gdscript/tests/scripts/parser/errors/missing_argument.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-argument.out b/modules/gdscript/tests/scripts/parser/errors/missing_argument.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-argument.out
rename to modules/gdscript/tests/scripts/parser/errors/missing_argument.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-closing-expr-paren.gd b/modules/gdscript/tests/scripts/parser/errors/missing_closing_expr_paren.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-closing-expr-paren.gd
rename to modules/gdscript/tests/scripts/parser/errors/missing_closing_expr_paren.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-closing-expr-paren.out b/modules/gdscript/tests/scripts/parser/errors/missing_closing_expr_paren.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-closing-expr-paren.out
rename to modules/gdscript/tests/scripts/parser/errors/missing_closing_expr_paren.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-colon.gd b/modules/gdscript/tests/scripts/parser/errors/missing_colon.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-colon.gd
rename to modules/gdscript/tests/scripts/parser/errors/missing_colon.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-colon.out b/modules/gdscript/tests/scripts/parser/errors/missing_colon.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-colon.out
rename to modules/gdscript/tests/scripts/parser/errors/missing_colon.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-paren-after-args.gd b/modules/gdscript/tests/scripts/parser/errors/missing_paren_after_args.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-paren-after-args.gd
rename to modules/gdscript/tests/scripts/parser/errors/missing_paren_after_args.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/missing-paren-after-args.out b/modules/gdscript/tests/scripts/parser/errors/missing_paren_after_args.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/missing-paren-after-args.out
rename to modules/gdscript/tests/scripts/parser/errors/missing_paren_after_args.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/mixing-tabs-spaces.gd b/modules/gdscript/tests/scripts/parser/errors/mixing_tabs_spaces.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/mixing-tabs-spaces.gd
rename to modules/gdscript/tests/scripts/parser/errors/mixing_tabs_spaces.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/mixing-tabs-spaces.out b/modules/gdscript/tests/scripts/parser/errors/mixing_tabs_spaces.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/mixing-tabs-spaces.out
rename to modules/gdscript/tests/scripts/parser/errors/mixing_tabs_spaces.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/nothing-after-dollar.gd b/modules/gdscript/tests/scripts/parser/errors/nothing_after_dollar.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/nothing-after-dollar.gd
rename to modules/gdscript/tests/scripts/parser/errors/nothing_after_dollar.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/nothing-after-dollar.out b/modules/gdscript/tests/scripts/parser/errors/nothing_after_dollar.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/nothing-after-dollar.out
rename to modules/gdscript/tests/scripts/parser/errors/nothing_after_dollar.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar.gd b/modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar.gd
rename to modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar.out b/modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar.out
rename to modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar.out
diff --git a/modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar-slash.gd b/modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar_slash.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar-slash.gd
rename to modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar_slash.gd
diff --git a/modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar-slash.out b/modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar_slash.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-errors/wrong-value-after-dollar-slash.out
rename to modules/gdscript/tests/scripts/parser/errors/wrong_value_after_dollar_slash.out
diff --git a/modules/gdscript/tests/scripts/parser-features/semicolon-as-end-statement.gd b/modules/gdscript/tests/scripts/parser/features/semicolon_as_end_statement.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-features/semicolon-as-end-statement.gd
rename to modules/gdscript/tests/scripts/parser/features/semicolon_as_end_statement.gd
diff --git a/modules/gdscript/tests/scripts/parser-features/semicolon-as-end-statement.out b/modules/gdscript/tests/scripts/parser/features/semicolon_as_end_statement.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-features/semicolon-as-end-statement.out
rename to modules/gdscript/tests/scripts/parser/features/semicolon_as_end_statement.out
diff --git a/modules/gdscript/tests/scripts/parser-features/trailing-comma-in-function-args.gd b/modules/gdscript/tests/scripts/parser/features/trailing_comma_in_function_args.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-features/trailing-comma-in-function-args.gd
rename to modules/gdscript/tests/scripts/parser/features/trailing_comma_in_function_args.gd
diff --git a/modules/gdscript/tests/scripts/parser-features/trailing-comma-in-function-args.out b/modules/gdscript/tests/scripts/parser/features/trailing_comma_in_function_args.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-features/trailing-comma-in-function-args.out
rename to modules/gdscript/tests/scripts/parser/features/trailing_comma_in_function_args.out
diff --git a/modules/gdscript/tests/scripts/parser-features/variable-declaration.gd b/modules/gdscript/tests/scripts/parser/features/variable_declaration.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-features/variable-declaration.gd
rename to modules/gdscript/tests/scripts/parser/features/variable_declaration.gd
diff --git a/modules/gdscript/tests/scripts/parser-features/variable-declaration.out b/modules/gdscript/tests/scripts/parser/features/variable_declaration.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-features/variable-declaration.out
rename to modules/gdscript/tests/scripts/parser/features/variable_declaration.out
diff --git a/modules/gdscript/tests/scripts/parser-warnings/unused-variable.gd b/modules/gdscript/tests/scripts/parser/warnings/unused_variable.gd
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-warnings/unused-variable.gd
rename to modules/gdscript/tests/scripts/parser/warnings/unused_variable.gd
diff --git a/modules/gdscript/tests/scripts/parser-warnings/unused-variable.out b/modules/gdscript/tests/scripts/parser/warnings/unused_variable.out
similarity index 100%
rename from modules/gdscript/tests/scripts/parser-warnings/unused-variable.out
rename to modules/gdscript/tests/scripts/parser/warnings/unused_variable.out