diff --git a/tests.toml b/tests.toml
index 2e30b71..a8b3d19 100644
--- a/tests.toml
+++ b/tests.toml
@@ -19,21 +19,50 @@ files = [
     "tests/test_performance_monitor.py",
     "tests/test_token_usage.py",
     "tests/test_layout_reorganization.py",
-    "tests/test_async_events.py"
+    "tests/test_async_events.py",
+    "test_mma_persistence.py",
+    "tests/test_session_logging.py",
+    "tests/test_logging_e2e.py",
+    "tests/test_log_management_ui.py",
+    "tests/test_log_pruner.py",
+    "tests/test_log_registry.py"
+]
+
+[categories.mma]
+description = "Manual Slop MMA Feature tests (Project Features)"
+files = [
+    "tests/test_conductor_engine.py",
+    "tests/test_conductor_tech_lead.py",
+    "tests/test_orchestrator_pm.py",
+    "tests/test_orchestrator_pm_history.py",
+    "tests/test_orchestration_logic.py",
+    "tests/test_mma_models.py",
+    "tests/test_mma_prompts.py",
+    "tests/test_mma_ticket_actions.py",
+    "tests/test_mma_orchestration_gui.py",
+    "tests/test_headless_verification.py",
+    "tests/test_tier4_interceptor.py",
+    "tests/test_conductor_api_hook_integration.py"
 ]
 
 [categories.conductor]
-description = "Conductor and MMA internal tests (Blacklisted from default core runs)"
+description = "Gemini CLI Meta-Infrastructure & Conductor internal tests (Blacklisted from default core runs)"
 files = [
-    "tests/test_mma_exec.py",
-    "tests/test_mma_skeleton.py",
-    "tests/test_conductor_api_hook_integration.py",
+    "tests/conductor/test_mma_exec.py",
+    "tests/conductor/test_mma_skeleton.py",
     "tests/conductor/test_infrastructure.py",
-    "tests/test_gemini_cli_adapter.py",
-    "tests/test_gemini_cli_integration.py",
-    "tests/test_ai_client_cli.py",
-    "tests/test_cli_tool_bridge.py",
-    "tests/test_gemini_metrics.py"
+    "tests/conductor/test_gemini_cli_adapter.py",
+    "tests/conductor/test_gemini_cli_adapter_parity.py",
+    "tests/conductor/test_gemini_cli_edge_cases.py",
+    "tests/conductor/test_gemini_cli_integration.py",
+    "tests/conductor/test_gemini_cli_parity_regression.py",
+    "tests/conductor/test_ai_client_cli.py",
+    "tests/conductor/test_cli_tool_bridge.py",
+    "tests/conductor/test_cli_tool_bridge_mapping.py",
+    "tests/conductor/test_gemini_metrics.py",
+    "tests/conductor/visual_mma_verification.py",
+    "tests/conductor/visual_orchestration_verification.py",
+    "tests/conductor/verify_mma_gui_robust.py"
 ]
 
 [categories.integrations]
@@ -63,5 +92,5 @@ files = [
 ]
 
 [execution]
-default_categories = ["core", "integrations", "simulations"]
+default_categories = ["core", "mma", "integrations", "simulations"]
 blacklist_categories = ["conductor"]
diff --git a/tests/test_ai_client_cli.py b/tests/conductor/test_ai_client_cli.py
similarity index 100%
rename from tests/test_ai_client_cli.py
rename to tests/conductor/test_ai_client_cli.py
diff --git a/tests/test_cli_tool_bridge.py b/tests/conductor/test_cli_tool_bridge.py
similarity index 100%
rename from tests/test_cli_tool_bridge.py
rename to tests/conductor/test_cli_tool_bridge.py
diff --git a/tests/test_cli_tool_bridge_mapping.py b/tests/conductor/test_cli_tool_bridge_mapping.py
similarity index 100%
rename from tests/test_cli_tool_bridge_mapping.py
rename to tests/conductor/test_cli_tool_bridge_mapping.py
diff --git a/tests/test_gemini_cli_adapter.py b/tests/conductor/test_gemini_cli_adapter.py
similarity index 100%
rename from tests/test_gemini_cli_adapter.py
rename to tests/conductor/test_gemini_cli_adapter.py
diff --git a/tests/test_gemini_cli_adapter_parity.py b/tests/conductor/test_gemini_cli_adapter_parity.py
similarity index 100%
rename from tests/test_gemini_cli_adapter_parity.py
rename to tests/conductor/test_gemini_cli_adapter_parity.py
diff --git a/tests/test_gemini_cli_edge_cases.py b/tests/conductor/test_gemini_cli_edge_cases.py
similarity index 100%
rename from tests/test_gemini_cli_edge_cases.py
rename to tests/conductor/test_gemini_cli_edge_cases.py
diff --git a/tests/test_gemini_cli_integration.py b/tests/conductor/test_gemini_cli_integration.py
similarity index 100%
rename from tests/test_gemini_cli_integration.py
rename to tests/conductor/test_gemini_cli_integration.py
diff --git a/tests/test_gemini_cli_parity_regression.py b/tests/conductor/test_gemini_cli_parity_regression.py
similarity index 100%
rename from tests/test_gemini_cli_parity_regression.py
rename to tests/conductor/test_gemini_cli_parity_regression.py
diff --git a/tests/test_gemini_metrics.py b/tests/conductor/test_gemini_metrics.py
similarity index 100%
rename from tests/test_gemini_metrics.py
rename to tests/conductor/test_gemini_metrics.py
diff --git a/tests/verify_mma_gui_robust.py b/tests/conductor/verify_mma_gui_robust.py
similarity index 100%
rename from tests/verify_mma_gui_robust.py
rename to tests/conductor/verify_mma_gui_robust.py
diff --git a/tests/visual_mma_verification.py b/tests/conductor/visual_mma_verification.py
similarity index 100%
rename from tests/visual_mma_verification.py
rename to tests/conductor/visual_mma_verification.py
diff --git a/tests/visual_orchestration_verification.py b/tests/conductor/visual_orchestration_verification.py
similarity index 100%
rename from tests/visual_orchestration_verification.py
rename to tests/conductor/visual_orchestration_verification.py
diff --git a/tests/temp_project_history.toml b/tests/temp_project_history.toml
index 4b83b50..38e1035 100644
--- a/tests/temp_project_history.toml
+++ b/tests/temp_project_history.toml
@@ -18,7 +18,7 @@ history = [
 
 [discussions.AutoDisc]
 git_commit = ""
-last_updated = "2026-02-27T18:34:58"
+last_updated = "2026-02-27T18:45:58"
 history = [
     "@2026-02-27T18:18:46\nSystem:\n[PERFORMANCE ALERT] Frame time high: 61.9ms. Please consider optimizing recent changes or reducing load.",
 ]