diff --git a/.devcontainer/setup_env.sh b/.devcontainer/setup_env.sh
index f344db1d..e1f68bea 100644
--- a/.devcontainer/setup_env.sh
+++ b/.devcontainer/setup_env.sh
@@ -22,5 +22,5 @@ command -v uv >/dev/null 2>&1 || pip install uv
 source .venv/bin/activate
 
 # Install both backend extras so the devcontainer can exercise either connection path.
-uv sync --group dev --extra pyodbc --extra mssql
+uv sync --all-extras
 pre-commit install
diff --git a/Makefile b/Makefile
index 54490324..60d8faed 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ THREADS ?= auto
 .PHONY: dev
 dev: ## Installs adapter in develop mode along with development dependencies
 	@\
-	uv pip install -e . --group dev && pre-commit install
+	uv sync --all-extras && pre-commit install
 
 .PHONY: mypy
 mypy: ## Runs mypy against staged changes for static type checking.
@@ -35,17 +35,17 @@ all: ## Runs all checks against staged changes.
 .PHONY: unit
 unit: ## Runs unit tests.
 	@\
-	pytest -n auto -ra -v tests/unit
+	uv run pytest -n auto -ra -v tests/unit
 
 .PHONY: functional
 functional: ## Runs functional tests.
 	@\
-	pytest -n $(THREADS) -ra -v tests/functional
+	uv run pytest -n $(THREADS) -ra -v tests/functional
 
 .PHONY: test
 test: ## Runs unit tests and code checks against staged changes.
 	@\
-	pytest -n auto -ra -v tests/unit; \
+	uv run pytest -n auto -ra -v tests/unit; \
 	pre-commit run black-check --hook-stage manual | grep -v "INFO"; \
 	pre-commit run ruff-check-manual --hook-stage manual | grep -v "INFO"; \
 	pre-commit run mypy-check --hook-stage manual | grep -v "INFO"