diff --git a/tests/basics/builtin-bin.py b/tests/basics/builtin_bin.py
similarity index 100%
rename from tests/basics/builtin-bin.py
rename to tests/basics/builtin_bin.py
diff --git a/tests/basics/builtin-callable.py b/tests/basics/builtin_callable.py
similarity index 100%
rename from tests/basics/builtin-callable.py
rename to tests/basics/builtin_callable.py
diff --git a/tests/basics/builtin-hex.py b/tests/basics/builtin_hex.py
similarity index 100%
rename from tests/basics/builtin-hex.py
rename to tests/basics/builtin_hex.py
diff --git a/tests/basics/builtin-len1.py b/tests/basics/builtin_len1.py
similarity index 100%
rename from tests/basics/builtin-len1.py
rename to tests/basics/builtin_len1.py
diff --git a/tests/basics/builtin-minmax.py b/tests/basics/builtin_minmax.py
similarity index 100%
rename from tests/basics/builtin-minmax.py
rename to tests/basics/builtin_minmax.py
diff --git a/tests/basics/builtin-oct.py b/tests/basics/builtin_oct.py
similarity index 100%
rename from tests/basics/builtin-oct.py
rename to tests/basics/builtin_oct.py
diff --git a/tests/basics/class-contains.py b/tests/basics/class_contains.py
similarity index 100%
rename from tests/basics/class-contains.py
rename to tests/basics/class_contains.py
diff --git a/tests/basics/class-emptybases.py b/tests/basics/class_emptybases.py
similarity index 100%
rename from tests/basics/class-emptybases.py
rename to tests/basics/class_emptybases.py
diff --git a/tests/basics/class-getattr.py b/tests/basics/class_getattr.py
similarity index 100%
rename from tests/basics/class-getattr.py
rename to tests/basics/class_getattr.py
diff --git a/tests/basics/class-staticclassmethod.py b/tests/basics/class_staticclassmethod.py
similarity index 100%
rename from tests/basics/class-staticclassmethod.py
rename to tests/basics/class_staticclassmethod.py
diff --git a/tests/basics/class-subclass-builtin.py b/tests/basics/class_subclass_builtin.py
similarity index 100%
rename from tests/basics/class-subclass-builtin.py
rename to tests/basics/class_subclass_builtin.py
diff --git a/tests/basics/class-super.py b/tests/basics/class_super.py
similarity index 100%
rename from tests/basics/class-super.py
rename to tests/basics/class_super.py
diff --git a/tests/basics/closure-defargs.py b/tests/basics/closure_defargs.py
similarity index 100%
rename from tests/basics/closure-defargs.py
rename to tests/basics/closure_defargs.py
diff --git a/tests/basics/compare-multi.py b/tests/basics/compare_multi.py
similarity index 100%
rename from tests/basics/compare-multi.py
rename to tests/basics/compare_multi.py
diff --git a/tests/basics/del-attr.py b/tests/basics/del_attr.py
similarity index 100%
rename from tests/basics/del-attr.py
rename to tests/basics/del_attr.py
diff --git a/tests/basics/del-deref.py b/tests/basics/del_deref.py
similarity index 100%
rename from tests/basics/del-deref.py
rename to tests/basics/del_deref.py
diff --git a/tests/basics/del-local.py b/tests/basics/del_local.py
similarity index 100%
rename from tests/basics/del-local.py
rename to tests/basics/del_local.py
diff --git a/tests/basics/del-name.py b/tests/basics/del_name.py
similarity index 100%
rename from tests/basics/del-name.py
rename to tests/basics/del_name.py
diff --git a/tests/basics/del-subscr.py b/tests/basics/del_subscr.py
similarity index 100%
rename from tests/basics/del-subscr.py
rename to tests/basics/del_subscr.py
diff --git a/tests/basics/dict-del.py b/tests/basics/dict_del.py
similarity index 100%
rename from tests/basics/dict-del.py
rename to tests/basics/dict_del.py
diff --git a/tests/basics/dict-from-iter.py b/tests/basics/dict_from_iter.py
similarity index 100%
rename from tests/basics/dict-from-iter.py
rename to tests/basics/dict_from_iter.py
diff --git a/tests/basics/dict-intern.py b/tests/basics/dict_intern.py
similarity index 100%
rename from tests/basics/dict-intern.py
rename to tests/basics/dict_intern.py
diff --git a/tests/basics/fun-annotations.py b/tests/basics/fun_annotations.py
similarity index 100%
rename from tests/basics/fun-annotations.py
rename to tests/basics/fun_annotations.py
diff --git a/tests/basics/fun-calldblstar.py b/tests/basics/fun_calldblstar.py
similarity index 100%
rename from tests/basics/fun-calldblstar.py
rename to tests/basics/fun_calldblstar.py
diff --git a/tests/basics/fun-callstar.py b/tests/basics/fun_callstar.py
similarity index 100%
rename from tests/basics/fun-callstar.py
rename to tests/basics/fun_callstar.py
diff --git a/tests/basics/fun-callstardblstar.py b/tests/basics/fun_callstardblstar.py
similarity index 100%
rename from tests/basics/fun-callstardblstar.py
rename to tests/basics/fun_callstardblstar.py
diff --git a/tests/basics/fun-defargs.py b/tests/basics/fun_defargs.py
similarity index 100%
rename from tests/basics/fun-defargs.py
rename to tests/basics/fun_defargs.py
diff --git a/tests/basics/fun-defargs2.py b/tests/basics/fun_defargs2.py
similarity index 100%
rename from tests/basics/fun-defargs2.py
rename to tests/basics/fun_defargs2.py
diff --git a/tests/basics/fun-kwargs.py b/tests/basics/fun_kwargs.py
similarity index 100%
rename from tests/basics/fun-kwargs.py
rename to tests/basics/fun_kwargs.py
diff --git a/tests/basics/fun-kwonly.py b/tests/basics/fun_kwonly.py
similarity index 100%
rename from tests/basics/fun-kwonly.py
rename to tests/basics/fun_kwonly.py
diff --git a/tests/basics/fun-kwonlydef.py b/tests/basics/fun_kwonlydef.py
similarity index 100%
rename from tests/basics/fun-kwonlydef.py
rename to tests/basics/fun_kwonlydef.py
diff --git a/tests/basics/fun-kwvarargs.py b/tests/basics/fun_kwvarargs.py
similarity index 100%
rename from tests/basics/fun-kwvarargs.py
rename to tests/basics/fun_kwvarargs.py
diff --git a/tests/basics/fun-varargs.py b/tests/basics/fun_varargs.py
similarity index 100%
rename from tests/basics/fun-varargs.py
rename to tests/basics/fun_varargs.py
diff --git a/tests/basics/gen-yield-from.py b/tests/basics/gen_yield_from.py
similarity index 100%
rename from tests/basics/gen-yield-from.py
rename to tests/basics/gen_yield_from.py
diff --git a/tests/basics/gen-yield-from-close.py b/tests/basics/gen_yield_from_close.py
similarity index 100%
rename from tests/basics/gen-yield-from-close.py
rename to tests/basics/gen_yield_from_close.py
diff --git a/tests/basics/gen-yield-from-ducktype.py b/tests/basics/gen_yield_from_ducktype.py
similarity index 100%
rename from tests/basics/gen-yield-from-ducktype.py
rename to tests/basics/gen_yield_from_ducktype.py
diff --git a/tests/basics/gen-yield-from-exc.py b/tests/basics/gen_yield_from_exc.py
similarity index 100%
rename from tests/basics/gen-yield-from-exc.py
rename to tests/basics/gen_yield_from_exc.py
diff --git a/tests/basics/gen-yield-from-iter.py b/tests/basics/gen_yield_from_iter.py
similarity index 100%
rename from tests/basics/gen-yield-from-iter.py
rename to tests/basics/gen_yield_from_iter.py
diff --git a/tests/basics/gen-yield-from-send.py b/tests/basics/gen_yield_from_send.py
similarity index 100%
rename from tests/basics/gen-yield-from-send.py
rename to tests/basics/gen_yield_from_send.py
diff --git a/tests/basics/gen-yield-from-throw.py b/tests/basics/gen_yield_from_throw.py
similarity index 100%
rename from tests/basics/gen-yield-from-throw.py
rename to tests/basics/gen_yield_from_throw.py
diff --git a/tests/basics/generator-args.py b/tests/basics/generator_args.py
similarity index 100%
rename from tests/basics/generator-args.py
rename to tests/basics/generator_args.py
diff --git a/tests/basics/generator-closure.py b/tests/basics/generator_closure.py
similarity index 100%
rename from tests/basics/generator-closure.py
rename to tests/basics/generator_closure.py
diff --git a/tests/basics/generator-exc.py b/tests/basics/generator_exc.py
similarity index 100%
rename from tests/basics/generator-exc.py
rename to tests/basics/generator_exc.py
diff --git a/tests/basics/generator-return.py b/tests/basics/generator_return.py
similarity index 100%
rename from tests/basics/generator-return.py
rename to tests/basics/generator_return.py
diff --git a/tests/basics/globals-del.py b/tests/basics/globals_del.py
similarity index 100%
rename from tests/basics/globals-del.py
rename to tests/basics/globals_del.py
diff --git a/tests/basics/int-big-and.py b/tests/basics/int_big_and.py
similarity index 100%
rename from tests/basics/int-big-and.py
rename to tests/basics/int_big_and.py
diff --git a/tests/basics/int-big-lshift.py b/tests/basics/int_big_lshift.py
similarity index 100%
rename from tests/basics/int-big-lshift.py
rename to tests/basics/int_big_lshift.py
diff --git a/tests/basics/int-big-mod.py b/tests/basics/int_big_mod.py
similarity index 100%
rename from tests/basics/int-big-mod.py
rename to tests/basics/int_big_mod.py
diff --git a/tests/basics/int-big-mul.py b/tests/basics/int_big_mul.py
similarity index 100%
rename from tests/basics/int-big-mul.py
rename to tests/basics/int_big_mul.py
diff --git a/tests/basics/int-bytes.py b/tests/basics/int_bytes.py
similarity index 100%
rename from tests/basics/int-bytes.py
rename to tests/basics/int_bytes.py
diff --git a/tests/basics/int-divzero.py b/tests/basics/int_divzero.py
similarity index 100%
rename from tests/basics/int-divzero.py
rename to tests/basics/int_divzero.py
diff --git a/tests/basics/int-long.py b/tests/basics/int_long.py
similarity index 100%
rename from tests/basics/int-long.py
rename to tests/basics/int_long.py
diff --git a/tests/basics/int-mpz.py b/tests/basics/int_mpz.py
similarity index 100%
rename from tests/basics/int-mpz.py
rename to tests/basics/int_mpz.py
diff --git a/tests/basics/int-small.py b/tests/basics/int_small.py
similarity index 100%
rename from tests/basics/int-small.py
rename to tests/basics/int_small.py
diff --git a/tests/basics/is-isnot.py b/tests/basics/is_isnot.py
similarity index 100%
rename from tests/basics/is-isnot.py
rename to tests/basics/is_isnot.py
diff --git a/tests/basics/iter-of-iter.py b/tests/basics/iter_of_iter.py
similarity index 100%
rename from tests/basics/iter-of-iter.py
rename to tests/basics/iter_of_iter.py
diff --git a/tests/basics/seq-unpack.py b/tests/basics/seq_unpack.py
similarity index 100%
rename from tests/basics/seq-unpack.py
rename to tests/basics/seq_unpack.py
diff --git a/tests/basics/string-compare.py b/tests/basics/string_compare.py
similarity index 100%
rename from tests/basics/string-compare.py
rename to tests/basics/string_compare.py
diff --git a/tests/basics/string-escape.py b/tests/basics/string_escape.py
similarity index 100%
rename from tests/basics/string-escape.py
rename to tests/basics/string_escape.py
diff --git a/tests/basics/string-format.py b/tests/basics/string_format.py
similarity index 100%
rename from tests/basics/string-format.py
rename to tests/basics/string_format.py
diff --git a/tests/basics/string-format-modulo.py b/tests/basics/string_format_modulo.py
similarity index 100%
rename from tests/basics/string-format-modulo.py
rename to tests/basics/string_format_modulo.py
diff --git a/tests/basics/string-join.py b/tests/basics/string_join.py
similarity index 100%
rename from tests/basics/string-join.py
rename to tests/basics/string_join.py
diff --git a/tests/basics/string-repr.py b/tests/basics/string_repr.py
similarity index 100%
rename from tests/basics/string-repr.py
rename to tests/basics/string_repr.py
diff --git a/tests/basics/string-slice.py b/tests/basics/string_slice.py
similarity index 100%
rename from tests/basics/string-slice.py
rename to tests/basics/string_slice.py
diff --git a/tests/basics/subclass-native1.py b/tests/basics/subclass_native1.py
similarity index 100%
rename from tests/basics/subclass-native1.py
rename to tests/basics/subclass_native1.py
diff --git a/tests/basics/subclass-native2-list.py b/tests/basics/subclass_native2_list.py
similarity index 100%
rename from tests/basics/subclass-native2-list.py
rename to tests/basics/subclass_native2_list.py
diff --git a/tests/basics/subclass-native2-tuple.py b/tests/basics/subclass_native2_tuple.py
similarity index 100%
rename from tests/basics/subclass-native2-tuple.py
rename to tests/basics/subclass_native2_tuple.py
diff --git a/tests/basics/subclass-native3.py b/tests/basics/subclass_native3.py
similarity index 100%
rename from tests/basics/subclass-native3.py
rename to tests/basics/subclass_native3.py
diff --git a/tests/basics/subclass-native4.py b/tests/basics/subclass_native4.py
similarity index 100%
rename from tests/basics/subclass-native4.py
rename to tests/basics/subclass_native4.py
diff --git a/tests/basics/subclass-native5.py b/tests/basics/subclass_native5.py
similarity index 100%
rename from tests/basics/subclass-native5.py
rename to tests/basics/subclass_native5.py
diff --git a/tests/basics/true-value.py b/tests/basics/true_value.py
similarity index 100%
rename from tests/basics/true-value.py
rename to tests/basics/true_value.py
diff --git a/tests/basics/try-as-var.py b/tests/basics/try_as_var.py
similarity index 100%
rename from tests/basics/try-as-var.py
rename to tests/basics/try_as_var.py
diff --git a/tests/basics/try-finally1.py b/tests/basics/try_finally1.py
similarity index 100%
rename from tests/basics/try-finally1.py
rename to tests/basics/try_finally1.py
diff --git a/tests/basics/try-finally-loops.py b/tests/basics/try_finally_loops.py
similarity index 100%
rename from tests/basics/try-finally-loops.py
rename to tests/basics/try_finally_loops.py
diff --git a/tests/basics/try-finally-return.py b/tests/basics/try_finally_return.py
similarity index 100%
rename from tests/basics/try-finally-return.py
rename to tests/basics/try_finally_return.py
diff --git a/tests/basics/try-reraise.py b/tests/basics/try_reraise.py
similarity index 100%
rename from tests/basics/try-reraise.py
rename to tests/basics/try_reraise.py
diff --git a/tests/basics/try-reraise2.py b/tests/basics/try_reraise2.py
similarity index 100%
rename from tests/basics/try-reraise2.py
rename to tests/basics/try_reraise2.py
diff --git a/tests/basics/with-break.py b/tests/basics/with_break.py
similarity index 100%
rename from tests/basics/with-break.py
rename to tests/basics/with_break.py
diff --git a/tests/basics/with-continue.py b/tests/basics/with_continue.py
similarity index 100%
rename from tests/basics/with-continue.py
rename to tests/basics/with_continue.py
diff --git a/tests/basics/with-return.py b/tests/basics/with_return.py
similarity index 100%
rename from tests/basics/with-return.py
rename to tests/basics/with_return.py
diff --git a/tests/float/builtin-float-minmax.py b/tests/float/builtin_float_minmax.py
similarity index 100%
rename from tests/float/builtin-float-minmax.py
rename to tests/float/builtin_float_minmax.py
diff --git a/tests/float/int-divzero.py b/tests/float/int_divzero.py
similarity index 100%
rename from tests/float/int-divzero.py
rename to tests/float/int_divzero.py
diff --git a/tests/float/list-index.py b/tests/float/list_index.py
similarity index 100%
rename from tests/float/list-index.py
rename to tests/float/list_index.py
diff --git a/tests/float/math-fun.py b/tests/float/math_fun.py
similarity index 100%
rename from tests/float/math-fun.py
rename to tests/float/math_fun.py
diff --git a/tests/float/math-fun-bool.py b/tests/float/math_fun_bool.py
similarity index 100%
rename from tests/float/math-fun-bool.py
rename to tests/float/math_fun_bool.py
diff --git a/tests/float/string-format.py b/tests/float/string_format.py
similarity index 100%
rename from tests/float/string-format.py
rename to tests/float/string_format.py
diff --git a/tests/float/string-format-modulo.py b/tests/float/string_format_modulo.py
similarity index 100%
rename from tests/float/string-format-modulo.py
rename to tests/float/string_format_modulo.py
diff --git a/tests/float/true-value.py b/tests/float/true_value.py
similarity index 100%
rename from tests/float/true-value.py
rename to tests/float/true_value.py
diff --git a/tests/import/import-pkg1.py b/tests/import/import_pkg1.py
similarity index 100%
rename from tests/import/import-pkg1.py
rename to tests/import/import_pkg1.py
diff --git a/tests/import/import-pkg2.py b/tests/import/import_pkg2.py
similarity index 100%
rename from tests/import/import-pkg2.py
rename to tests/import/import_pkg2.py
diff --git a/tests/import/import-pkg3.py b/tests/import/import_pkg3.py
similarity index 100%
rename from tests/import/import-pkg3.py
rename to tests/import/import_pkg3.py
diff --git a/tests/import/import-pkg4.py b/tests/import/import_pkg4.py
similarity index 100%
rename from tests/import/import-pkg4.py
rename to tests/import/import_pkg4.py
diff --git a/tests/import/import-pkg5.py b/tests/import/import_pkg5.py
similarity index 100%
rename from tests/import/import-pkg5.py
rename to tests/import/import_pkg5.py
diff --git a/tests/import/try-module.py b/tests/import/try_module.py
similarity index 100%
rename from tests/import/try-module.py
rename to tests/import/try_module.py
diff --git a/tests/io/file-iter.py b/tests/io/file_iter.py
similarity index 100%
rename from tests/io/file-iter.py
rename to tests/io/file_iter.py
diff --git a/tests/io/file-stdio.py b/tests/io/file_stdio.py
similarity index 100%
rename from tests/io/file-stdio.py
rename to tests/io/file_stdio.py
diff --git a/tests/io/file-with.py b/tests/io/file_with.py
similarity index 100%
rename from tests/io/file-with.py
rename to tests/io/file_with.py
diff --git a/tests/misc/rge-sm.py b/tests/misc/rge_sm.py
similarity index 100%
rename from tests/misc/rge-sm.py
rename to tests/misc/rge_sm.py