diff --git a/src/agent/tests/Toolbox/Tool/BraveTest.php b/src/agent/tests/Toolbox/Tool/BraveTest.php
index ee33e926e..d84444503 100644
--- a/src/agent/tests/Toolbox/Tool/BraveTest.php
+++ b/src/agent/tests/Toolbox/Tool/BraveTest.php
@@ -23,7 +23,7 @@ final class BraveTest extends TestCase
 {
     public function testReturnsSearchResults()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/brave.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/brave.json');
         $httpClient = new MockHttpClient($result);
         $brave = new Brave($httpClient, 'test-api-key');
 
@@ -40,7 +40,7 @@ public function testReturnsSearchResults()
 
     public function testPassesCorrectParametersToApi()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/brave.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/brave.json');
         $httpClient = new MockHttpClient($result);
         $brave = new Brave($httpClient, 'test-api-key', ['extra' => 'option']);
 
diff --git a/src/agent/tests/Toolbox/Tool/FirecrawlTest.php b/src/agent/tests/Toolbox/Tool/FirecrawlTest.php
index 8e88d930a..90ae79838 100644
--- a/src/agent/tests/Toolbox/Tool/FirecrawlTest.php
+++ b/src/agent/tests/Toolbox/Tool/FirecrawlTest.php
@@ -23,7 +23,7 @@ final class FirecrawlTest extends TestCase
     public function testScrape()
     {
         $httpClient = new MockHttpClient([
-            JsonMockResponse::fromFile(__DIR__.'/fixtures/firecrawl-scrape.json'),
+            JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/firecrawl-scrape.json'),
         ]);
 
         $firecrawl = new Firecrawl($httpClient, 'test', 'https://127.0.0.1:3002');
@@ -39,10 +39,10 @@ public function testScrape()
     public function testCrawl()
     {
         $httpClient = new MockHttpClient([
-            JsonMockResponse::fromFile(__DIR__.'/fixtures/firecrawl-crawl-wait.json'),
-            JsonMockResponse::fromFile(__DIR__.'/fixtures/firecrawl-crawl-status.json'),
-            JsonMockResponse::fromFile(__DIR__.'/fixtures/firecrawl-crawl-status-done.json'),
-            JsonMockResponse::fromFile(__DIR__.'/fixtures/firecrawl-crawl.json'),
+            JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/firecrawl-crawl-wait.json'),
+            JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/firecrawl-crawl-status.json'),
+            JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/firecrawl-crawl-status-done.json'),
+            JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/firecrawl-crawl.json'),
         ]);
 
         $firecrawl = new Firecrawl($httpClient, 'test', 'https://127.0.0.1:3002');
@@ -62,7 +62,7 @@ public function testCrawl()
     public function testMap()
     {
         $httpClient = new MockHttpClient([
-            JsonMockResponse::fromFile(__DIR__.'/fixtures/firecrawl-map.json'),
+            JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/firecrawl-map.json'),
         ]);
 
         $firecrawl = new Firecrawl($httpClient, 'test', 'https://127.0.0.1:3002');
diff --git a/src/agent/tests/Toolbox/Tool/MapboxTest.php b/src/agent/tests/Toolbox/Tool/MapboxTest.php
index caebbab45..4a6093cbe 100644
--- a/src/agent/tests/Toolbox/Tool/MapboxTest.php
+++ b/src/agent/tests/Toolbox/Tool/MapboxTest.php
@@ -22,7 +22,7 @@ final class MapboxTest extends TestCase
 {
     public function testGeocodeWithSingleResult()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/mapbox-geocode-single.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/mapbox-geocode-single.json');
         $httpClient = new MockHttpClient($result);
 
         $mapbox = new Mapbox($httpClient, 'test_token');
@@ -48,7 +48,7 @@ public function testGeocodeWithSingleResult()
 
     public function testGeocodeWithMultipleResults()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/mapbox-geocode-multiple.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/mapbox-geocode-multiple.json');
         $httpClient = new MockHttpClient($result);
 
         $mapbox = new Mapbox($httpClient, 'test_token');
@@ -83,7 +83,7 @@ public function testGeocodeWithMultipleResults()
 
     public function testGeocodeWithNoResults()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/mapbox-geocode-empty.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/mapbox-geocode-empty.json');
         $httpClient = new MockHttpClient($result);
 
         $mapbox = new Mapbox($httpClient, 'test_token');
@@ -99,7 +99,7 @@ public function testGeocodeWithNoResults()
 
     public function testReverseGeocodeWithValidCoordinates()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/mapbox-reverse-geocode.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/mapbox-reverse-geocode.json');
         $httpClient = new MockHttpClient($result);
 
         $mapbox = new Mapbox($httpClient, 'test_token');
@@ -141,7 +141,7 @@ public function testReverseGeocodeWithValidCoordinates()
 
     public function testReverseGeocodeWithNoResults()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/mapbox-reverse-geocode-empty.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/mapbox-reverse-geocode-empty.json');
         $httpClient = new MockHttpClient($result);
 
         $mapbox = new Mapbox($httpClient, 'test_token');
diff --git a/src/agent/tests/Toolbox/Tool/OpenMeteoTest.php b/src/agent/tests/Toolbox/Tool/OpenMeteoTest.php
index 50bd29a27..364ad55e8 100644
--- a/src/agent/tests/Toolbox/Tool/OpenMeteoTest.php
+++ b/src/agent/tests/Toolbox/Tool/OpenMeteoTest.php
@@ -22,7 +22,7 @@ final class OpenMeteoTest extends TestCase
 {
     public function testCurrent()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/openmeteo-current.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/openmeteo-current.json');
         $httpClient = new MockHttpClient($result);
 
         $openMeteo = new OpenMeteo($httpClient);
@@ -40,7 +40,7 @@ public function testCurrent()
 
     public function testForecast()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/openmeteo-forecast.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/openmeteo-forecast.json');
         $httpClient = new MockHttpClient($result);
 
         $openMeteo = new OpenMeteo($httpClient);
diff --git a/src/agent/tests/Toolbox/Tool/WikipediaTest.php b/src/agent/tests/Toolbox/Tool/WikipediaTest.php
index 21ddf8194..9bc20c311 100644
--- a/src/agent/tests/Toolbox/Tool/WikipediaTest.php
+++ b/src/agent/tests/Toolbox/Tool/WikipediaTest.php
@@ -22,7 +22,7 @@ final class WikipediaTest extends TestCase
 {
     public function testSearchWithResults()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/wikipedia-search-result.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/wikipedia-search-result.json');
         $httpClient = new MockHttpClient($result);
 
         $wikipedia = new Wikipedia($httpClient);
@@ -49,7 +49,7 @@ public function testSearchWithResults()
 
     public function testSearchWithoutResults()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/wikipedia-search-empty.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/wikipedia-search-empty.json');
         $httpClient = new MockHttpClient($result);
 
         $wikipedia = new Wikipedia($httpClient);
@@ -62,7 +62,7 @@ public function testSearchWithoutResults()
 
     public function testArticleWithResult()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/wikipedia-article.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/wikipedia-article.json');
         $httpClient = new MockHttpClient($result);
 
         $wikipedia = new Wikipedia($httpClient);
@@ -78,7 +78,7 @@ public function testArticleWithResult()
 
     public function testArticleWithRedirect()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/wikipedia-article-redirect.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/wikipedia-article-redirect.json');
         $httpClient = new MockHttpClient($result);
 
         $wikipedia = new Wikipedia($httpClient);
@@ -96,7 +96,7 @@ public function testArticleWithRedirect()
 
     public function testArticleMissing()
     {
-        $result = JsonMockResponse::fromFile(__DIR__.'/fixtures/wikipedia-article-missing.json');
+        $result = JsonMockResponse::fromFile(__DIR__.'/../../fixtures/Tool/wikipedia-article-missing.json');
         $httpClient = new MockHttpClient($result);
 
         $wikipedia = new Wikipedia($httpClient);
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/brave.json b/src/agent/tests/fixtures/Tool/brave.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/brave.json
rename to src/agent/tests/fixtures/Tool/brave.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl-status-done.json b/src/agent/tests/fixtures/Tool/firecrawl-crawl-status-done.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl-status-done.json
rename to src/agent/tests/fixtures/Tool/firecrawl-crawl-status-done.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl-status.json b/src/agent/tests/fixtures/Tool/firecrawl-crawl-status.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl-status.json
rename to src/agent/tests/fixtures/Tool/firecrawl-crawl-status.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl-wait.json b/src/agent/tests/fixtures/Tool/firecrawl-crawl-wait.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl-wait.json
rename to src/agent/tests/fixtures/Tool/firecrawl-crawl-wait.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl.json b/src/agent/tests/fixtures/Tool/firecrawl-crawl.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/firecrawl-crawl.json
rename to src/agent/tests/fixtures/Tool/firecrawl-crawl.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/firecrawl-map.json b/src/agent/tests/fixtures/Tool/firecrawl-map.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/firecrawl-map.json
rename to src/agent/tests/fixtures/Tool/firecrawl-map.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/firecrawl-scrape.json b/src/agent/tests/fixtures/Tool/firecrawl-scrape.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/firecrawl-scrape.json
rename to src/agent/tests/fixtures/Tool/firecrawl-scrape.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/mapbox-geocode-empty.json b/src/agent/tests/fixtures/Tool/mapbox-geocode-empty.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/mapbox-geocode-empty.json
rename to src/agent/tests/fixtures/Tool/mapbox-geocode-empty.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/mapbox-geocode-multiple.json b/src/agent/tests/fixtures/Tool/mapbox-geocode-multiple.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/mapbox-geocode-multiple.json
rename to src/agent/tests/fixtures/Tool/mapbox-geocode-multiple.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/mapbox-geocode-single.json b/src/agent/tests/fixtures/Tool/mapbox-geocode-single.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/mapbox-geocode-single.json
rename to src/agent/tests/fixtures/Tool/mapbox-geocode-single.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/mapbox-reverse-geocode-empty.json b/src/agent/tests/fixtures/Tool/mapbox-reverse-geocode-empty.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/mapbox-reverse-geocode-empty.json
rename to src/agent/tests/fixtures/Tool/mapbox-reverse-geocode-empty.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/mapbox-reverse-geocode.json b/src/agent/tests/fixtures/Tool/mapbox-reverse-geocode.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/mapbox-reverse-geocode.json
rename to src/agent/tests/fixtures/Tool/mapbox-reverse-geocode.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/openmeteo-current.json b/src/agent/tests/fixtures/Tool/openmeteo-current.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/openmeteo-current.json
rename to src/agent/tests/fixtures/Tool/openmeteo-current.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/openmeteo-forecast.json b/src/agent/tests/fixtures/Tool/openmeteo-forecast.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/openmeteo-forecast.json
rename to src/agent/tests/fixtures/Tool/openmeteo-forecast.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/wikipedia-article-missing.json b/src/agent/tests/fixtures/Tool/wikipedia-article-missing.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/wikipedia-article-missing.json
rename to src/agent/tests/fixtures/Tool/wikipedia-article-missing.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/wikipedia-article-redirect.json b/src/agent/tests/fixtures/Tool/wikipedia-article-redirect.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/wikipedia-article-redirect.json
rename to src/agent/tests/fixtures/Tool/wikipedia-article-redirect.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/wikipedia-article.json b/src/agent/tests/fixtures/Tool/wikipedia-article.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/wikipedia-article.json
rename to src/agent/tests/fixtures/Tool/wikipedia-article.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/wikipedia-search-empty.json b/src/agent/tests/fixtures/Tool/wikipedia-search-empty.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/wikipedia-search-empty.json
rename to src/agent/tests/fixtures/Tool/wikipedia-search-empty.json
diff --git a/src/agent/tests/Toolbox/Tool/fixtures/wikipedia-search-result.json b/src/agent/tests/fixtures/Tool/wikipedia-search-result.json
similarity index 100%
rename from src/agent/tests/Toolbox/Tool/fixtures/wikipedia-search-result.json
rename to src/agent/tests/fixtures/Tool/wikipedia-search-result.json