diff --git a/systemd/teleo-agent@.service b/systemd/teleo-agent@.service
index 23c046a..c20cc91 100644
--- a/systemd/teleo-agent@.service
+++ b/systemd/teleo-agent@.service
@@ -33,6 +33,7 @@ ReadWritePaths=/opt/teleo-eval/pipeline/pipeline.db-shm
 ReadWritePaths=/opt/teleo-eval/workspaces/main/agents
 
 Environment=PYTHONUNBUFFERED=1
+EnvironmentFile=-/opt/teleo-eval/secrets/teleo-agent-%i.env
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tests/test_teleo_agent_systemd.py b/tests/test_teleo_agent_systemd.py
new file mode 100644
index 0000000..9debbec
--- /dev/null
+++ b/tests/test_teleo_agent_systemd.py
@@ -0,0 +1,11 @@
+from pathlib import Path
+
+
+REPO_ROOT = Path(__file__).resolve().parents[1]
+
+
+def test_teleo_agent_template_supports_optional_per_agent_env_file():
+    unit = (REPO_ROOT / "systemd" / "teleo-agent@.service").read_text()
+
+    assert "Environment=PYTHONUNBUFFERED=1" in unit
+    assert "EnvironmentFile=-/opt/teleo-eval/secrets/teleo-agent-%i.env" in unit