diff --git a/chezmoi/.chezmoiscripts/run_once_after_23-install-python-tools.tmpl b/chezmoi/.chezmoiscripts/run_once_after_23-install-python-tools.tmpl
index 99e1a088..e20c674a 100644
--- a/chezmoi/.chezmoiscripts/run_once_after_23-install-python-tools.tmpl
+++ b/chezmoi/.chezmoiscripts/run_once_after_23-install-python-tools.tmpl
@@ -5,6 +5,11 @@ log_task "23. Installing python tools"
 
 ensure_path_entry "${HOME}/.local/bin"
 
+# upgrade pip and setuptools
+log_task "Upgrading pip and setuptools"
+c /usr/bin/pip3 install --upgrade pip
+c /usr/bin/pip3 install --upgrade setuptools
+
 # install pipx
 if ! pipx --version &>/dev/null; then
   log_task "Installing pipx"
diff --git a/chezmoi/.chezmoiscripts/run_once_before_20-install-prerequisites-linux.sh.tmpl b/chezmoi/.chezmoiscripts/run_once_before_20-install-prerequisites-linux.sh.tmpl
index 8867e946..74aa5959 100644
--- a/chezmoi/.chezmoiscripts/run_once_before_20-install-prerequisites-linux.sh.tmpl
+++ b/chezmoi/.chezmoiscripts/run_once_before_20-install-prerequisites-linux.sh.tmpl
@@ -99,6 +99,7 @@ readonly wanted_packages=(
   python3-pip
   python3-dev
   python3-setuptools
+  python3-testresources
   python3-venv
   gh
   git-sizer