diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index 86c20d2db4..d3dbbc5b3f 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -4,7 +4,7 @@
 
 **[Recipe Modules](#Recipe-Modules)**
   * [bot_update](#recipe_modules-bot_update) (Python3 ✅) — Recipe module to ensure a checkout is consistent on a bot.
-  * [cipd](#recipe_modules-cipd) — API for interacting with CIPD.
+  * [cipd](#recipe_modules-cipd) (Python3 ✅) — API for interacting with CIPD.
   * [depot_tools](#recipe_modules-depot_tools) (Python3 ✅) — The `depot_tools` module provides safe functions to access paths within the depot_tools repo.
   * [gclient](#recipe_modules-gclient) (Python3 ✅)
   * [gerrit](#recipe_modules-gerrit) (Python3 ✅)
@@ -21,8 +21,8 @@
   * [bot_update:examples/full](#recipes-bot_update_examples_full) (Python3 ✅)
   * [bot_update:tests/do_not_retry_patch_failures_in_cq](#recipes-bot_update_tests_do_not_retry_patch_failures_in_cq) (Python3 ✅)
   * [bot_update:tests/ensure_checkout](#recipes-bot_update_tests_ensure_checkout) (Python3 ✅)
-  * [cipd:examples/full](#recipes-cipd_examples_full)
-  * [cipd:examples/platform_suffix](#recipes-cipd_examples_platform_suffix)
+  * [cipd:examples/full](#recipes-cipd_examples_full) (Python3 ✅)
+  * [cipd:examples/platform_suffix](#recipes-cipd_examples_platform_suffix) (Python3 ✅)
   * [depot_tools:examples/full](#recipes-depot_tools_examples_full) (Python3 ✅)
   * [fetch_end_to_end_test](#recipes-fetch_end_to_end_test)
   * [gclient:examples/full](#recipes-gclient_examples_full) (Python3 ✅)
@@ -119,9 +119,9 @@ Sets a fixed revision for a single dependency using project revision
 properties.
 ### *recipe_modules* / [cipd](/recipes/recipe_modules/cipd)
 
-[DEPS](/recipes/recipe_modules/cipd/__init__.py#1): [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/cipd/__init__.py#3): [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
 
-PYTHON_VERSION_COMPATIBILITY: PY2
+PYTHON_VERSION_COMPATIBILITY: PY2+3
 
 API for interacting with CIPD.
 
@@ -1078,18 +1078,18 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3
 — **def [RunSteps](/recipes/recipe_modules/bot_update/tests/ensure_checkout.py#16)(api):**
 ### *recipes* / [cipd:examples/full](/recipes/recipe_modules/cipd/examples/full.py)
 
-[DEPS](/recipes/recipe_modules/cipd/examples/full.py#8): [cipd](#recipe_modules-cipd), [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/cipd/examples/full.py#10): [cipd](#recipe_modules-cipd), [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
 
-PYTHON_VERSION_COMPATIBILITY: PY2
+PYTHON_VERSION_COMPATIBILITY: PY2+3
 
-— **def [RunSteps](/recipes/recipe_modules/cipd/examples/full.py#27)(api, use_pkg, pkg_files, pkg_dirs, ver_files, install_mode):**
+— **def [RunSteps](/recipes/recipe_modules/cipd/examples/full.py#29)(api, use_pkg, pkg_files, pkg_dirs, ver_files, install_mode):**
 ### *recipes* / [cipd:examples/platform\_suffix](/recipes/recipe_modules/cipd/examples/platform_suffix.py)
 
-[DEPS](/recipes/recipe_modules/cipd/examples/platform_suffix.py#8): [cipd](#recipe_modules-cipd), [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/recipe_modules/cipd/examples/platform_suffix.py#10): [cipd](#recipe_modules-cipd), [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
 
-PYTHON_VERSION_COMPATIBILITY: PY2
+PYTHON_VERSION_COMPATIBILITY: PY2+3
 
-— **def [RunSteps](/recipes/recipe_modules/cipd/examples/platform_suffix.py#22)(api, arch_override, bits_override, expect_error):**
+— **def [RunSteps](/recipes/recipe_modules/cipd/examples/platform_suffix.py#24)(api, arch_override, bits_override, expect_error):**
 ### *recipes* / [depot\_tools:examples/full](/recipes/recipe_modules/depot_tools/examples/full.py)
 
 [DEPS](/recipes/recipe_modules/depot_tools/examples/full.py#7): [depot\_tools](#recipe_modules-depot_tools), [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/recipes/recipe_modules/cipd/__init__.py b/recipes/recipe_modules/cipd/__init__.py
index cc6078ed4b..76145c4b2e 100644
--- a/recipes/recipe_modules/cipd/__init__.py
+++ b/recipes/recipe_modules/cipd/__init__.py
@@ -1,3 +1,5 @@
+PYTHON_VERSION_COMPATIBILITY = 'PY2+3'
+
 DEPS = [
   'recipe_engine/json',
   'recipe_engine/path',
diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
index 1b411b43a8..3dee0cccf6 100644
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
@@ -289,7 +289,7 @@
       "The recipe has crashed at point 'Uncaught exception'!",
       "",
       "Traceback (most recent call last):",
-      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 70, in RunSteps",
+      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 72, in RunSteps",
       "    pkg.add_file(api.path.abs_to_path(fullpath))",
       "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 118, in add_file",
       "    self.files.append(self._rel_path(file_path))",
diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
index 49c428a8c5..10d68e2993 100644
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
@@ -289,7 +289,7 @@
       "The recipe has crashed at point 'Uncaught exception'!",
       "",
       "Traceback (most recent call last):",
-      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 68, in RunSteps",
+      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 70, in RunSteps",
       "    pkg = api.cipd.PackageDefinition('infra/fake-package', root, install_mode)",
       "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 64, in __init__",
       "    raise ValueError('invalid value for install_mode: %r' % install_mode)",
diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
index 730f5071e9..bf1bba409b 100644
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
@@ -289,7 +289,7 @@
       "The recipe has crashed at point 'Uncaught exception'!",
       "",
       "Traceback (most recent call last):",
-      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 76, in RunSteps",
+      "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 78, in RunSteps",
       "    pkg.add_version_file(pth)",
       "  File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 144, in add_version_file",
       "    raise ValueError('add_version_file() may only be used once.')",
diff --git a/recipes/recipe_modules/cipd/examples/full.py b/recipes/recipe_modules/cipd/examples/full.py
index 1a2814a6b0..144e52de47 100644
--- a/recipes/recipe_modules/cipd/examples/full.py
+++ b/recipes/recipe_modules/cipd/examples/full.py
@@ -5,6 +5,8 @@
 from recipe_engine.config import List, Single, ConfigList, ConfigGroup
 from recipe_engine.recipe_api import Property
 
+PYTHON_VERSION_COMPATIBILITY = 'PY2+3'
+
 DEPS = [
   'recipe_engine/path',
   'recipe_engine/platform',
diff --git a/recipes/recipe_modules/cipd/examples/platform_suffix.py b/recipes/recipe_modules/cipd/examples/platform_suffix.py
index d45d07c997..157269ddf8 100644
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.py
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.py
@@ -5,6 +5,8 @@
 from recipe_engine.config import List, Single, ConfigList, ConfigGroup
 from recipe_engine.recipe_api import Property
 
+PYTHON_VERSION_COMPATIBILITY = 'PY2+3'
+
 DEPS = [
   'recipe_engine/path',
   'recipe_engine/platform',