diff --git a/tox.ini b/tox.ini
index 9a2b503a3..7d79a3da5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,15 +7,14 @@ skip_missing_interpreters = True
 env_list = lint, unit
 
 [vars]
-src_path = {tox_root}/src
-tests_path = {tox_root}/tests
-lib_path = {tox_root}/lib/charms/pgbouncer_k8s
-test_charm_libs = {tox_root}/tests/integration/relations/pgbouncer_provider/application-charm/lib
+src_path = "{tox_root}/src"
+tests_path = "{tox_root}/tests"
+lib_path = "{tox_root}/lib/charms/pgbouncer_k8s"
 all_path = {[vars]src_path} {[vars]tests_path} {[vars]lib_path}
 
 [testenv]
 set_env =
-    PYTHONPATH = {tox_root}/lib:{[vars]src_path}
+    PYTHONPATH = {tox_root}/lib:{tox_root}/src
     PYTHONBREAKPOINT=ipdb.set_trace
     PY_COLORS=1
 pass_env =
@@ -40,10 +39,10 @@ commands_pre =
     poetry install --only lint,format --no-root
 commands =
     poetry check --lock
-    poetry run codespell {tox_root} --skip {tox_root}/.git --skip {tox_root}/.tox \
-      --skip {tox_root}/build --skip {tox_root}/lib --skip {tox_root}/venv \
-      --skip {tox_root}/.mypy_cache --skip {tox_root}/LICENSE --skip {tox_root}/poetry.lock \
-      --skip {[vars]test_charm_libs} --skip {tox_root}/docs
+    poetry run codespell "{tox_root}" --skip "{tox_root}/.git" --skip "{tox_root}/.tox" \
+      --skip "{tox_root}/build" --skip "{tox_root}/lib" --skip "{tox_root}/venv" \
+      --skip "{tox_root}/.mypy_cache" --skip "{tox_root}/LICENSE" --skip "{tox_root}/poetry.lock" \
+      --skip "{tox_root}/docs"
     poetry run codespell {[vars]lib_path}
     # pflake8 wrapper supports config from pyproject.toml
     poetry run ruff check {[vars]all_path}