diff --git a/tests/bench/arrayop-1-list_inplace.py b/tests/internal_bench/arrayop-1-list_inplace.py
similarity index 100%
rename from tests/bench/arrayop-1-list_inplace.py
rename to tests/internal_bench/arrayop-1-list_inplace.py
diff --git a/tests/bench/arrayop-2-list_map.py b/tests/internal_bench/arrayop-2-list_map.py
similarity index 100%
rename from tests/bench/arrayop-2-list_map.py
rename to tests/internal_bench/arrayop-2-list_map.py
diff --git a/tests/bench/arrayop-3-bytearray_inplace.py b/tests/internal_bench/arrayop-3-bytearray_inplace.py
similarity index 100%
rename from tests/bench/arrayop-3-bytearray_inplace.py
rename to tests/internal_bench/arrayop-3-bytearray_inplace.py
diff --git a/tests/bench/arrayop-4-bytearray_map.py b/tests/internal_bench/arrayop-4-bytearray_map.py
similarity index 100%
rename from tests/bench/arrayop-4-bytearray_map.py
rename to tests/internal_bench/arrayop-4-bytearray_map.py
diff --git a/tests/bench/bench.py b/tests/internal_bench/bench.py
similarity index 100%
rename from tests/bench/bench.py
rename to tests/internal_bench/bench.py
diff --git a/tests/bench/bytealloc-1-bytes_n.py b/tests/internal_bench/bytealloc-1-bytes_n.py
similarity index 100%
rename from tests/bench/bytealloc-1-bytes_n.py
rename to tests/internal_bench/bytealloc-1-bytes_n.py
diff --git a/tests/bench/bytealloc-2-repeat.py b/tests/internal_bench/bytealloc-2-repeat.py
similarity index 100%
rename from tests/bench/bytealloc-2-repeat.py
rename to tests/internal_bench/bytealloc-2-repeat.py
diff --git a/tests/bench/bytebuf-1-inplace.py b/tests/internal_bench/bytebuf-1-inplace.py
similarity index 100%
rename from tests/bench/bytebuf-1-inplace.py
rename to tests/internal_bench/bytebuf-1-inplace.py
diff --git a/tests/bench/bytebuf-2-join_map_bytes.py b/tests/internal_bench/bytebuf-2-join_map_bytes.py
similarity index 100%
rename from tests/bench/bytebuf-2-join_map_bytes.py
rename to tests/internal_bench/bytebuf-2-join_map_bytes.py
diff --git a/tests/bench/bytebuf-3-bytarray_map.py b/tests/internal_bench/bytebuf-3-bytarray_map.py
similarity index 100%
rename from tests/bench/bytebuf-3-bytarray_map.py
rename to tests/internal_bench/bytebuf-3-bytarray_map.py
diff --git a/tests/bench/from_iter-1-list_bound.py b/tests/internal_bench/from_iter-1-list_bound.py
similarity index 100%
rename from tests/bench/from_iter-1-list_bound.py
rename to tests/internal_bench/from_iter-1-list_bound.py
diff --git a/tests/bench/from_iter-2-list_unbound.py b/tests/internal_bench/from_iter-2-list_unbound.py
similarity index 100%
rename from tests/bench/from_iter-2-list_unbound.py
rename to tests/internal_bench/from_iter-2-list_unbound.py
diff --git a/tests/bench/from_iter-3-tuple_bound.py b/tests/internal_bench/from_iter-3-tuple_bound.py
similarity index 100%
rename from tests/bench/from_iter-3-tuple_bound.py
rename to tests/internal_bench/from_iter-3-tuple_bound.py
diff --git a/tests/bench/from_iter-4-tuple_unbound.py b/tests/internal_bench/from_iter-4-tuple_unbound.py
similarity index 100%
rename from tests/bench/from_iter-4-tuple_unbound.py
rename to tests/internal_bench/from_iter-4-tuple_unbound.py
diff --git a/tests/bench/from_iter-5-bytes_bound.py b/tests/internal_bench/from_iter-5-bytes_bound.py
similarity index 100%
rename from tests/bench/from_iter-5-bytes_bound.py
rename to tests/internal_bench/from_iter-5-bytes_bound.py
diff --git a/tests/bench/from_iter-6-bytes_unbound.py b/tests/internal_bench/from_iter-6-bytes_unbound.py
similarity index 100%
rename from tests/bench/from_iter-6-bytes_unbound.py
rename to tests/internal_bench/from_iter-6-bytes_unbound.py
diff --git a/tests/bench/from_iter-7-bytearray_bound.py b/tests/internal_bench/from_iter-7-bytearray_bound.py
similarity index 100%
rename from tests/bench/from_iter-7-bytearray_bound.py
rename to tests/internal_bench/from_iter-7-bytearray_bound.py
diff --git a/tests/bench/from_iter-8-bytearray_unbound.py b/tests/internal_bench/from_iter-8-bytearray_unbound.py
similarity index 100%
rename from tests/bench/from_iter-8-bytearray_unbound.py
rename to tests/internal_bench/from_iter-8-bytearray_unbound.py
diff --git a/tests/bench/func_args-1.1-pos_1.py b/tests/internal_bench/func_args-1.1-pos_1.py
similarity index 100%
rename from tests/bench/func_args-1.1-pos_1.py
rename to tests/internal_bench/func_args-1.1-pos_1.py
diff --git a/tests/bench/func_args-1.2-pos_3.py b/tests/internal_bench/func_args-1.2-pos_3.py
similarity index 100%
rename from tests/bench/func_args-1.2-pos_3.py
rename to tests/internal_bench/func_args-1.2-pos_3.py
diff --git a/tests/bench/func_args-2-pos_default_2_of_3.py b/tests/internal_bench/func_args-2-pos_default_2_of_3.py
similarity index 100%
rename from tests/bench/func_args-2-pos_default_2_of_3.py
rename to tests/internal_bench/func_args-2-pos_default_2_of_3.py
diff --git a/tests/bench/func_args-3.1-kw_1.py b/tests/internal_bench/func_args-3.1-kw_1.py
similarity index 100%
rename from tests/bench/func_args-3.1-kw_1.py
rename to tests/internal_bench/func_args-3.1-kw_1.py
diff --git a/tests/bench/func_args-3.2-kw_3.py b/tests/internal_bench/func_args-3.2-kw_3.py
similarity index 100%
rename from tests/bench/func_args-3.2-kw_3.py
rename to tests/internal_bench/func_args-3.2-kw_3.py
diff --git a/tests/bench/func_builtin-1-enum_pos.py b/tests/internal_bench/func_builtin-1-enum_pos.py
similarity index 100%
rename from tests/bench/func_builtin-1-enum_pos.py
rename to tests/internal_bench/func_builtin-1-enum_pos.py
diff --git a/tests/bench/func_builtin-2-enum_kw.py b/tests/internal_bench/func_builtin-2-enum_kw.py
similarity index 100%
rename from tests/bench/func_builtin-2-enum_kw.py
rename to tests/internal_bench/func_builtin-2-enum_kw.py
diff --git a/tests/bench/funcall-1-inline.py b/tests/internal_bench/funcall-1-inline.py
similarity index 100%
rename from tests/bench/funcall-1-inline.py
rename to tests/internal_bench/funcall-1-inline.py
diff --git a/tests/bench/funcall-2-funcall.py b/tests/internal_bench/funcall-2-funcall.py
similarity index 100%
rename from tests/bench/funcall-2-funcall.py
rename to tests/internal_bench/funcall-2-funcall.py
diff --git a/tests/bench/funcall-3-funcall-local.py b/tests/internal_bench/funcall-3-funcall-local.py
similarity index 100%
rename from tests/bench/funcall-3-funcall-local.py
rename to tests/internal_bench/funcall-3-funcall-local.py
diff --git a/tests/bench/loop_count-1-range.py b/tests/internal_bench/loop_count-1-range.py
similarity index 100%
rename from tests/bench/loop_count-1-range.py
rename to tests/internal_bench/loop_count-1-range.py
diff --git a/tests/bench/loop_count-2-range_iter.py b/tests/internal_bench/loop_count-2-range_iter.py
similarity index 100%
rename from tests/bench/loop_count-2-range_iter.py
rename to tests/internal_bench/loop_count-2-range_iter.py
diff --git a/tests/bench/loop_count-3-while_up.py b/tests/internal_bench/loop_count-3-while_up.py
similarity index 100%
rename from tests/bench/loop_count-3-while_up.py
rename to tests/internal_bench/loop_count-3-while_up.py
diff --git a/tests/bench/loop_count-4-while_down_gt.py b/tests/internal_bench/loop_count-4-while_down_gt.py
similarity index 100%
rename from tests/bench/loop_count-4-while_down_gt.py
rename to tests/internal_bench/loop_count-4-while_down_gt.py
diff --git a/tests/bench/loop_count-5-while_down_ne.py b/tests/internal_bench/loop_count-5-while_down_ne.py
similarity index 100%
rename from tests/bench/loop_count-5-while_down_ne.py
rename to tests/internal_bench/loop_count-5-while_down_ne.py
diff --git a/tests/bench/loop_count-5.1-while_down_ne_localvar.py b/tests/internal_bench/loop_count-5.1-while_down_ne_localvar.py
similarity index 100%
rename from tests/bench/loop_count-5.1-while_down_ne_localvar.py
rename to tests/internal_bench/loop_count-5.1-while_down_ne_localvar.py
diff --git a/tests/bench/var-1-constant.py b/tests/internal_bench/var-1-constant.py
similarity index 100%
rename from tests/bench/var-1-constant.py
rename to tests/internal_bench/var-1-constant.py
diff --git a/tests/bench/var-2-global.py b/tests/internal_bench/var-2-global.py
similarity index 100%
rename from tests/bench/var-2-global.py
rename to tests/internal_bench/var-2-global.py
diff --git a/tests/bench/var-3-local.py b/tests/internal_bench/var-3-local.py
similarity index 100%
rename from tests/bench/var-3-local.py
rename to tests/internal_bench/var-3-local.py
diff --git a/tests/bench/var-4-arg.py b/tests/internal_bench/var-4-arg.py
similarity index 100%
rename from tests/bench/var-4-arg.py
rename to tests/internal_bench/var-4-arg.py
diff --git a/tests/bench/var-5-class-attr.py b/tests/internal_bench/var-5-class-attr.py
similarity index 100%
rename from tests/bench/var-5-class-attr.py
rename to tests/internal_bench/var-5-class-attr.py
diff --git a/tests/bench/var-6-instance-attr.py b/tests/internal_bench/var-6-instance-attr.py
similarity index 100%
rename from tests/bench/var-6-instance-attr.py
rename to tests/internal_bench/var-6-instance-attr.py
diff --git a/tests/bench/var-6.1-instance-attr-5.py b/tests/internal_bench/var-6.1-instance-attr-5.py
similarity index 100%
rename from tests/bench/var-6.1-instance-attr-5.py
rename to tests/internal_bench/var-6.1-instance-attr-5.py
diff --git a/tests/bench/var-7-instance-meth.py b/tests/internal_bench/var-7-instance-meth.py
similarity index 100%
rename from tests/bench/var-7-instance-meth.py
rename to tests/internal_bench/var-7-instance-meth.py
diff --git a/tests/bench/var-8-namedtuple-1st.py b/tests/internal_bench/var-8-namedtuple-1st.py
similarity index 100%
rename from tests/bench/var-8-namedtuple-1st.py
rename to tests/internal_bench/var-8-namedtuple-1st.py
diff --git a/tests/bench/var-8.1-namedtuple-5th.py b/tests/internal_bench/var-8.1-namedtuple-5th.py
similarity index 100%
rename from tests/bench/var-8.1-namedtuple-5th.py
rename to tests/internal_bench/var-8.1-namedtuple-5th.py
diff --git a/tests/run-bench-tests b/tests/run-internalbench.py
similarity index 98%
rename from tests/run-bench-tests
rename to tests/run-internalbench.py
index f4a6776cb..f6294572f 100755
--- a/tests/run-bench-tests
+++ b/tests/run-internalbench.py
@@ -74,7 +74,7 @@ def main():
     if len(args.files) == 0:
         if pyb is None:
             # run PC tests
-            test_dirs = ('bench',)
+            test_dirs = ('internal_bench',)
         else:
             # run pyboard tests
             test_dirs = ('basics', 'float', 'pyb')