diff --git a/.gitignore b/.gitignore
index 70a607bbd4..f576495fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,9 @@
 !/bin/soft_oal.dll
 !/bin/xaudio2_9redist.dll
 
+# Test Programs
+!/bin/test/
+
 # Themes
 !/bin/GuiConfigs/
 /bin/GuiConfigs/*.ini
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/dump_stack.elf b/bin/test/dump_stack.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/dump_stack.elf
rename to bin/test/dump_stack.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_basic_triangle.elf b/bin/test/gs_gcm_basic_triangle.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_basic_triangle.elf
rename to bin/test/gs_gcm_basic_triangle.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_cube.elf b/bin/test/gs_gcm_cube.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_cube.elf
rename to bin/test/gs_gcm_cube.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_handle_system_cmd.elf b/bin/test/gs_gcm_handle_system_cmd.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_handle_system_cmd.elf
rename to bin/test/gs_gcm_handle_system_cmd.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_hello_world.elf b/bin/test/gs_gcm_hello_world.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_hello_world.elf
rename to bin/test/gs_gcm_hello_world.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_tetris.elf b/bin/test/gs_gcm_tetris.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_tetris.elf
rename to bin/test/gs_gcm_tetris.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/pad_test.elf b/bin/test/pad_test.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/pad_test.elf
rename to bin/test/pad_test.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/ppu_thread.elf b/bin/test/ppu_thread.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/ppu_thread.elf
rename to bin/test/ppu_thread.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/pspgame.elf b/bin/test/pspgame.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/pspgame.elf
rename to bin/test/pspgame.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/rpcsp.elf b/bin/test/rpcsp.elf
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/rpcsp.elf
rename to bin/test/rpcsp.elf
diff --git a/bin/dev_hdd0/game/TEST12345/USRDIR/spurs_test.self b/bin/test/spurs_test.self
similarity index 100%
rename from bin/dev_hdd0/game/TEST12345/USRDIR/spurs_test.self
rename to bin/test/spurs_test.self
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index d22201c7d4..1786b0308d 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -276,8 +276,6 @@ void Emulator::Init(bool add_only)
 		make_path_verbose(dev_flsh3);
 		make_path_verbose(dev_usb);
 		make_path_verbose(dev_hdd0 + "game/");
-		make_path_verbose(dev_hdd0 + "game/TEST12345/");
-		make_path_verbose(dev_hdd0 + "game/TEST12345/USRDIR/");
 		make_path_verbose(dev_hdd0 + reinterpret_cast<const char*>(u8"game/＄locks/"));
 		make_path_verbose(dev_hdd0 + "home/");
 		make_path_verbose(dev_hdd0 + "home/" + m_usr + "/");