diff --git a/tests/gem5/arm-boot-tests/test_linux_boot.py b/tests/gem5/arm_boot_tests/test_linux_boot.py
similarity index 100%
rename from tests/gem5/arm-boot-tests/test_linux_boot.py
rename to tests/gem5/arm_boot_tests/test_linux_boot.py
diff --git a/tests/gem5/dram-lowp/ref/simout b/tests/gem5/dram_lowp/ref/simout
similarity index 100%
rename from tests/gem5/dram-lowp/ref/simout
rename to tests/gem5/dram_lowp/ref/simout
diff --git a/tests/gem5/dram-lowp/test_dram_lowp.py b/tests/gem5/dram_lowp/test_dram_lowp.py
similarity index 100%
rename from tests/gem5/dram-lowp/test_dram_lowp.py
rename to tests/gem5/dram_lowp/test_dram_lowp.py
diff --git a/tests/gem5/gem5-resources/test_download_resources.py b/tests/gem5/gem5_resources/test_download_resources.py
similarity index 100%
rename from tests/gem5/gem5-resources/test_download_resources.py
rename to tests/gem5/gem5_resources/test_download_resources.py
diff --git a/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py b/tests/gem5/kvm_fork_tests/test_kvm_fork_run.py
similarity index 100%
rename from tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
rename to tests/gem5/kvm_fork_tests/test_kvm_fork_run.py
diff --git a/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py b/tests/gem5/kvm_switch_tests/test_kvm_cpu_switch.py
similarity index 100%
rename from tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
rename to tests/gem5/kvm_switch_tests/test_kvm_cpu_switch.py
diff --git a/tests/gem5/parsec-benchmarks/test_parsec.py b/tests/gem5/parsec_benchmarks/test_parsec.py
similarity index 100%
rename from tests/gem5/parsec-benchmarks/test_parsec.py
rename to tests/gem5/parsec_benchmarks/test_parsec.py
diff --git a/tests/gem5/replacement-policies/README b/tests/gem5/replacement_policies/README
similarity index 100%
rename from tests/gem5/replacement-policies/README
rename to tests/gem5/replacement_policies/README
diff --git a/tests/gem5/replacement-policies/cache_hierarchies.py b/tests/gem5/replacement_policies/cache_hierarchies.py
similarity index 100%
rename from tests/gem5/replacement-policies/cache_hierarchies.py
rename to tests/gem5/replacement_policies/cache_hierarchies.py
diff --git a/tests/gem5/replacement-policies/ref/fifo_test1_ld b/tests/gem5/replacement_policies/ref/fifo_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/fifo_test1_ld
rename to tests/gem5/replacement_policies/ref/fifo_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/fifo_test1_st b/tests/gem5/replacement_policies/ref/fifo_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/fifo_test1_st
rename to tests/gem5/replacement_policies/ref/fifo_test1_st
diff --git a/tests/gem5/replacement-policies/ref/fifo_test2_ld b/tests/gem5/replacement_policies/ref/fifo_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/fifo_test2_ld
rename to tests/gem5/replacement_policies/ref/fifo_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/fifo_test2_st b/tests/gem5/replacement_policies/ref/fifo_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/fifo_test2_st
rename to tests/gem5/replacement_policies/ref/fifo_test2_st
diff --git a/tests/gem5/replacement-policies/ref/lfu_test1_ld b/tests/gem5/replacement_policies/ref/lfu_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lfu_test1_ld
rename to tests/gem5/replacement_policies/ref/lfu_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/lfu_test1_st b/tests/gem5/replacement_policies/ref/lfu_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lfu_test1_st
rename to tests/gem5/replacement_policies/ref/lfu_test1_st
diff --git a/tests/gem5/replacement-policies/ref/lfu_test2_ld b/tests/gem5/replacement_policies/ref/lfu_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lfu_test2_ld
rename to tests/gem5/replacement_policies/ref/lfu_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/lfu_test2_st b/tests/gem5/replacement_policies/ref/lfu_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lfu_test2_st
rename to tests/gem5/replacement_policies/ref/lfu_test2_st
diff --git a/tests/gem5/replacement-policies/ref/lfu_test3_ld b/tests/gem5/replacement_policies/ref/lfu_test3_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lfu_test3_ld
rename to tests/gem5/replacement_policies/ref/lfu_test3_ld
diff --git a/tests/gem5/replacement-policies/ref/lfu_test3_st b/tests/gem5/replacement_policies/ref/lfu_test3_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lfu_test3_st
rename to tests/gem5/replacement_policies/ref/lfu_test3_st
diff --git a/tests/gem5/replacement-policies/ref/lip_test1_ld b/tests/gem5/replacement_policies/ref/lip_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lip_test1_ld
rename to tests/gem5/replacement_policies/ref/lip_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/lip_test1_st b/tests/gem5/replacement_policies/ref/lip_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lip_test1_st
rename to tests/gem5/replacement_policies/ref/lip_test1_st
diff --git a/tests/gem5/replacement-policies/ref/lru_test1_ld b/tests/gem5/replacement_policies/ref/lru_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test1_ld
rename to tests/gem5/replacement_policies/ref/lru_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/lru_test1_st b/tests/gem5/replacement_policies/ref/lru_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test1_st
rename to tests/gem5/replacement_policies/ref/lru_test1_st
diff --git a/tests/gem5/replacement-policies/ref/lru_test2_ld b/tests/gem5/replacement_policies/ref/lru_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test2_ld
rename to tests/gem5/replacement_policies/ref/lru_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/lru_test2_st b/tests/gem5/replacement_policies/ref/lru_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test2_st
rename to tests/gem5/replacement_policies/ref/lru_test2_st
diff --git a/tests/gem5/replacement-policies/ref/lru_test3_ld b/tests/gem5/replacement_policies/ref/lru_test3_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test3_ld
rename to tests/gem5/replacement_policies/ref/lru_test3_ld
diff --git a/tests/gem5/replacement-policies/ref/lru_test3_st b/tests/gem5/replacement_policies/ref/lru_test3_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test3_st
rename to tests/gem5/replacement_policies/ref/lru_test3_st
diff --git a/tests/gem5/replacement-policies/ref/lru_test4_ld b/tests/gem5/replacement_policies/ref/lru_test4_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test4_ld
rename to tests/gem5/replacement_policies/ref/lru_test4_ld
diff --git a/tests/gem5/replacement-policies/ref/lru_test4_st b/tests/gem5/replacement_policies/ref/lru_test4_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/lru_test4_st
rename to tests/gem5/replacement_policies/ref/lru_test4_st
diff --git a/tests/gem5/replacement-policies/ref/mru_test1_ld b/tests/gem5/replacement_policies/ref/mru_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/mru_test1_ld
rename to tests/gem5/replacement_policies/ref/mru_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/mru_test1_st b/tests/gem5/replacement_policies/ref/mru_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/mru_test1_st
rename to tests/gem5/replacement_policies/ref/mru_test1_st
diff --git a/tests/gem5/replacement-policies/ref/mru_test2_ld b/tests/gem5/replacement_policies/ref/mru_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/mru_test2_ld
rename to tests/gem5/replacement_policies/ref/mru_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/mru_test2_st b/tests/gem5/replacement_policies/ref/mru_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/mru_test2_st
rename to tests/gem5/replacement_policies/ref/mru_test2_st
diff --git a/tests/gem5/replacement-policies/ref/nru_test1_ld b/tests/gem5/replacement_policies/ref/nru_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/nru_test1_ld
rename to tests/gem5/replacement_policies/ref/nru_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/nru_test1_st b/tests/gem5/replacement_policies/ref/nru_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/nru_test1_st
rename to tests/gem5/replacement_policies/ref/nru_test1_st
diff --git a/tests/gem5/replacement-policies/ref/rrip_test1_ld b/tests/gem5/replacement_policies/ref/rrip_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/rrip_test1_ld
rename to tests/gem5/replacement_policies/ref/rrip_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/rrip_test1_st b/tests/gem5/replacement_policies/ref/rrip_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/rrip_test1_st
rename to tests/gem5/replacement_policies/ref/rrip_test1_st
diff --git a/tests/gem5/replacement-policies/ref/rrip_test2_ld b/tests/gem5/replacement_policies/ref/rrip_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/rrip_test2_ld
rename to tests/gem5/replacement_policies/ref/rrip_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/rrip_test2_st b/tests/gem5/replacement_policies/ref/rrip_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/rrip_test2_st
rename to tests/gem5/replacement_policies/ref/rrip_test2_st
diff --git a/tests/gem5/replacement-policies/ref/second_chance_test1_ld b/tests/gem5/replacement_policies/ref/second_chance_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/second_chance_test1_ld
rename to tests/gem5/replacement_policies/ref/second_chance_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/second_chance_test1_st b/tests/gem5/replacement_policies/ref/second_chance_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/second_chance_test1_st
rename to tests/gem5/replacement_policies/ref/second_chance_test1_st
diff --git a/tests/gem5/replacement-policies/ref/second_chance_test2_ld b/tests/gem5/replacement_policies/ref/second_chance_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/second_chance_test2_ld
rename to tests/gem5/replacement_policies/ref/second_chance_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/second_chance_test2_st b/tests/gem5/replacement_policies/ref/second_chance_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/second_chance_test2_st
rename to tests/gem5/replacement_policies/ref/second_chance_test2_st
diff --git a/tests/gem5/replacement-policies/ref/second_chance_test3_ld b/tests/gem5/replacement_policies/ref/second_chance_test3_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/second_chance_test3_ld
rename to tests/gem5/replacement_policies/ref/second_chance_test3_ld
diff --git a/tests/gem5/replacement-policies/ref/second_chance_test3_st b/tests/gem5/replacement_policies/ref/second_chance_test3_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/second_chance_test3_st
rename to tests/gem5/replacement_policies/ref/second_chance_test3_st
diff --git a/tests/gem5/replacement-policies/ref/tree_plru_test1_ld b/tests/gem5/replacement_policies/ref/tree_plru_test1_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/tree_plru_test1_ld
rename to tests/gem5/replacement_policies/ref/tree_plru_test1_ld
diff --git a/tests/gem5/replacement-policies/ref/tree_plru_test1_st b/tests/gem5/replacement_policies/ref/tree_plru_test1_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/tree_plru_test1_st
rename to tests/gem5/replacement_policies/ref/tree_plru_test1_st
diff --git a/tests/gem5/replacement-policies/ref/tree_plru_test2_ld b/tests/gem5/replacement_policies/ref/tree_plru_test2_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/tree_plru_test2_ld
rename to tests/gem5/replacement_policies/ref/tree_plru_test2_ld
diff --git a/tests/gem5/replacement-policies/ref/tree_plru_test2_st b/tests/gem5/replacement_policies/ref/tree_plru_test2_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/tree_plru_test2_st
rename to tests/gem5/replacement_policies/ref/tree_plru_test2_st
diff --git a/tests/gem5/replacement-policies/ref/tree_plru_test3_ld b/tests/gem5/replacement_policies/ref/tree_plru_test3_ld
similarity index 100%
rename from tests/gem5/replacement-policies/ref/tree_plru_test3_ld
rename to tests/gem5/replacement_policies/ref/tree_plru_test3_ld
diff --git a/tests/gem5/replacement-policies/ref/tree_plru_test3_st b/tests/gem5/replacement_policies/ref/tree_plru_test3_st
similarity index 100%
rename from tests/gem5/replacement-policies/ref/tree_plru_test3_st
rename to tests/gem5/replacement_policies/ref/tree_plru_test3_st
diff --git a/tests/gem5/replacement-policies/run_replacement_policy.py b/tests/gem5/replacement_policies/run_replacement_policy.py
similarity index 100%
rename from tests/gem5/replacement-policies/run_replacement_policy.py
rename to tests/gem5/replacement_policies/run_replacement_policy.py
diff --git a/tests/gem5/replacement-policies/test_replacement_policies.py b/tests/gem5/replacement_policies/test_replacement_policies.py
similarity index 100%
rename from tests/gem5/replacement-policies/test_replacement_policies.py
rename to tests/gem5/replacement_policies/test_replacement_policies.py
diff --git a/tests/gem5/replacement-policies/traces/fifo_test1_ld.py b/tests/gem5/replacement_policies/traces/fifo_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/fifo_test1_ld.py
rename to tests/gem5/replacement_policies/traces/fifo_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/fifo_test1_st.py b/tests/gem5/replacement_policies/traces/fifo_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/fifo_test1_st.py
rename to tests/gem5/replacement_policies/traces/fifo_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/fifo_test2_ld.py b/tests/gem5/replacement_policies/traces/fifo_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/fifo_test2_ld.py
rename to tests/gem5/replacement_policies/traces/fifo_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/fifo_test2_st.py b/tests/gem5/replacement_policies/traces/fifo_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/fifo_test2_st.py
rename to tests/gem5/replacement_policies/traces/fifo_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/lfu_test1_ld.py b/tests/gem5/replacement_policies/traces/lfu_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lfu_test1_ld.py
rename to tests/gem5/replacement_policies/traces/lfu_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lfu_test1_st.py b/tests/gem5/replacement_policies/traces/lfu_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lfu_test1_st.py
rename to tests/gem5/replacement_policies/traces/lfu_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/lfu_test2_ld.py b/tests/gem5/replacement_policies/traces/lfu_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lfu_test2_ld.py
rename to tests/gem5/replacement_policies/traces/lfu_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lfu_test2_st.py b/tests/gem5/replacement_policies/traces/lfu_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lfu_test2_st.py
rename to tests/gem5/replacement_policies/traces/lfu_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/lfu_test3_ld.py b/tests/gem5/replacement_policies/traces/lfu_test3_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lfu_test3_ld.py
rename to tests/gem5/replacement_policies/traces/lfu_test3_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lfu_test3_st.py b/tests/gem5/replacement_policies/traces/lfu_test3_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lfu_test3_st.py
rename to tests/gem5/replacement_policies/traces/lfu_test3_st.py
diff --git a/tests/gem5/replacement-policies/traces/lip_test1_ld.py b/tests/gem5/replacement_policies/traces/lip_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lip_test1_ld.py
rename to tests/gem5/replacement_policies/traces/lip_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lip_test1_st.py b/tests/gem5/replacement_policies/traces/lip_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lip_test1_st.py
rename to tests/gem5/replacement_policies/traces/lip_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test1_ld.py b/tests/gem5/replacement_policies/traces/lru_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test1_ld.py
rename to tests/gem5/replacement_policies/traces/lru_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test1_st.py b/tests/gem5/replacement_policies/traces/lru_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test1_st.py
rename to tests/gem5/replacement_policies/traces/lru_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test2_ld.py b/tests/gem5/replacement_policies/traces/lru_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test2_ld.py
rename to tests/gem5/replacement_policies/traces/lru_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test2_st.py b/tests/gem5/replacement_policies/traces/lru_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test2_st.py
rename to tests/gem5/replacement_policies/traces/lru_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test3_ld.py b/tests/gem5/replacement_policies/traces/lru_test3_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test3_ld.py
rename to tests/gem5/replacement_policies/traces/lru_test3_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test3_st.py b/tests/gem5/replacement_policies/traces/lru_test3_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test3_st.py
rename to tests/gem5/replacement_policies/traces/lru_test3_st.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test4_ld.py b/tests/gem5/replacement_policies/traces/lru_test4_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test4_ld.py
rename to tests/gem5/replacement_policies/traces/lru_test4_ld.py
diff --git a/tests/gem5/replacement-policies/traces/lru_test4_st.py b/tests/gem5/replacement_policies/traces/lru_test4_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/lru_test4_st.py
rename to tests/gem5/replacement_policies/traces/lru_test4_st.py
diff --git a/tests/gem5/replacement-policies/traces/mru_test1_ld.py b/tests/gem5/replacement_policies/traces/mru_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/mru_test1_ld.py
rename to tests/gem5/replacement_policies/traces/mru_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/mru_test1_st.py b/tests/gem5/replacement_policies/traces/mru_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/mru_test1_st.py
rename to tests/gem5/replacement_policies/traces/mru_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/mru_test2_ld.py b/tests/gem5/replacement_policies/traces/mru_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/mru_test2_ld.py
rename to tests/gem5/replacement_policies/traces/mru_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/mru_test2_st.py b/tests/gem5/replacement_policies/traces/mru_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/mru_test2_st.py
rename to tests/gem5/replacement_policies/traces/mru_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/nru_test1_ld.py b/tests/gem5/replacement_policies/traces/nru_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/nru_test1_ld.py
rename to tests/gem5/replacement_policies/traces/nru_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/nru_test1_st.py b/tests/gem5/replacement_policies/traces/nru_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/nru_test1_st.py
rename to tests/gem5/replacement_policies/traces/nru_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/rrip_test1_ld.py b/tests/gem5/replacement_policies/traces/rrip_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/rrip_test1_ld.py
rename to tests/gem5/replacement_policies/traces/rrip_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/rrip_test1_st.py b/tests/gem5/replacement_policies/traces/rrip_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/rrip_test1_st.py
rename to tests/gem5/replacement_policies/traces/rrip_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/rrip_test2_ld.py b/tests/gem5/replacement_policies/traces/rrip_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/rrip_test2_ld.py
rename to tests/gem5/replacement_policies/traces/rrip_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/rrip_test2_st.py b/tests/gem5/replacement_policies/traces/rrip_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/rrip_test2_st.py
rename to tests/gem5/replacement_policies/traces/rrip_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/second_chance_test1_ld.py b/tests/gem5/replacement_policies/traces/second_chance_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/second_chance_test1_ld.py
rename to tests/gem5/replacement_policies/traces/second_chance_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/second_chance_test1_st.py b/tests/gem5/replacement_policies/traces/second_chance_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/second_chance_test1_st.py
rename to tests/gem5/replacement_policies/traces/second_chance_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/second_chance_test2_ld.py b/tests/gem5/replacement_policies/traces/second_chance_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/second_chance_test2_ld.py
rename to tests/gem5/replacement_policies/traces/second_chance_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/second_chance_test2_st.py b/tests/gem5/replacement_policies/traces/second_chance_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/second_chance_test2_st.py
rename to tests/gem5/replacement_policies/traces/second_chance_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/second_chance_test3_ld.py b/tests/gem5/replacement_policies/traces/second_chance_test3_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/second_chance_test3_ld.py
rename to tests/gem5/replacement_policies/traces/second_chance_test3_ld.py
diff --git a/tests/gem5/replacement-policies/traces/second_chance_test3_st.py b/tests/gem5/replacement_policies/traces/second_chance_test3_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/second_chance_test3_st.py
rename to tests/gem5/replacement_policies/traces/second_chance_test3_st.py
diff --git a/tests/gem5/replacement-policies/traces/tree_plru_test1_ld.py b/tests/gem5/replacement_policies/traces/tree_plru_test1_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/tree_plru_test1_ld.py
rename to tests/gem5/replacement_policies/traces/tree_plru_test1_ld.py
diff --git a/tests/gem5/replacement-policies/traces/tree_plru_test1_st.py b/tests/gem5/replacement_policies/traces/tree_plru_test1_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/tree_plru_test1_st.py
rename to tests/gem5/replacement_policies/traces/tree_plru_test1_st.py
diff --git a/tests/gem5/replacement-policies/traces/tree_plru_test2_ld.py b/tests/gem5/replacement_policies/traces/tree_plru_test2_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/tree_plru_test2_ld.py
rename to tests/gem5/replacement_policies/traces/tree_plru_test2_ld.py
diff --git a/tests/gem5/replacement-policies/traces/tree_plru_test2_st.py b/tests/gem5/replacement_policies/traces/tree_plru_test2_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/tree_plru_test2_st.py
rename to tests/gem5/replacement_policies/traces/tree_plru_test2_st.py
diff --git a/tests/gem5/replacement-policies/traces/tree_plru_test3_ld.py b/tests/gem5/replacement_policies/traces/tree_plru_test3_ld.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/tree_plru_test3_ld.py
rename to tests/gem5/replacement_policies/traces/tree_plru_test3_ld.py
diff --git a/tests/gem5/replacement-policies/traces/tree_plru_test3_st.py b/tests/gem5/replacement_policies/traces/tree_plru_test3_st.py
similarity index 100%
rename from tests/gem5/replacement-policies/traces/tree_plru_test3_st.py
rename to tests/gem5/replacement_policies/traces/tree_plru_test3_st.py
diff --git a/tests/gem5/riscv-boot-tests/test_linux_boot.py b/tests/gem5/riscv_boot_tests/test_linux_boot.py
similarity index 100%
rename from tests/gem5/riscv-boot-tests/test_linux_boot.py
rename to tests/gem5/riscv_boot_tests/test_linux_boot.py
diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py b/tests/gem5/x86_boot_tests/test_linux_boot.py
similarity index 100%
rename from tests/gem5/x86-boot-tests/test_linux_boot.py
rename to tests/gem5/x86_boot_tests/test_linux_boot.py