diff --git a/.coveragerc b/.coveragerc
index dc8009b3f..ef34019bf 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,2 @@
 [report]
-omit = connectors/quartz.py,connectors/conftest.py,tests/*,connectors/agent/*,connectors/cli/*
+omit = connectors/quartz.py,connectors/conftest.py,tests/*
diff --git a/Makefile b/Makefile
index 1e7216e6a..631709c29 100644
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@ config.yml:
 install: .venv/bin/python .venv/bin/pip-licenses .venv/bin/elastic-ingest
 	.venv/bin/pip-licenses --format=plain-vertical --with-license-file --no-license-path > NOTICE.txt
 
-install-agent: install
-	.venv/bin/pip install -r requirements/agent.txt
+install-agent: .venv/bin/elastic-ingest
 
 .venv/bin/elastic-ingest: .venv/bin/python
 	.venv/bin/pip install -r requirements/$(ARCH).txt
+	.venv/bin/pip install -r requirements/agent.txt
 	.venv/bin/python setup.py develop
 
 .venv/bin/ruff: .venv/bin/python
@@ -38,6 +38,7 @@ install-agent: install
 
 .venv/bin/pytest: .venv/bin/python
 	.venv/bin/pip install -r requirements/$(ARCH).txt
+	.venv/bin/pip install -r requirements/agent.txt
 	.venv/bin/pip install -r requirements/tests.txt
 	.venv/bin/pip install -r requirements/ftest.txt
 
@@ -67,10 +68,7 @@ autoformat: .venv/bin/python .venv/bin/ruff .venv/bin/elastic-ingest
 	.venv/bin/ruff format setup.py
 
 test: .venv/bin/pytest .venv/bin/elastic-ingest
-	.venv/bin/pytest --cov-report term-missing --cov-fail-under 92 --cov-report html --cov=connectors --fail-slow=$(SLOW_TEST_THRESHOLD) -sv tests --ignore tests/agent
-
-test-agent: .venv/bin/pytest .venv/bin/elastic-ingest install-agent
-	.venv/bin/pytest --cov-report term-missing --cov-fail-under 92 --cov-report html --cov=connectors/agent --fail-slow=$(SLOW_TEST_THRESHOLD) -sv tests/agent
+	.venv/bin/pytest --cov-report term-missing --cov-fail-under 92 --cov-report html --cov=connectors --fail-slow=$(SLOW_TEST_THRESHOLD) -sv tests
 
 release: install
 	.venv/bin/python setup.py sdist