diff --git a/test/serena/test_edit_marker.py b/test/serena/test_edit_marker.py
index 9a07f271..ce1c5585 100644
--- a/test/serena/test_edit_marker.py
+++ b/test/serena/test_edit_marker.py
@@ -1,4 +1,4 @@
-from serena.agent import CreateTextFileTool, ReadFileTool, Tool
+from serena.tools import CreateTextFileTool, ReadFileTool, Tool
 
 
 class TestEditMarker:
diff --git a/test/serena/test_serena_agent.py b/test/serena/test_serena_agent.py
index 40f29049..460c124c 100644
--- a/test/serena/test_serena_agent.py
+++ b/test/serena/test_serena_agent.py
@@ -5,7 +5,9 @@ import time
 import pytest
 
 import test.solidlsp.clojure as clj
-from serena.agent import FindReferencingSymbolsTool, FindSymbolTool, Project, ProjectConfig, SerenaAgent, SerenaConfig
+from serena.agent import SerenaAgent
+from serena.config.serena_config import Project, ProjectConfig, SerenaConfig
+from serena.tools import FindReferencingSymbolsTool, FindSymbolTool
 from solidlsp.ls_config import Language
 from test.conftest import get_repo_path