diff --git a/schema/ext.keboola.mcp-server.tool.json b/schema/ext.keboola.mcp-server.tool.json
new file mode 100644
index 0000000..95b5fed
--- /dev/null
+++ b/schema/ext.keboola.mcp-server.tool.json
@@ -0,0 +1,60 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "mcpServerContext": {
+      "type": "object",
+      "properties": {
+        "appEnv": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "userAgent": {
+          "type": "string"
+        },
+        "sessionId": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "appEnv",
+        "version",
+        "userAgent",
+        "sessionId"
+      ]
+    },
+    "message": {
+      "type": "string"
+    },
+    "tool": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "arguments": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "key": { "type": "string" },
+              "value": { "type": "string" }
+            },
+            "required": ["key", "value"]
+          }
+        }
+      },
+      "required": [
+        "name",
+        "arguments"
+      ]
+    }
+  },
+  "required": [
+    "mcpServerContext",
+    "message",
+    "tool"
+  ]
+}
diff --git a/tests/events/ext.keboola.mcp-server.tool.json b/tests/events/ext.keboola.mcp-server.tool.json
new file mode 100644
index 0000000..6afe7a8
--- /dev/null
+++ b/tests/events/ext.keboola.mcp-server.tool.json
@@ -0,0 +1,47 @@
+{
+    "id": 1234567890,
+    "event": "ext.keboola.mcp-server.tool",
+    "component": "keboola.mcp-server.tool",
+    "message": "Test message for mcp-server",
+    "description": "",
+    "type": "info",
+    "runId": null,
+    "created": "2024-07-15T10:00:00+0200",
+    "configurationId": null,
+    "objectId": "",
+    "objectName": "",
+    "objectType": "",
+    "context": {
+        "remoteAddr": "127.0.0.1",
+        "httpReferer": null,
+        "httpUserAgent": "mcp-server-test-suite",
+        "apiVersion": "v1"
+    },
+    "mcpServerContext": {
+        "appEnv": "remote",
+        "version": "1.0.0",
+        "userAgent": "mcp-server-local",
+        "sessionId": "1234567890"
+    },
+    "tool": {
+        "name": "list-buckets",
+        "arguments": [
+            {
+                "key": "region",
+                "value": "eu-central-1"
+            },
+            {
+                "key": "branchId",
+                "value": "67890"
+            }
+        ]
+    },
+    "performance": {},
+    "token": {
+        "id": 98765,
+        "name": "test-user@keboola.com"
+    },
+    "idBranch": 67890,
+    "uri": "https://connection.keboola.com/v2/storage/events/1234567890",
+    "attachments": []
+}