diff --git a/lldb/test/API/commands/register/register/TestRegistersUnavailable.py b/lldb/test/API/commands/register/TestRegistersUnavailable.py
similarity index 100%
rename from lldb/test/API/commands/register/register/TestRegistersUnavailable.py
rename to lldb/test/API/commands/register/TestRegistersUnavailable.py
diff --git a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/Makefile b/lldb/test/API/commands/register/aarch64_dynamic_regset/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_dynamic_regset/Makefile
rename to lldb/test/API/commands/register/aarch64_dynamic_regset/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py b/lldb/test/API/commands/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
rename to lldb/test/API/commands/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
diff --git a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/main.c b/lldb/test/API/commands/register/aarch64_dynamic_regset/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_dynamic_regset/main.c
rename to lldb/test/API/commands/register/aarch64_dynamic_regset/main.c
diff --git a/lldb/test/API/commands/register/register/aarch64_mte_ctrl_register/Makefile b/lldb/test/API/commands/register/aarch64_mte_ctrl_register/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_mte_ctrl_register/Makefile
rename to lldb/test/API/commands/register/aarch64_mte_ctrl_register/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_mte_ctrl_register/TestMTECtrlRegister.py b/lldb/test/API/commands/register/aarch64_mte_ctrl_register/TestMTECtrlRegister.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_mte_ctrl_register/TestMTECtrlRegister.py
rename to lldb/test/API/commands/register/aarch64_mte_ctrl_register/TestMTECtrlRegister.py
diff --git a/lldb/test/API/commands/register/register/aarch64_mte_ctrl_register/main.c b/lldb/test/API/commands/register/aarch64_mte_ctrl_register/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_mte_ctrl_register/main.c
rename to lldb/test/API/commands/register/aarch64_mte_ctrl_register/main.c
diff --git a/lldb/test/API/commands/register/register/aarch64_sme_z_registers/save_restore/Makefile b/lldb/test/API/commands/register/aarch64_sme_z_registers/save_restore/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sme_z_registers/save_restore/Makefile
rename to lldb/test/API/commands/register/aarch64_sme_z_registers/save_restore/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_sme_z_registers/save_restore/TestSMEZRegistersSaveRestore.py b/lldb/test/API/commands/register/aarch64_sme_z_registers/save_restore/TestSMEZRegistersSaveRestore.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sme_z_registers/save_restore/TestSMEZRegistersSaveRestore.py
rename to lldb/test/API/commands/register/aarch64_sme_z_registers/save_restore/TestSMEZRegistersSaveRestore.py
diff --git a/lldb/test/API/commands/register/register/aarch64_sme_z_registers/save_restore/main.c b/lldb/test/API/commands/register/aarch64_sme_z_registers/save_restore/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sme_z_registers/save_restore/main.c
rename to lldb/test/API/commands/register/aarch64_sme_z_registers/save_restore/main.c
diff --git a/lldb/test/API/commands/register/register/aarch64_sme_z_registers/za_dynamic_resize/Makefile b/lldb/test/API/commands/register/aarch64_sme_z_registers/za_dynamic_resize/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sme_z_registers/za_dynamic_resize/Makefile
rename to lldb/test/API/commands/register/aarch64_sme_z_registers/za_dynamic_resize/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_sme_z_registers/za_dynamic_resize/TestZAThreadedDynamic.py b/lldb/test/API/commands/register/aarch64_sme_z_registers/za_dynamic_resize/TestZAThreadedDynamic.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sme_z_registers/za_dynamic_resize/TestZAThreadedDynamic.py
rename to lldb/test/API/commands/register/aarch64_sme_z_registers/za_dynamic_resize/TestZAThreadedDynamic.py
diff --git a/lldb/test/API/commands/register/register/aarch64_sme_z_registers/za_dynamic_resize/main.c b/lldb/test/API/commands/register/aarch64_sme_z_registers/za_dynamic_resize/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sme_z_registers/za_dynamic_resize/main.c
rename to lldb/test/API/commands/register/aarch64_sme_z_registers/za_dynamic_resize/main.c
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/Makefile b/lldb/test/API/commands/register/aarch64_sve_registers/rw_access_dynamic_resize/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/Makefile
rename to lldb/test/API/commands/register/aarch64_sve_registers/rw_access_dynamic_resize/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py b/lldb/test/API/commands/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
rename to lldb/test/API/commands/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/main.c b/lldb/test/API/commands/register/aarch64_sve_registers/rw_access_dynamic_resize/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/main.c
rename to lldb/test/API/commands/register/aarch64_sve_registers/rw_access_dynamic_resize/main.c
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/Makefile b/lldb/test/API/commands/register/aarch64_sve_registers/rw_access_static_config/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/Makefile
rename to lldb/test/API/commands/register/aarch64_sve_registers/rw_access_static_config/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py b/lldb/test/API/commands/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
rename to lldb/test/API/commands/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/main.c b/lldb/test/API/commands/register/aarch64_sve_registers/rw_access_static_config/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/main.c
rename to lldb/test/API/commands/register/aarch64_sve_registers/rw_access_static_config/main.c
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_simd_registers/Makefile b/lldb/test/API/commands/register/aarch64_sve_simd_registers/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_simd_registers/Makefile
rename to lldb/test/API/commands/register/aarch64_sve_simd_registers/Makefile
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_simd_registers/TestSVESIMDRegisters.py b/lldb/test/API/commands/register/aarch64_sve_simd_registers/TestSVESIMDRegisters.py
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_simd_registers/TestSVESIMDRegisters.py
rename to lldb/test/API/commands/register/aarch64_sve_simd_registers/TestSVESIMDRegisters.py
diff --git a/lldb/test/API/commands/register/register/aarch64_sve_simd_registers/main.c b/lldb/test/API/commands/register/aarch64_sve_simd_registers/main.c
similarity index 100%
rename from lldb/test/API/commands/register/register/aarch64_sve_simd_registers/main.c
rename to lldb/test/API/commands/register/aarch64_sve_simd_registers/main.c
diff --git a/lldb/test/API/commands/register/register/register_command/Makefile b/lldb/test/API/commands/register/register_command/Makefile
similarity index 100%
rename from lldb/test/API/commands/register/register/register_command/Makefile
rename to lldb/test/API/commands/register/register_command/Makefile
diff --git a/lldb/test/API/commands/register/register/register_command/TestRegisters.py b/lldb/test/API/commands/register/register_command/TestRegisters.py
similarity index 100%
rename from lldb/test/API/commands/register/register/register_command/TestRegisters.py
rename to lldb/test/API/commands/register/register_command/TestRegisters.py
diff --git a/lldb/test/API/commands/register/register/register_command/a.cpp b/lldb/test/API/commands/register/register_command/a.cpp
similarity index 100%
rename from lldb/test/API/commands/register/register/register_command/a.cpp
rename to lldb/test/API/commands/register/register_command/a.cpp
diff --git a/lldb/test/API/commands/register/register/register_command/main.cpp b/lldb/test/API/commands/register/register_command/main.cpp
similarity index 100%
rename from lldb/test/API/commands/register/register/register_command/main.cpp
rename to lldb/test/API/commands/register/register_command/main.cpp