diff --git a/codex-rs/chatgpt/tests/all.rs b/codex-rs/chatgpt/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/chatgpt/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/chatgpt/tests/apply_command_e2e.rs b/codex-rs/chatgpt/tests/suite/apply_command_e2e.rs
similarity index 100%
rename from codex-rs/chatgpt/tests/apply_command_e2e.rs
rename to codex-rs/chatgpt/tests/suite/apply_command_e2e.rs
diff --git a/codex-rs/chatgpt/tests/suite/mod.rs b/codex-rs/chatgpt/tests/suite/mod.rs
new file mode 100644
index 0000000000..40b4a59a0d
--- /dev/null
+++ b/codex-rs/chatgpt/tests/suite/mod.rs
@@ -0,0 +1,2 @@
+// Aggregates all former standalone integration tests as modules.
+mod apply_command_e2e;
diff --git a/codex-rs/exec/tests/all.rs b/codex-rs/exec/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/exec/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/exec/tests/apply_patch.rs b/codex-rs/exec/tests/suite/apply_patch.rs
similarity index 100%
rename from codex-rs/exec/tests/apply_patch.rs
rename to codex-rs/exec/tests/suite/apply_patch.rs
diff --git a/codex-rs/exec/tests/suite/mod.rs b/codex-rs/exec/tests/suite/mod.rs
new file mode 100644
index 0000000000..8a83474ef9
--- /dev/null
+++ b/codex-rs/exec/tests/suite/mod.rs
@@ -0,0 +1,3 @@
+// Aggregates all former standalone integration tests as modules.
+mod apply_patch;
+mod sandbox;
diff --git a/codex-rs/exec/tests/sandbox.rs b/codex-rs/exec/tests/suite/sandbox.rs
similarity index 100%
rename from codex-rs/exec/tests/sandbox.rs
rename to codex-rs/exec/tests/suite/sandbox.rs
diff --git a/codex-rs/execpolicy/tests/all.rs b/codex-rs/execpolicy/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/execpolicy/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/execpolicy/tests/bad.rs b/codex-rs/execpolicy/tests/suite/bad.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/bad.rs
rename to codex-rs/execpolicy/tests/suite/bad.rs
diff --git a/codex-rs/execpolicy/tests/cp.rs b/codex-rs/execpolicy/tests/suite/cp.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/cp.rs
rename to codex-rs/execpolicy/tests/suite/cp.rs
diff --git a/codex-rs/execpolicy/tests/good.rs b/codex-rs/execpolicy/tests/suite/good.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/good.rs
rename to codex-rs/execpolicy/tests/suite/good.rs
diff --git a/codex-rs/execpolicy/tests/head.rs b/codex-rs/execpolicy/tests/suite/head.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/head.rs
rename to codex-rs/execpolicy/tests/suite/head.rs
diff --git a/codex-rs/execpolicy/tests/literal.rs b/codex-rs/execpolicy/tests/suite/literal.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/literal.rs
rename to codex-rs/execpolicy/tests/suite/literal.rs
diff --git a/codex-rs/execpolicy/tests/ls.rs b/codex-rs/execpolicy/tests/suite/ls.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/ls.rs
rename to codex-rs/execpolicy/tests/suite/ls.rs
diff --git a/codex-rs/execpolicy/tests/suite/mod.rs b/codex-rs/execpolicy/tests/suite/mod.rs
new file mode 100644
index 0000000000..1c07ee2c5f
--- /dev/null
+++ b/codex-rs/execpolicy/tests/suite/mod.rs
@@ -0,0 +1,10 @@
+// Aggregates all former standalone integration tests as modules.
+mod bad;
+mod cp;
+mod good;
+mod head;
+mod literal;
+mod ls;
+mod parse_sed_command;
+mod pwd;
+mod sed;
diff --git a/codex-rs/execpolicy/tests/parse_sed_command.rs b/codex-rs/execpolicy/tests/suite/parse_sed_command.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/parse_sed_command.rs
rename to codex-rs/execpolicy/tests/suite/parse_sed_command.rs
diff --git a/codex-rs/execpolicy/tests/pwd.rs b/codex-rs/execpolicy/tests/suite/pwd.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/pwd.rs
rename to codex-rs/execpolicy/tests/suite/pwd.rs
diff --git a/codex-rs/execpolicy/tests/sed.rs b/codex-rs/execpolicy/tests/suite/sed.rs
similarity index 100%
rename from codex-rs/execpolicy/tests/sed.rs
rename to codex-rs/execpolicy/tests/suite/sed.rs
diff --git a/codex-rs/linux-sandbox/tests/all.rs b/codex-rs/linux-sandbox/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/linux-sandbox/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/linux-sandbox/tests/landlock.rs b/codex-rs/linux-sandbox/tests/suite/landlock.rs
similarity index 100%
rename from codex-rs/linux-sandbox/tests/landlock.rs
rename to codex-rs/linux-sandbox/tests/suite/landlock.rs
diff --git a/codex-rs/linux-sandbox/tests/suite/mod.rs b/codex-rs/linux-sandbox/tests/suite/mod.rs
new file mode 100644
index 0000000000..d2a6bfa148
--- /dev/null
+++ b/codex-rs/linux-sandbox/tests/suite/mod.rs
@@ -0,0 +1,2 @@
+// Aggregates all former standalone integration tests as modules.
+mod landlock;
diff --git a/codex-rs/login/tests/all.rs b/codex-rs/login/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/login/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/login/tests/login_server_e2e.rs b/codex-rs/login/tests/suite/login_server_e2e.rs
similarity index 100%
rename from codex-rs/login/tests/login_server_e2e.rs
rename to codex-rs/login/tests/suite/login_server_e2e.rs
diff --git a/codex-rs/login/tests/suite/mod.rs b/codex-rs/login/tests/suite/mod.rs
new file mode 100644
index 0000000000..3259e72434
--- /dev/null
+++ b/codex-rs/login/tests/suite/mod.rs
@@ -0,0 +1,2 @@
+// Aggregates all former standalone integration tests as modules.
+mod login_server_e2e;
diff --git a/codex-rs/mcp-server/tests/all.rs b/codex-rs/mcp-server/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/mcp-server/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/mcp-server/tests/auth.rs b/codex-rs/mcp-server/tests/suite/auth.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/auth.rs
rename to codex-rs/mcp-server/tests/suite/auth.rs
diff --git a/codex-rs/mcp-server/tests/codex_message_processor_flow.rs b/codex-rs/mcp-server/tests/suite/codex_message_processor_flow.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/codex_message_processor_flow.rs
rename to codex-rs/mcp-server/tests/suite/codex_message_processor_flow.rs
diff --git a/codex-rs/mcp-server/tests/codex_tool.rs b/codex-rs/mcp-server/tests/suite/codex_tool.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/codex_tool.rs
rename to codex-rs/mcp-server/tests/suite/codex_tool.rs
diff --git a/codex-rs/mcp-server/tests/create_conversation.rs b/codex-rs/mcp-server/tests/suite/create_conversation.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/create_conversation.rs
rename to codex-rs/mcp-server/tests/suite/create_conversation.rs
diff --git a/codex-rs/mcp-server/tests/interrupt.rs b/codex-rs/mcp-server/tests/suite/interrupt.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/interrupt.rs
rename to codex-rs/mcp-server/tests/suite/interrupt.rs
diff --git a/codex-rs/mcp-server/tests/login.rs b/codex-rs/mcp-server/tests/suite/login.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/login.rs
rename to codex-rs/mcp-server/tests/suite/login.rs
diff --git a/codex-rs/mcp-server/tests/suite/mod.rs b/codex-rs/mcp-server/tests/suite/mod.rs
new file mode 100644
index 0000000000..7888a7321a
--- /dev/null
+++ b/codex-rs/mcp-server/tests/suite/mod.rs
@@ -0,0 +1,8 @@
+// Aggregates all former standalone integration tests as modules.
+mod auth;
+mod codex_message_processor_flow;
+mod codex_tool;
+mod create_conversation;
+mod interrupt;
+mod login;
+mod send_message;
diff --git a/codex-rs/mcp-server/tests/send_message.rs b/codex-rs/mcp-server/tests/suite/send_message.rs
similarity index 100%
rename from codex-rs/mcp-server/tests/send_message.rs
rename to codex-rs/mcp-server/tests/suite/send_message.rs
diff --git a/codex-rs/mcp-types/tests/all.rs b/codex-rs/mcp-types/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/mcp-types/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/mcp-types/tests/initialize.rs b/codex-rs/mcp-types/tests/suite/initialize.rs
similarity index 100%
rename from codex-rs/mcp-types/tests/initialize.rs
rename to codex-rs/mcp-types/tests/suite/initialize.rs
diff --git a/codex-rs/mcp-types/tests/suite/mod.rs b/codex-rs/mcp-types/tests/suite/mod.rs
new file mode 100644
index 0000000000..94f4709c90
--- /dev/null
+++ b/codex-rs/mcp-types/tests/suite/mod.rs
@@ -0,0 +1,3 @@
+// Aggregates all former standalone integration tests as modules.
+mod initialize;
+mod progress_notification;
diff --git a/codex-rs/mcp-types/tests/progress_notification.rs b/codex-rs/mcp-types/tests/suite/progress_notification.rs
similarity index 100%
rename from codex-rs/mcp-types/tests/progress_notification.rs
rename to codex-rs/mcp-types/tests/suite/progress_notification.rs
diff --git a/codex-rs/tui/tests/all.rs b/codex-rs/tui/tests/all.rs
new file mode 100644
index 0000000000..7e136e4cce
--- /dev/null
+++ b/codex-rs/tui/tests/all.rs
@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;
diff --git a/codex-rs/tui/tests/suite/mod.rs b/codex-rs/tui/tests/suite/mod.rs
new file mode 100644
index 0000000000..d120546c71
--- /dev/null
+++ b/codex-rs/tui/tests/suite/mod.rs
@@ -0,0 +1,5 @@
+// Aggregates all former standalone integration tests as modules.
+mod status_indicator;
+mod vt100_history;
+mod vt100_live_commit;
+mod vt100_streaming_no_dup;
diff --git a/codex-rs/tui/tests/status_indicator.rs b/codex-rs/tui/tests/suite/status_indicator.rs
similarity index 100%
rename from codex-rs/tui/tests/status_indicator.rs
rename to codex-rs/tui/tests/suite/status_indicator.rs
diff --git a/codex-rs/tui/tests/vt100_history.rs b/codex-rs/tui/tests/suite/vt100_history.rs
similarity index 100%
rename from codex-rs/tui/tests/vt100_history.rs
rename to codex-rs/tui/tests/suite/vt100_history.rs
diff --git a/codex-rs/tui/tests/vt100_live_commit.rs b/codex-rs/tui/tests/suite/vt100_live_commit.rs
similarity index 100%
rename from codex-rs/tui/tests/vt100_live_commit.rs
rename to codex-rs/tui/tests/suite/vt100_live_commit.rs
diff --git a/codex-rs/tui/tests/vt100_streaming_no_dup.rs b/codex-rs/tui/tests/suite/vt100_streaming_no_dup.rs
similarity index 100%
rename from codex-rs/tui/tests/vt100_streaming_no_dup.rs
rename to codex-rs/tui/tests/suite/vt100_streaming_no_dup.rs