diff --git a/repos/dde_linux/run/usb_terminal.run b/repos/dde_linux/run/usb_terminal.run
index 1c00e667b2..67f0ad4d70 100644
--- a/repos/dde_linux/run/usb_terminal.run
+++ b/repos/dde_linux/run/usb_terminal.run
@@ -16,9 +16,10 @@ create_boot_directory
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/pkg/test_usb_host_drv-[board] \
                   [depot_user]/src/report_rom \
-                  [depot_user]/src/init
+                  [depot_user]/src/init \
+                  [depot_user]/src/test-terminal_echo
 
-build { server/usb_terminal test/terminal_echo }
+build { server/usb_terminal }
 
 install_config {
 <config>
@@ -83,7 +84,7 @@ puts $fd {
 </config>}
 close $fd
 
-build_boot_image { test-terminal_echo usb_terminal }
+build_boot_image { usb_terminal }
 
 append qemu_args " -chardev socket,path=$usb_raw_device,id=ser "
 append qemu_args " -device nec-usb-xhci,id=xhci -device usb-serial,bus=xhci.0,chardev=ser -nographic"
diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run
index f87209e396..7fcaa65f31 100644
--- a/repos/gems/run/tcp_terminal.run
+++ b/repos/gems/run/tcp_terminal.run
@@ -20,9 +20,10 @@ import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/src/nic_router \
                   [depot_user]/src/vfs \
                   [depot_user]/src/vfs_lwip \
-                  [depot_user]/src/vfs_pipe
+                  [depot_user]/src/vfs_pipe \
+                  [depot_user]/src/test-terminal_echo
 
-build { server/tcp_terminal test/terminal_echo }
+build { server/tcp_terminal }
 
 install_config {
 <config verbose="yes">
@@ -114,7 +115,7 @@ install_config {
 </config>
 }
 
-build_boot_image { tcp_terminal test-terminal_echo }
+build_boot_image { tcp_terminal }
 
 
 # qemu config
diff --git a/repos/gems/run/terminal_echo.run b/repos/gems/run/terminal_echo.run
index d0506f3ae3..bce277ff49 100644
--- a/repos/gems/run/terminal_echo.run
+++ b/repos/gems/run/terminal_echo.run
@@ -4,7 +4,8 @@ import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/pkg/[drivers_interactive_pkg] \
                   [depot_user]/pkg/terminal \
                   [depot_user]/src/nitpicker \
-                  [depot_user]/src/init
+                  [depot_user]/src/init \
+                  [depot_user]/src/test-terminal_echo
 
 install_config {
 	<config>
@@ -74,9 +75,9 @@ set fd [open [run_dir]/genode/focus w]
 puts $fd "<focus label=\"terminal\" domain=\"default\"/>"
 close $fd
 
-build { server/terminal test/terminal_echo }
+build { server/terminal }
 
-build_boot_image { terminal test-terminal_echo }
+build_boot_image { terminal }
 
 run_genode_until forever
 
diff --git a/repos/os/recipes/src/test-terminal_echo/content.mk b/repos/os/recipes/src/test-terminal_echo/content.mk
new file mode 100644
index 0000000000..98187e928e
--- /dev/null
+++ b/repos/os/recipes/src/test-terminal_echo/content.mk
@@ -0,0 +1,2 @@
+SRC_DIR = src/test/terminal_echo
+include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/os/recipes/src/test-terminal_echo/hash b/repos/os/recipes/src/test-terminal_echo/hash
new file mode 100644
index 0000000000..2ca34793f9
--- /dev/null
+++ b/repos/os/recipes/src/test-terminal_echo/hash
@@ -0,0 +1 @@
+2023-08-31 1fe3e4dfd60248dade2aa16c5f3b74c83ea35b39
diff --git a/repos/os/recipes/src/test-terminal_echo/used_apis b/repos/os/recipes/src/test-terminal_echo/used_apis
new file mode 100644
index 0000000000..40c5028425
--- /dev/null
+++ b/repos/os/recipes/src/test-terminal_echo/used_apis
@@ -0,0 +1,3 @@
+base
+os
+terminal_session