diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index ce0f40493d1..395756ab4ad 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -533,11 +533,11 @@ def grpc_test_only_deps():
     if "com_github_yaml_pyyaml" not in native.existing_rules():
         http_archive(
             name = "com_github_yaml_pyyaml",
-            sha256 = "6b4314b1b2051ddb9d4fcd1634e1fa9c1bb4012954273c9ff3ef689f6ec6c93e",
-            strip_prefix = "pyyaml-3.12",
+            sha256 = "e34d97db6d846f5e2ad51417fd646e7ce6a3a70726ccea2a857e0580a7155f39",
+            strip_prefix = "pyyaml-6.0.1",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/yaml/pyyaml/archive/3.12.zip",
-                "https://github.com/yaml/pyyaml/archive/3.12.zip",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/yaml/pyyaml/archive/6.0.1.zip",
+                "https://github.com/yaml/pyyaml/archive/6.0.1.zip",
             ],
             build_file = "@com_github_grpc_grpc//third_party:yaml.BUILD",
         )
diff --git a/test/cpp/naming/utils/BUILD b/test/cpp/naming/utils/BUILD
index 6927a29bd1b..37f497ffe2a 100644
--- a/test/cpp/naming/utils/BUILD
+++ b/test/cpp/naming/utils/BUILD
@@ -32,6 +32,7 @@ grpc_py_binary(
         "twisted",
         "yaml",
     ],
+    python_version = "PY3",
 )
 
 grpc_py_binary(
@@ -41,16 +42,19 @@ grpc_py_binary(
     external_deps = [
         "twisted",
     ],
+    python_version = "PY3",
 )
 
 grpc_py_binary(
     name = "tcp_connect",
     testonly = True,
     srcs = ["tcp_connect.py"],
+    python_version = "PY3",
 )
 
 grpc_py_binary(
     name = "health_check",
     testonly = True,
     srcs = ["health_check.py"],
+    python_version = "PY3",
 )