diff --git a/.cursor/mcp.json b/.cursor/mcp.json
new file mode 100644
index 0000000..bd4611f
--- /dev/null
+++ b/.cursor/mcp.json
@@ -0,0 +1,8 @@
+{
+    "mcpServers": {
+        "livekit-docs": {
+            "name": "livekit-docs",
+            "url": "http://localhost:5502/mcp/"
+        }
+    }
+}
\ No newline at end of file
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 0000000..bd4611f
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,8 @@
+{
+    "mcpServers": {
+        "livekit-docs": {
+            "name": "livekit-docs",
+            "url": "http://localhost:5502/mcp/"
+        }
+    }
+}
\ No newline at end of file
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..29b8a62
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,13 @@
+# AGENTS.md
+
+This is a LiveKit Agents project (with LiveKit Agents for Python).
+
+## Documentation
+
+Always refer to the latest LiveKit Agents documentation when working with this project, available via the livekit-docs MCP server (if a server named livekit-docs is not already installed, it can be added with HTTP transport at http://localhost:5502/mcp/)
+
+## Testing
+
+When possible, add tests for agent behavior. Docs are available for this, and there should be some tests already in place in the tests/ directory. 
+
+Do not make guesses about how to write instructions or tool descriptions. Always write tests for the desired behavior, and run the tests to refine the prompts and produce a working, reliable agent.
\ No newline at end of file
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..8ccf2d7
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,5 @@
+# CLAUDE.md
+
+This project uses `AGENTS.md` instead of a `CLAUDE.md` file.P
+
+Please see @AGENTS.md in this same directory and treat its content as the primary reference for this project.