diff --git a/tox.ini b/tox.ini
index 9886380b4..e1930438d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -74,4 +74,11 @@ exclude =
   *.egg,
   # vendored files
   roles/use-buildset-registry/module_utils/pytoml.py,
-  roles/use-buildset-registry/module_utils/remarshal.py
\ No newline at end of file
+  roles/use-buildset-registry/module_utils/remarshal.py
+
+[testenv:update-test-platforms]
+basepython = python3
+deps =
+  ruamel.yaml>=0.16.7
+commands =
+  python ./tools/update-test-platforms.py
diff --git a/zuul-tests.d/cloud-roles-jobs.yaml b/zuul-tests.d/cloud-roles-jobs.yaml
index 7713c802a..8668f3975 100644
--- a/zuul-tests.d/cloud-roles-jobs.yaml
+++ b/zuul-tests.d/cloud-roles-jobs.yaml
@@ -9,7 +9,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index 28f54ae69..74b5dbd29 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -207,7 +207,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index 801e2f024..3fb8b51dd 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -462,7 +462,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/go-roles-jobs.yaml b/zuul-tests.d/go-roles-jobs.yaml
index 7e5a185ac..ce319b51c 100644
--- a/zuul-tests.d/go-roles-jobs.yaml
+++ b/zuul-tests.d/go-roles-jobs.yaml
@@ -10,6 +10,11 @@
     vars:
       go_command: version
 
+# -* AUTOGENERATED *-
+#  The following project section is autogenerated by
+#    tox -e update-test-platforms
+#  Please re-run to generate new job lists
+
 - project:
     check:
       jobs: &id001
diff --git a/zuul-tests.d/jobs.yaml b/zuul-tests.d/jobs.yaml
index eeda8c0d8..a928a42c2 100644
--- a/zuul-tests.d/jobs.yaml
+++ b/zuul-tests.d/jobs.yaml
@@ -12,7 +12,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/js-roles-jobs.yaml b/zuul-tests.d/js-roles-jobs.yaml
index a6cfd14ba..fefcf1e67 100644
--- a/zuul-tests.d/js-roles-jobs.yaml
+++ b/zuul-tests.d/js-roles-jobs.yaml
@@ -9,7 +9,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/launchpad-roles-jobs.yaml b/zuul-tests.d/launchpad-roles-jobs.yaml
index 8f7661e0f..92872570d 100644
--- a/zuul-tests.d/launchpad-roles-jobs.yaml
+++ b/zuul-tests.d/launchpad-roles-jobs.yaml
@@ -13,7 +13,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/puppet-roles-jobs.yaml b/zuul-tests.d/puppet-roles-jobs.yaml
index 348468436..13e4bd15c 100644
--- a/zuul-tests.d/puppet-roles-jobs.yaml
+++ b/zuul-tests.d/puppet-roles-jobs.yaml
@@ -9,7 +9,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - project:
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index e2dafeb0b..834ca06c0 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -19,7 +19,7 @@
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
-#    tools/update-test-platforms.py
+#    tox -e update-test-platforms
 #  Please re-run to generate new job lists
 
 - job: