diff --git a/.cirrus.yml b/.cirrus.yml
index 82b530d8..4c30cef8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,7 +4,8 @@ container:
 code_check_task:
     pip_cache:
         folder: ~/.cache/pip
-        populate_script: pip install pylint yapf
+        fingerprint_script: echo 'py3: pylint yapf'
+        populate_script: python3 -m pip install pylint yapf
     yapf_script:
         - python3 -m yapf --style '.style.yapf' -e '*/third_party/*' -rpd buildkit
         - python3 -m yapf --style '.style.yapf' -rpd devutils
@@ -18,5 +19,6 @@ validate_config_task:
 validate_patches_task:
     pip_cache:
         folder: ~/.cache/pip
-        populate_script: pip install requests
+        fingerprint_script: echo 'py3: requests'
+        populate_script: python3 -m pip install requests
     validate_patches_script: ./devutils/validate_patches.py -r