Hand-written changes

94 files changed, 7392 insertions, 7196 deletions

diff --git a/templates/BUILD.template b/templates/BUILD.template
index 8b565a0dc0..bb18c353b1 100644
--- a/templates/BUILD.template
+++ b/templates/BUILD.template
@@ -1,227 +1,229 @@
-# GRPC Bazel BUILD file.
-# This currently builds C, C++ and Objective-C code.
-# This file has been automatically generated from a template file.
-# Please look at the templates directory instead.
-# This file can be regenerated from the template by running
-# tools/buildgen/generate_projects.sh
-
-# Copyright 2015, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-licenses(["notice"])  # 3-clause BSD
-
-package(default_visibility = ["//visibility:public"])
-
-<%!
-def get_deps(target_dict):
-  deps = []
-  if target_dict.get('secure', 'no') == 'yes':
+%YAML 1.2
+--- |
+  # GRPC Bazel BUILD file.
+  # This currently builds C, C++ and Objective-C code.
+  # This file has been automatically generated from a template file.
+  # Please look at the templates directory instead.
+  # This file can be regenerated from the template by running
+  # tools/buildgen/generate_projects.sh
+  
+  # Copyright 2015, Google Inc.
+  # All rights reserved.
+  #
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions are
+  # met:
+  #
+  #     * Redistributions of source code must retain the above copyright
+  # notice, this list of conditions and the following disclaimer.
+  #     * Redistributions in binary form must reproduce the above
+  # copyright notice, this list of conditions and the following disclaimer
+  # in the documentation and/or other materials provided with the
+  # distribution.
+  #     * Neither the name of Google Inc. nor the names of its
+  # contributors may be used to endorse or promote products derived from
+  # this software without specific prior written permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  
+  licenses(["notice"])  # 3-clause BSD
+  
+  package(default_visibility = ["//visibility:public"])
+  
+  <%!
+  def get_deps(target_dict):
+    deps = []
+    if target_dict.get('secure', False):
+      deps = [
+        "//external:libssl",
+      ]
+    if target_dict.get('build', None) == 'protoc':
+      deps.append("//external:protobuf_compiler")
+    if target_dict['name'] == 'grpc++_unsecure' or target_dict['name'] == 'grpc++':
+      deps.append("//external:protobuf_clib")
+    elif target_dict['name'] == 'grpc':
+      deps.append("//external:zlib")
+    for d in target_dict.get('deps', []):
+      if d.find('//') == 0 or d[0] == ':':
+        deps.append(d)
+      else:
+        deps.append(':%s' % (d))
+    return deps
+  %>
+  
+  % for lib in libs:
+  % if lib.build in ("all", "protoc"):
+  ${cc_library(lib)}
+  % endif
+  % endfor
+  
+  % for lib in libs:
+  % if lib.name in ("grpc", "gpr"):
+  ${objc_library(lib)}
+  % endif
+  % endfor
+  
+  % for tgt in targets:
+  % if tgt.build == 'protoc':
+  ${cc_binary(tgt)}
+  % endif
+  % endfor
+  
+  <%def name="cc_library(lib)">
+  cc_library(
+    name = "${lib.name}",
+    srcs = [
+  % for hdr in lib.get("headers", []):
+      "${hdr}",
+  % endfor
+  % for src in lib.src:
+      "${src}",
+  % endfor
+    ],
+    hdrs = [
+  % for hdr in lib.get("public_headers", []):
+      "${hdr}",
+  % endfor
+    ],
+    includes = [
+      "include",
+      ".",
+    ],
     deps = [
-      "//external:libssl",
-    ]
-  if target_dict.get('build', None) == 'protoc':
-    deps.append("//external:protobuf_compiler")
-  if target_dict['name'] == 'grpc++_unsecure' or target_dict['name'] == 'grpc++':
-    deps.append("//external:protobuf_clib")
-  elif target_dict['name'] == 'grpc':
-    deps.append("//external:zlib")
-  for d in target_dict.get('deps', []):
-    if d.find('//') == 0 or d[0] == ':':
-      deps.append(d)
-    else:
-      deps.append(':%s' % (d))
-  return deps
-%>
-
-% for lib in libs:
-% if lib.build in ("all", "protoc"):
-${cc_library(lib)}
-% endif
-% endfor
-
-% for lib in libs:
-% if lib.name in ("grpc", "gpr"):
-${objc_library(lib)}
-% endif
-% endfor
-
-% for tgt in targets:
-% if tgt.build == 'protoc':
-${cc_binary(tgt)}
-% endif
-% endfor
-
-<%def name="cc_library(lib)">
-cc_library(
-  name = "${lib.name}",
-  srcs = [
-% for hdr in lib.get("headers", []):
-    "${hdr}",
-% endfor
-% for src in lib.src:
-    "${src}",
-% endfor
-  ],
-  hdrs = [
-% for hdr in lib.get("public_headers", []):
-    "${hdr}",
-% endfor
-  ],
-  includes = [
-    "include",
-    ".",
-  ],
-  deps = [
-% for dep in get_deps(lib):
-    "${dep}",
-% endfor
-  ],
-)
-</%def>
-
-<%def name="objc_library(lib)">
-objc_library(
-  name = "${lib.name}_objc",
-  srcs = [
-% for src in lib.src:
-    "${src}",
-% endfor
-  ],
-  hdrs = [
-% for hdr in lib.get("public_headers", []):
-    "${hdr}",
-% endfor
-% for hdr in lib.get("headers", []):
-    "${hdr}",
-% endfor
-  ],
-  includes = [
-    "include",
-    ".",
-  ],
-  deps = [
-% for dep in lib.get("deps", []):
-    ":${dep}_objc",
-% endfor
-% if lib.get('secure', 'no') == 'yes':
-    "//external:libssl_objc",
-% endif
-  ],
-% if lib.get("baselib", false):
-  sdk_dylibs = ["libz"],
-% endif
-)
-</%def>
-
-<%def name="cc_binary(tgt)">
-cc_binary(
-  name = "${tgt.name}",
-  srcs = [
-% for src in tgt.src:
-    "${src}",
-% endfor
-  ],
-  deps = [
-% for dep in get_deps(tgt):
-    "${dep}",
-% endfor
-  ],
-)
-</%def>
-
-objc_path = "src/objective-c"
-
-rx_library_path = objc_path + "/RxLibrary"
-
-objc_library(
-  name = "rx_library",
-  hdrs = glob([
-    rx_library_path + "/*.h",
-    rx_library_path + "/transformations/*.h",
-  ]),
-  srcs = glob([
-    rx_library_path + "/*.m",
-    rx_library_path + "/transformations/*.m",
-  ]),
-  includes = [objc_path],
-  deps = [
-    ":rx_library_private",
-  ],
-)
-
-objc_library(
-  name = "rx_library_private",
-  hdrs = glob([rx_library_path + "/private/*.h"]),
-  srcs = glob([rx_library_path + "/private/*.m"]),
-  visibility = ["//visibility:private"],
-)
-
-objc_client_path = objc_path + "/GRPCClient"
-
-objc_library(
-  name = "grpc_client",
-  hdrs = glob([
-    objc_client_path + "/*.h",
-    objc_client_path + "/private/*.h",
-  ]),
-  srcs = glob([
-    objc_client_path + "/*.m",
-    objc_client_path + "/private/*.m",
-  ]),
-  includes = [objc_path],
-  bundles = [":gRPCCertificates"],
-  deps = [
-    ":grpc_objc",
-    ":rx_library",
-  ],
-)
-
-objc_bundle_library(
-    # The choice of name is signicant here, since it determines the bundle name.
-    name = "gRPCCertificates",
-    resources = ["etc/roots.pem"],
-)
-
-proto_objc_rpc_path = objc_path + "/ProtoRPC"
-
-objc_library(
-  name = "proto_objc_rpc",
-  hdrs = glob([
-    proto_objc_rpc_path + "/*.h",
-  ]),
-  srcs = glob([
-    proto_objc_rpc_path + "/*.m",
-  ]),
-  includes = [objc_path],
-  deps = [
-    ":grpc_client",
-    ":rx_library",
-    "//external:protobuf_objc",
-  ],
-)
+  % for dep in get_deps(lib):
+      "${dep}",
+  % endfor
+    ],
+  )
+  </%def>
+  
+  <%def name="objc_library(lib)">
+  objc_library(
+    name = "${lib.name}_objc",
+    srcs = [
+  % for src in lib.src:
+      "${src}",
+  % endfor
+    ],
+    hdrs = [
+  % for hdr in lib.get("public_headers", []):
+      "${hdr}",
+  % endfor
+  % for hdr in lib.get("headers", []):
+      "${hdr}",
+  % endfor
+    ],
+    includes = [
+      "include",
+      ".",
+    ],
+    deps = [
+  % for dep in lib.get("deps", []):
+      ":${dep}_objc",
+  % endfor
+  % if lib.get('secure', False):
+      "//external:libssl_objc",
+  % endif
+    ],
+  % if lib.get("baselib", false):
+    sdk_dylibs = ["libz"],
+  % endif
+  )
+  </%def>
+  
+  <%def name="cc_binary(tgt)">
+  cc_binary(
+    name = "${tgt.name}",
+    srcs = [
+  % for src in tgt.src:
+      "${src}",
+  % endfor
+    ],
+    deps = [
+  % for dep in get_deps(tgt):
+      "${dep}",
+  % endfor
+    ],
+  )
+  </%def>
+  
+  objc_path = "src/objective-c"
+  
+  rx_library_path = objc_path + "/RxLibrary"
+  
+  objc_library(
+    name = "rx_library",
+    hdrs = glob([
+      rx_library_path + "/*.h",
+      rx_library_path + "/transformations/*.h",
+    ]),
+    srcs = glob([
+      rx_library_path + "/*.m",
+      rx_library_path + "/transformations/*.m",
+    ]),
+    includes = [objc_path],
+    deps = [
+      ":rx_library_private",
+    ],
+  )
+  
+  objc_library(
+    name = "rx_library_private",
+    hdrs = glob([rx_library_path + "/private/*.h"]),
+    srcs = glob([rx_library_path + "/private/*.m"]),
+    visibility = ["//visibility:private"],
+  )
+  
+  objc_client_path = objc_path + "/GRPCClient"
+  
+  objc_library(
+    name = "grpc_client",
+    hdrs = glob([
+      objc_client_path + "/*.h",
+      objc_client_path + "/private/*.h",
+    ]),
+    srcs = glob([
+      objc_client_path + "/*.m",
+      objc_client_path + "/private/*.m",
+    ]),
+    includes = [objc_path],
+    bundles = [":gRPCCertificates"],
+    deps = [
+      ":grpc_objc",
+      ":rx_library",
+    ],
+  )
+  
+  objc_bundle_library(
+      # The choice of name is signicant here, since it determines the bundle name.
+      name = "gRPCCertificates",
+      resources = ["etc/roots.pem"],
+  )
+  
+  proto_objc_rpc_path = objc_path + "/ProtoRPC"
+  
+  objc_library(
+    name = "proto_objc_rpc",
+    hdrs = glob([
+      proto_objc_rpc_path + "/*.h",
+    ]),
+    srcs = glob([
+      proto_objc_rpc_path + "/*.m",
+    ]),
+    includes = [objc_path],
+    deps = [
+      ":grpc_client",
+      ":rx_library",
+      "//external:protobuf_objc",
+    ],
+  )
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 797f0ab57f..6069d6d238 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -1,1874 +1,1876 @@
-# GRPC global makefile
-# This currently builds C and C++ code.
-# This file has been automatically generated from a template file.
-# Please look at the templates directory instead.
-# This file can be regenerated from the template by running
-# tools/buildgen/generate_projects.sh
-
-# Copyright 2015, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-<%!
-  import re
-  import os
-
-  proto_re = re.compile('(.*)\\.proto')
-
-  def proto_to_cc(filename):
-    m = proto_re.match(filename)
-    if not m:
-      return filename
-    return '$(GENDIR)/' + m.group(1) + '.pb.cc $(GENDIR)/' + m.group(1) + '.grpc.pb.cc'
-
-  sources_that_need_openssl = set()
-  sources_that_don_t_need_openssl = set()
-%>
-
-
-# Basic platform detection
-HOST_SYSTEM = $(shell uname | cut -f 1 -d_)
-ifeq ($(SYSTEM),)
-SYSTEM = $(HOST_SYSTEM)
-endif
-ifeq ($(SYSTEM),MSYS)
-SYSTEM = MINGW32
-endif
-ifeq ($(SYSTEM),MINGW64)
-SYSTEM = MINGW32
-endif
-
-
-ifndef BUILDDIR
-BUILDDIR = .
-endif
-
-HAS_GCC = $(shell which gcc > /dev/null 2> /dev/null && echo true || echo false)
-HAS_CC = $(shell which cc > /dev/null 2> /dev/null && echo true || echo false)
-HAS_CLANG = $(shell which clang > /dev/null 2> /dev/null && echo true || echo false)
-
-ifeq ($(HAS_CC),true)
-DEFAULT_CC = cc
-DEFAULT_CXX = c++
-else
-ifeq ($(HAS_GCC),true)
-DEFAULT_CC = gcc
-DEFAULT_CXX = g++
-else
-ifeq ($(HAS_CLANG),true)
-DEFAULT_CC = clang
-DEFAULT_CXX = clang++
-else
-DEFAULT_CC = no_c_compiler
-DEFAULT_CXX = no_c++_compiler
-endif
-endif
-endif
-
-
-BINDIR = $(BUILDDIR)/bins
-OBJDIR = $(BUILDDIR)/objs
-LIBDIR = $(BUILDDIR)/libs
-GENDIR = $(BUILDDIR)/gens
-
-# Configurations
-
-VALID_CONFIG_opt = 1
-CC_opt = $(DEFAULT_CC)
-CXX_opt = $(DEFAULT_CXX)
-LD_opt = $(DEFAULT_CC)
-LDXX_opt = $(DEFAULT_CXX)
-CPPFLAGS_opt = -O2
-LDFLAGS_opt =
-DEFINES_opt = NDEBUG
-
-VALID_CONFIG_basicprof = 1
-CC_basicprof = $(DEFAULT_CC)
-CXX_basicprof = $(DEFAULT_CXX)
-LD_basicprof = $(DEFAULT_CC)
-LDXX_basicprof = $(DEFAULT_CXX)
-CPPFLAGS_basicprof = -O2 -DGRPC_BASIC_PROFILER -DGRPC_TIMERS_RDTSC
-LDFLAGS_basicprof =
-DEFINES_basicprof = NDEBUG
-
-VALID_CONFIG_stapprof = 1
-CC_stapprof = $(DEFAULT_CC)
-CXX_stapprof = $(DEFAULT_CXX)
-LD_stapprof = $(DEFAULT_CC)
-LDXX_stapprof = $(DEFAULT_CXX)
-CPPFLAGS_stapprof = -O2 -DGRPC_STAP_PROFILER
-LDFLAGS_stapprof =
-DEFINES_stapprof = NDEBUG
-
-VALID_CONFIG_dbg = 1
-CC_dbg = $(DEFAULT_CC)
-CXX_dbg = $(DEFAULT_CXX)
-LD_dbg = $(DEFAULT_CC)
-LDXX_dbg = $(DEFAULT_CXX)
-CPPFLAGS_dbg = -O0
-LDFLAGS_dbg =
-DEFINES_dbg = _DEBUG DEBUG
-
-VALID_CONFIG_mutrace = 1
-CC_mutrace = $(DEFAULT_CC)
-CXX_mutrace = $(DEFAULT_CXX)
-LD_mutrace = $(DEFAULT_CC)
-LDXX_mutrace = $(DEFAULT_CXX)
-CPPFLAGS_mutrace = -O0
-LDFLAGS_mutrace = -rdynamic
-DEFINES_mutrace = _DEBUG DEBUG
-
-VALID_CONFIG_valgrind = 1
-REQUIRE_CUSTOM_LIBRARIES_valgrind = 1
-CC_valgrind = $(DEFAULT_CC)
-CXX_valgrind = $(DEFAULT_CXX)
-LD_valgrind = $(DEFAULT_CC)
-LDXX_valgrind = $(DEFAULT_CXX)
-CPPFLAGS_valgrind = -O0
-OPENSSL_CFLAGS_valgrind = -DPURIFY
-LDFLAGS_valgrind =
-DEFINES_valgrind = _DEBUG DEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=20
-
-VALID_CONFIG_tsan = 1
-REQUIRE_CUSTOM_LIBRARIES_tsan = 1
-CC_tsan = clang
-CXX_tsan = clang++
-LD_tsan = clang
-LDXX_tsan = clang++
-CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-error=unused-command-line-argument
-LDFLAGS_tsan = -fsanitize=thread
-DEFINES_tsan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=10
-
-VALID_CONFIG_asan = 1
-REQUIRE_CUSTOM_LIBRARIES_asan = 1
-CC_asan = clang
-CXX_asan = clang++
-LD_asan = clang
-LDXX_asan = clang++
-CPPFLAGS_asan = -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-error=unused-command-line-argument
-LDFLAGS_asan = -fsanitize=address
-DEFINES_asan = GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
-
-VALID_CONFIG_msan = 1
-REQUIRE_CUSTOM_LIBRARIES_msan = 1
-CC_msan = clang
-CXX_msan = clang++-libc++
-LD_msan = clang
-LDXX_msan = clang++-libc++
-CPPFLAGS_msan = -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-error=unused-command-line-argument
-OPENSSL_CFLAGS_msan = -DPURIFY
-LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1
-DEFINES_msan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=4
-
-VALID_CONFIG_ubsan = 1
-REQUIRE_CUSTOM_LIBRARIES_ubsan = 1
-CC_ubsan = clang
-CXX_ubsan = clang++
-LD_ubsan = clang
-LDXX_ubsan = clang++
-CPPFLAGS_ubsan = -O1 -fsanitize=undefined -fno-omit-frame-pointer -Wno-error=unused-command-line-argument
-OPENSSL_CFLAGS_ubsan = -DPURIFY
-LDFLAGS_ubsan = -fsanitize=undefined
-DEFINES_ubsan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
-
-VALID_CONFIG_gcov = 1
-CC_gcov = gcc
-CXX_gcov = g++
-LD_gcov = gcc
-LDXX_gcov = g++
-CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage
-LDFLAGS_gcov = -fprofile-arcs -ftest-coverage
-DEFINES_gcov = _DEBUG DEBUG
-
-
-# General settings.
-# You may want to change these depending on your system.
-
-prefix ?= /usr/local
-
-PROTOC = protoc
-DTRACE = dtrace
-CONFIG ?= opt
-CC = $(CC_$(CONFIG))
-CXX = $(CXX_$(CONFIG))
-LD = $(LD_$(CONFIG))
-LDXX = $(LDXX_$(CONFIG))
-AR = ar
-ifeq ($(SYSTEM),Linux)
-STRIP = strip --strip-unneeded
-else
-ifeq ($(SYSTEM),Darwin)
-STRIP = strip -x
-else
-STRIP = strip
-endif
-endif
-INSTALL = install
-RM = rm -f
-PKG_CONFIG = pkg-config
-
-ifndef VALID_CONFIG_$(CONFIG)
-$(error Invalid CONFIG value '$(CONFIG)')
-endif
-
-ifeq ($(SYSTEM),Linux)
-TMPOUT = /dev/null
-else
-TMPOUT = `mktemp /tmp/test-out-XXXXXX`
-endif
-
-# Detect if we can use C++11
-CXX11_CHECK_CMD = $(CXX) -std=c++11 -o $(TMPOUT) -c test/build/c++11.cc
-HAS_CXX11 = $(shell $(CXX11_CHECK_CMD) 2> /dev/null && echo true || echo false)
-
-# The HOST compiler settings are used to compile the protoc plugins.
-# In most cases, you won't have to change anything, but if you are
-# cross-compiling, you can override these variables from GNU make's
-# command line: make CC=cross-gcc HOST_CC=gcc
-
-HOST_CC = $(CC)
-HOST_CXX = $(CXX)
-HOST_LD = $(LD)
-HOST_LDXX = $(LDXX)
-
-ifdef EXTRA_DEFINES
-DEFINES += $(EXTRA_DEFINES)
-endif
-
-CFLAGS += -std=c89 -pedantic
-ifeq ($(HAS_CXX11),true)
-CXXFLAGS += -std=c++11
-else
-CXXFLAGS += -std=c++0x
-endif
-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
-LDFLAGS += -g
-
-CPPFLAGS += $(CPPFLAGS_$(CONFIG))
-DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\"
-LDFLAGS += $(LDFLAGS_$(CONFIG))
-
-ifneq ($(SYSTEM),MINGW32)
-PIC_CPPFLAGS = -fPIC
-CPPFLAGS += -fPIC
-LDFLAGS += -fPIC
-endif
-
-INCLUDES = . include $(GENDIR)
-LDFLAGS += -Llibs/$(CONFIG)
-
-ifeq ($(SYSTEM),Darwin)
-ifneq ($(wildcard /usr/local/ssl/include),)
-INCLUDES += /usr/local/ssl/include
-endif
-ifneq ($(wildcard /opt/local/include),)
-INCLUDES += /opt/local/include
-endif
-ifneq ($(wildcard /usr/local/include),)
-INCLUDES += /usr/local/include
-endif
-LIBS = m z
-ifneq ($(wildcard /usr/local/ssl/lib),)
-LDFLAGS += -L/usr/local/ssl/lib
-endif
-ifneq ($(wildcard /opt/local/lib),)
-LDFLAGS += -L/opt/local/lib
-endif
-ifneq ($(wildcard /usr/local/lib),)
-LDFLAGS += -L/usr/local/lib
-endif
-endif
-
-ifeq ($(SYSTEM),Linux)
-LIBS = rt m z pthread
-LDFLAGS += -pthread
-endif
-
-ifeq ($(SYSTEM),MINGW32)
-LIBS = m z pthread
-LDFLAGS += -pthread
-endif
-
-GTEST_LIB = -Ithird_party/googletest/include -Ithird_party/googletest third_party/googletest/src/gtest-all.cc
-GTEST_LIB += -lgflags
-ifeq ($(V),1)
-E = @:
-Q =
-else
-E = @echo
-Q = @
-endif
-
-VERSION = ${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}
-
-CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
-CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
-
-LDFLAGS += $(ARCH_FLAGS)
-LDLIBS += $(addprefix -l, $(LIBS))
-LDLIBSXX += $(addprefix -l, $(LIBSXX))
-
-HOST_CPPFLAGS = $(CPPFLAGS)
-HOST_CFLAGS = $(CFLAGS)
-HOST_CXXFLAGS = $(CXXFLAGS)
-HOST_LDFLAGS = $(LDFLAGS)
-HOST_LDLIBS = $(LDLIBS)
-
-
-# These are automatically computed variables.
-# There shouldn't be any need to change anything from now on.
-
--include cache.mk
-
-CACHE_MK =
-
-HAS_PKG_CONFIG ?= $(shell command -v $(PKG_CONFIG) >/dev/null 2>&1 && echo true || echo false)
-
-ifeq ($(HAS_PKG_CONFIG), true)
-CACHE_MK += HAS_PKG_CONFIG = true,
-endif
-
-PC_TEMPLATE = prefix=$(prefix),\
-exec_prefix=${'\$${prefix}'},\
-includedir=${'\$${prefix}'}/include,\
-libdir=${'\$${exec_prefix}'}/lib,\
-,\
-Name: $(PC_NAME),\
-Description: $(PC_DESCRIPTION),\
-Version: $(VERSION),\
-Cflags: -I${'\$${includedir}'} $(PC_CFLAGS),\
-Requires.private: $(PC_REQUIRES_PRIVATE),\
-Libs: -L${'\$${libdir}'} $(PC_LIB),\
-Libs.private: $(PC_LIBS_PRIVATE)
-
-# gpr .pc file
-PC_NAME = gRPC Portable Runtime
-PC_DESCRIPTION = gRPC Portable Runtime
-PC_CFLAGS = -pthread
-PC_REQUIRES_PRIVATE =
-PC_LIBS_PRIVATE = -lpthread
-PC_LIB = -lgpr
-ifneq ($(SYSTEM),Darwin)
-PC_LIBS_PRIVATE += -lrt
-endif
-GPR_PC_FILE := $(PC_TEMPLATE)
-
-ifeq ($(SYSTEM),MINGW32)
-SHARED_EXT = dll
-endif
-ifeq ($(SYSTEM),Darwin)
-SHARED_EXT = dylib
-endif
-ifeq ($(SHARED_EXT),)
-SHARED_EXT = so.$(VERSION)
-endif
-
-ifeq ($(wildcard .git),)
-IS_GIT_FOLDER = false
-else
-IS_GIT_FOLDER = true
-endif
-
-ifeq ($(SYSTEM),Linux)
-OPENSSL_REQUIRES_DL = true
-endif
-
-ifeq ($(SYSTEM),Darwin)
-OPENSSL_REQUIRES_DL = true
-endif
-
-ifeq ($(HAS_PKG_CONFIG),true)
-OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
-OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl
-ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
-PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf
-else # HAS_PKG_CONFIG
-
-ifeq ($(SYSTEM),MINGW32)
-OPENSSL_LIBS = ssl32 eay32
-else
-OPENSSL_LIBS = ssl crypto
-endif
-
-OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/openssl-alpn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
-OPENSSL_NPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/openssl-npn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
-ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
-PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
-
-ifeq ($(OPENSSL_REQUIRES_DL),true)
-OPENSSL_ALPN_CHECK_CMD += -ldl
-OPENSSL_NPN_CHECK_CMD += -ldl
-endif
-
-endif # HAS_PKG_CONFIG
-
-PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
-
-PROTOC_CHECK_CMD = which protoc > /dev/null
-PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
-DTRACE_CHECK_CMD = which dtrace > /dev/null
-SYSTEMTAP_HEADERS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/systemtap.c $(LDFLAGS)
-ZOOKEEPER_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zookeeper.c $(LDFLAGS) -lzookeeper_mt
-
-ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
-HAS_SYSTEM_PERFTOOLS ?= $(shell $(PERFTOOLS_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_PERFTOOLS),true)
-DEFINES += GRPC_HAVE_PERFTOOLS
-LIBS += profiler
-CACHE_MK += HAS_SYSTEM_PERFTOOLS = true,
-endif
-endif
-
-HAS_SYSTEM_PROTOBUF_VERIFY = $(shell $(PROTOBUF_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
-HAS_SYSTEM_OPENSSL_ALPN ?= $(shell $(OPENSSL_ALPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
-HAS_SYSTEM_OPENSSL_NPN = true
-CACHE_MK += HAS_SYSTEM_OPENSSL_ALPN = true,
-else
-HAS_SYSTEM_OPENSSL_NPN ?= $(shell $(OPENSSL_NPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
-endif
-ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
-CACHE_MK += HAS_SYSTEM_OPENSSL_NPN = true,
-endif
-HAS_SYSTEM_ZLIB ?= $(shell $(ZLIB_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_ZLIB),true)
-CACHE_MK += HAS_SYSTEM_ZLIB = true,
-endif
-HAS_SYSTEM_PROTOBUF ?= $(HAS_SYSTEM_PROTOBUF_VERIFY)
-ifeq ($(HAS_SYSTEM_PROTOBUF),true)
-CACHE_MK += HAS_SYSTEM_PROTOBUF = true,
-endif
-else
-# override system libraries if the config requires a custom compiled library
-HAS_SYSTEM_OPENSSL_ALPN = false
-HAS_SYSTEM_OPENSSL_NPN = false
-HAS_SYSTEM_ZLIB = false
-HAS_SYSTEM_PROTOBUF = false
-endif
-
-HAS_PROTOC ?= $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_PROTOC),true)
-CACHE_MK += HAS_PROTOC = true,
-HAS_VALID_PROTOC ?= $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_VALID_PROTOC),true)
-CACHE_MK += HAS_VALID_PROTOC = true,
-endif
-else
-HAS_VALID_PROTOC = false
-endif
-
-# Check for Systemtap (https://sourceware.org/systemtap/), first by making sure <sys/sdt.h> is present
-# in the system and secondly by checking for the "dtrace" binary (on Linux, this is part of the Systemtap
-# distribution. It's part of the base system on BSD/Solaris machines).
-ifndef HAS_SYSTEMTAP
-HAS_SYSTEMTAP_HEADERS = $(shell $(SYSTEMTAP_HEADERS_CHECK_CMD) 2> /dev/null && echo true || echo false)
-HAS_DTRACE = $(shell $(DTRACE_CHECK_CMD) 2> /dev/null && echo true || echo false)
-HAS_SYSTEMTAP = false
-ifeq ($(HAS_SYSTEMTAP_HEADERS),true)
-ifeq ($(HAS_DTRACE),true)
-HAS_SYSTEMTAP = true
-endif
-endif
-endif
-
-ifeq ($(HAS_SYSTEMTAP),true)
-CACHE_MK += HAS_SYSTEMTAP = true,
-endif
-
-HAS_ZOOKEEPER = $(shell $(ZOOKEEPER_CHECK_CMD) 2> /dev/null && echo true || echo false)
-
-# Note that for testing purposes, one can do:
-#   make HAS_EMBEDDED_OPENSSL_ALPN=false
-# to emulate the fact we do not have OpenSSL in the third_party folder.
-ifeq ($(wildcard third_party/openssl/ssl/ssl.h),)
-HAS_EMBEDDED_OPENSSL_ALPN = false
-else
-HAS_EMBEDDED_OPENSSL_ALPN = true
-endif
-
-ifeq ($(wildcard third_party/zlib/zlib.h),)
-HAS_EMBEDDED_ZLIB = false
-else
-HAS_EMBEDDED_ZLIB = true
-endif
-
-ifeq ($(wildcard third_party/protobuf/src/google/protobuf/descriptor.pb.h),)
-HAS_EMBEDDED_PROTOBUF = false
-ifneq ($(HAS_VALID_PROTOC),true)
-NO_PROTOC = true
-endif
-else
-HAS_EMBEDDED_PROTOBUF = true
-endif
-
-PC_REQUIRES_GRPC = gpr
-PC_LIBS_GRPC =
-
-ifeq ($(HAS_SYSTEM_ZLIB),false)
-ifeq ($(HAS_EMBEDDED_ZLIB),true)
-ZLIB_DEP = $(LIBDIR)/$(CONFIG)/zlib/libz.a
-CPPFLAGS += -Ithird_party/zlib
-LDFLAGS += -L$(LIBDIR)/$(CONFIG)/zlib
-else
-DEP_MISSING += zlib
-endif
-else
-ifeq ($(HAS_PKG_CONFIG),true)
-CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib)
-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L zlib)
-PC_REQUIRES_GRPC += zlib
-else
-PC_LIBS_GRPC += -lz
-endif
-endif
-
-OPENSSL_PKG_CONFIG = false
-
-PC_REQUIRES_SECURE =
-PC_LIBS_SECURE =
-
-ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
-ifeq ($(HAS_PKG_CONFIG),true)
-OPENSSL_PKG_CONFIG = true
-PC_REQUIRES_SECURE = openssl
-CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
-LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
-ifeq ($(SYSTEM),Linux)
-ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
-LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
-endif
-endif
-LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
-else
-LIBS_SECURE = $(OPENSSL_LIBS)
-ifeq ($(OPENSSL_REQUIRES_DL),true)
-LIBS_SECURE += dl
-PC_LIBS_SECURE = $(addprefix -l, $(LIBS_SECURE))
-endif
-endif
-else
-ifeq ($(HAS_EMBEDDED_OPENSSL_ALPN),true)
-USE_SYSTEM_OPENSSL = false
-OPENSSL_DEP = $(LIBDIR)/$(CONFIG)/openssl/libssl.a
-OPENSSL_MERGE_LIBS += $(LIBDIR)/$(CONFIG)/openssl/libssl.a $(LIBDIR)/$(CONFIG)/openssl/libcrypto.a
-# need to prefix these to ensure overriding system libraries
-CPPFLAGS := -Ithird_party/openssl/include $(CPPFLAGS)
-LDFLAGS := -L$(LIBDIR)/$(CONFIG)/openssl $(LDFLAGS)
-ifeq ($(OPENSSL_REQUIRES_DL),true)
-LIBS_SECURE = dl
-endif
-else
-ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
-USE_SYSTEM_OPENSSL = true
-CPPFLAGS += -DTSI_OPENSSL_ALPN_SUPPORT=0
-LIBS_SECURE = $(OPENSSL_LIBS)
-ifeq ($(OPENSSL_REQUIRES_DL),true)
-LIBS_SECURE += dl
-endif
-else
-NO_SECURE = true
-endif
-endif
-endif
-
-ifeq ($(OPENSSL_PKG_CONFIG),true)
-LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
-else
-LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
-endif
-
-# grpc .pc file
-PC_NAME = gRPC
-PC_DESCRIPTION = high performance general RPC framework
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) $(PC_LIBS_SECURE)
-PC_LIB = -lgrpc
-GRPC_PC_FILE := $(PC_TEMPLATE)
-
-# gprc_unsecure .pc file
-PC_NAME = gRPC unsecure
-PC_DESCRIPTION = high performance general RPC framework without SSL
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPC)
-PC_LIB = -lgrpc
-GRPC_UNSECURE_PC_FILE := $(PC_TEMPLATE)
-
-# gprc_zookeeper .pc file
-PC_NAME = gRPC zookeeper
-PC_DESCRIPTION = gRPC's zookeeper plugin
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE =
-PC_LIBS_PRIVATE = -lzookeeper_mt
-GRPC_ZOOKEEPER_PC_FILE := $(PC_TEMPLATE)
-
-PROTOBUF_PKG_CONFIG = false
-
-PC_REQUIRES_GRPCXX =
-PC_LIBS_GRPCXX =
-
-CPPFLAGS := -Ithird_party/googletest/include $(CPPFLAGS)
-
-ifeq ($(HAS_SYSTEM_PROTOBUF),true)
-ifeq ($(HAS_PKG_CONFIG),true)
-PROTOBUF_PKG_CONFIG = true
-PC_REQUIRES_GRPCXX = protobuf
-CPPFLAGS := $(shell $(PKG_CONFIG) --cflags protobuf) $(CPPFLAGS)
-LDFLAGS_PROTOBUF_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L protobuf)
-ifeq ($(SYSTEM),Linux)
-ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),)
-LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/)
-endif
-endif
-else
-PC_LIBS_GRPCXX = -lprotobuf
-endif
-else
-ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
-PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
-CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
-LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
-PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
-else
-NO_PROTOBUF = true
-endif
-endif
-
-LIBS_PROTOBUF = protobuf
-LIBS_PROTOC = protoc protobuf
-
-HOST_LDLIBS_PROTOC += $(addprefix -l, $(LIBS_PROTOC))
-
-ifeq ($(PROTOBUF_PKG_CONFIG),true)
-LDLIBS_PROTOBUF += $(shell $(PKG_CONFIG) --libs-only-l protobuf)
-else
-LDLIBS_PROTOBUF += $(addprefix -l, $(LIBS_PROTOBUF))
-endif
-
-# grpc++ .pc file
-PC_NAME = gRPC++
-PC_DESCRIPTION = C++ wrapper for gRPC
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = grpc $(PC_REQUIRES_GRPCXX)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
-PC_LIB = -lgrpc++
-GRPCXX_PC_FILE := $(PC_TEMPLATE)
-
-# grpc++_unsecure .pc file
-PC_NAME = gRPC++ unsecure
-PC_DESCRIPTION = C++ wrapper for gRPC without SSL
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = grpc_unsecure $(PC_REQUIRES_GRPCXX)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
-PC_LIB = -lgrpc++
-GRPCXX_UNSECURE_PC_FILE := $(PC_TEMPLATE)
-
-ifeq ($(MAKECMDGOALS),clean)
-NO_DEPS = true
-endif
-
-INSTALL_OK = false
-ifeq ($(HAS_VALID_PROTOC),true)
-ifeq ($(HAS_SYSTEM_PROTOBUF_VERIFY),true)
-INSTALL_OK = true
-endif
-endif
-
-.SECONDARY = %.pb.h %.pb.cc
-
-PROTOC_PLUGINS =\
-% for tgt in targets:
-% if tgt.build == 'protoc':
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
-
-ifeq ($(DEP_MISSING),)
-all: static shared plugins\
-% for tgt in targets:
-% if tgt.build == 'all':
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
-
-dep_error:
-	@echo "You shouldn't see this message - all of your dependencies are correct."
-else
-all: dep_error git_update stop
-
-dep_error:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "You are missing system dependencies that are essential to build grpc,"
-	@echo "and the third_party directory doesn't have them:"
-	@echo
-	@echo "  $(DEP_MISSING)"
-	@echo
-	@echo "Installing the development packages for your system will solve"
-	@echo "this issue. Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-endif
-
-git_update:
-ifeq ($(IS_GIT_FOLDER),true)
-	@echo "Additionally, since you are in a git clone, you can download the"
-	@echo "missing dependencies in third_party by running the following command:"
-	@echo
-	@echo "  git submodule update --init"
-	@echo
-endif
-
-openssl_dep_error: openssl_dep_message git_update stop
-
-protobuf_dep_error: protobuf_dep_message git_update stop
-
-protoc_dep_error: protoc_dep_message git_update stop
-
-openssl_dep_message:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "The target you are trying to run requires OpenSSL."
-	@echo "Your system doesn't have it, and neither does the third_party directory."
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-
-protobuf_dep_message:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "The target you are trying to run requires protobuf 3.0.0+"
-	@echo "Your system doesn't have it, and neither does the third_party directory."
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-
-protoc_dep_message:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "The target you are trying to run requires protobuf-compiler 3.0.0+"
-	@echo "Your system doesn't have it, and neither does the third_party directory."
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-
-systemtap_dep_error:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "Under the '$(CONFIG)' configutation, the target you are trying "
-	@echo "to build requires systemtap 2.7+ (on Linux) or dtrace (on other "
-	@echo "platforms such as Solaris and *BSD). "
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-
-stop:
-	@false
-
-% for tgt in targets:
-${tgt.name}: $(BINDIR)/$(CONFIG)/${tgt.name}
-% endfor
-
-run_dep_checks:
-	$(OPENSSL_ALPN_CHECK_CMD) || true
-	$(OPENSSL_NPN_CHECK_CMD) || true
-	$(ZLIB_CHECK_CMD) || true
-	$(PERFTOOLS_CHECK_CMD) || true
-	$(PROTOBUF_CHECK_CMD) || true
-	$(PROTOC_CHECK_VERSION_CMD) || true
-	$(ZOOKEEPER_CHECK_CMD) || true
-
-$(LIBDIR)/$(CONFIG)/zlib/libz.a:
-	$(E) "[MAKE]    Building zlib"
-	$(Q)(cd third_party/zlib ; CC="$(CC)" CFLAGS="$(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(ZLIB_CFLAGS_EXTRA)" ./configure --static)
-	$(Q)$(MAKE) -C third_party/zlib clean
-	$(Q)$(MAKE) -C third_party/zlib
-	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/zlib
-	$(Q)cp third_party/zlib/libz.a $(LIBDIR)/$(CONFIG)/zlib
-
-$(LIBDIR)/$(CONFIG)/openssl/libssl.a:
-	$(E) "[MAKE]    Building openssl for $(SYSTEM)"
-ifeq ($(SYSTEM),Darwin)
-	$(Q)(cd third_party/openssl ; CC="$(CC) $(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_EXTRA)" ./Configure darwin64-x86_64-cc)
-else
-ifeq ($(SYSTEM),MINGW32)
-	@echo "We currently don't have a good way to compile OpenSSL in-place under msys."
-	@echo "Please provide a OpenSSL in your mingw32 system."
-	@echo
-	@echo "Note that you can find a compatible version of the libraries here:"
-	@echo
-	@echo "http://slproweb.com/products/Win32OpenSSL.html"
-	@echo
-	@echo "If you decide to install that one, take the full version. The light"
-	@echo "version only contains compiled DLLs, without the development files."
-	@echo
-	@echo "When installing, chose to copy the OpenSSL dlls to the OpenSSL binaries"
-	@echo "directory. This way we'll link to them directly."
-	@echo
-	@echo "You can then re-start the build the following way:"
-	@echo
-	@echo "  CPPFLAGS=-I/c/OpenSSL-Win64/include LDFLAGS=-L/c/OpenSSL-Win64 make"
-	@false
-else
-	$(Q)(cd third_party/openssl ; CC="$(CC) $(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_EXTRA)" ./config no-asm $(OPENSSL_CONFIG_$(CONFIG)))
-endif
-endif
-	$(Q)$(MAKE) -j 1 -C third_party/openssl clean
-	$(Q)(unset CPPFLAGS; $(MAKE) -j 1 -C third_party/openssl build_crypto build_ssl)
-	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/openssl
-	$(Q)cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a $(LIBDIR)/$(CONFIG)/openssl
-
-third_party/protobuf/configure:
-	$(E) "[AUTOGEN] Preparing protobuf"
-	$(Q)(cd third_party/protobuf ; autoreconf -f -i -Wall,no-obsolete)
-
-$(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure
-	$(E) "[MAKE]    Building protobuf"
-	$(Q)(cd third_party/protobuf ; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(PROTOBUF_LDFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(PROTOBUF_CPPFLAGS_EXTRA)" ./configure --disable-shared --enable-static)
-	$(Q)$(MAKE) -C third_party/protobuf clean
-	$(Q)$(MAKE) -C third_party/protobuf
-	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/protobuf
-	$(Q)mkdir -p $(BINDIR)/$(CONFIG)/protobuf
-	$(Q)cp third_party/protobuf/src/.libs/libprotoc.a $(LIBDIR)/$(CONFIG)/protobuf
-	$(Q)cp third_party/protobuf/src/.libs/libprotobuf.a $(LIBDIR)/$(CONFIG)/protobuf
-	$(Q)cp third_party/protobuf/src/protoc $(BINDIR)/$(CONFIG)/protobuf
-
-static: static_c static_cxx
-
-static_c: pc_c pc_c_unsecure cache.mk pc_gpr pc_c_zookeeper\
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'c' and not lib.get('external_deps', None):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
-% endif
-% endfor
- static_zookeeper_libs
-
-
-static_cxx: pc_cxx pc_cxx_unsecure pc_gpr cache.mk \
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'c++':
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
-% endif
-% endfor
-
-
-shared: shared_c shared_cxx
-
-shared_c: pc_c pc_c_unsecure pc_gpr cache.mk pc_c_zookeeper\
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'c' and not lib.get('external_deps', None):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
-% endif
-% endfor
- shared_zookeeper_libs
-
-shared_cxx: pc_cxx pc_cxx_unsecure cache.mk\
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'c++':
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
-% endif
-% endfor
-
-
-shared_csharp: shared_c \
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'csharp':
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
-% endif
-% endfor
-
-ifeq ($(HAS_ZOOKEEPER),true)
-static_zookeeper_libs:\
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'c' and 'zookeeper' in lib.get('external_deps', []):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
-% endif
-% endfor
-
-shared_zookeeper_libs:\
-% for lib in libs:
-% if lib.build == 'all' and lib.language == 'c' and 'zookeeper' in lib.get('external_deps', []):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
-% endif
-% endfor
-
-else
-
-static_zookeeper_libs:
-
-shared_zookeeper_libs:
-
-endif
-
-grpc_csharp_ext: shared_csharp
-
-plugins: $(PROTOC_PLUGINS)
-
-privatelibs: privatelibs_c privatelibs_cxx
-
-privatelibs_c: \
-% for lib in libs:
-% if lib.build == 'private' and lib.language == 'c' and not lib.get('external_deps', None):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
-% endif
-% endfor
+%YAML 1.2
+--- |
+  # GRPC global makefile
+  # This currently builds C and C++ code.
+  # This file has been automatically generated from a template file.
+  # Please look at the templates directory instead.
+  # This file can be regenerated from the template by running
+  # tools/buildgen/generate_projects.sh
+
+  # Copyright 2015, Google Inc.
+  # All rights reserved.
+  #
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions are
+  # met:
+  #
+  #     * Redistributions of source code must retain the above copyright
+  # notice, this list of conditions and the following disclaimer.
+  #     * Redistributions in binary form must reproduce the above
+  # copyright notice, this list of conditions and the following disclaimer
+  # in the documentation and/or other materials provided with the
+  # distribution.
+  #     * Neither the name of Google Inc. nor the names of its
+  # contributors may be used to endorse or promote products derived from
+  # this software without specific prior written permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  <%!
+    import re
+    import os
+
+    proto_re = re.compile('(.*)\\.proto')
+
+    def proto_to_cc(filename):
+      m = proto_re.match(filename)
+      if not m:
+        return filename
+      return '$(GENDIR)/' + m.group(1) + '.pb.cc $(GENDIR)/' + m.group(1) + '.grpc.pb.cc'
+
+    sources_that_need_openssl = set()
+    sources_that_don_t_need_openssl = set()
+  %>
+
+
+  # Basic platform detection
+  HOST_SYSTEM = $(shell uname | cut -f 1 -d_)
+  ifeq ($(SYSTEM),)
+  SYSTEM = $(HOST_SYSTEM)
+  endif
+  ifeq ($(SYSTEM),MSYS)
+  SYSTEM = MINGW32
+  endif
+  ifeq ($(SYSTEM),MINGW64)
+  SYSTEM = MINGW32
+  endif
+
+
+  ifndef BUILDDIR
+  BUILDDIR = .
+  endif
+
+  HAS_GCC = $(shell which gcc > /dev/null 2> /dev/null && echo true || echo false)
+  HAS_CC = $(shell which cc > /dev/null 2> /dev/null && echo true || echo false)
+  HAS_CLANG = $(shell which clang > /dev/null 2> /dev/null && echo true || echo false)
+
+  ifeq ($(HAS_CC),true)
+  DEFAULT_CC = cc
+  DEFAULT_CXX = c++
+  else
+  ifeq ($(HAS_GCC),true)
+  DEFAULT_CC = gcc
+  DEFAULT_CXX = g++
+  else
+  ifeq ($(HAS_CLANG),true)
+  DEFAULT_CC = clang
+  DEFAULT_CXX = clang++
+  else
+  DEFAULT_CC = no_c_compiler
+  DEFAULT_CXX = no_c++_compiler
+  endif
+  endif
+  endif
+
+
+  BINDIR = $(BUILDDIR)/bins
+  OBJDIR = $(BUILDDIR)/objs
+  LIBDIR = $(BUILDDIR)/libs
+  GENDIR = $(BUILDDIR)/gens
+
+  # Configurations
+
+  VALID_CONFIG_opt = 1
+  CC_opt = $(DEFAULT_CC)
+  CXX_opt = $(DEFAULT_CXX)
+  LD_opt = $(DEFAULT_CC)
+  LDXX_opt = $(DEFAULT_CXX)
+  CPPFLAGS_opt = -O2
+  LDFLAGS_opt =
+  DEFINES_opt = NDEBUG
+
+  VALID_CONFIG_basicprof = 1
+  CC_basicprof = $(DEFAULT_CC)
+  CXX_basicprof = $(DEFAULT_CXX)
+  LD_basicprof = $(DEFAULT_CC)
+  LDXX_basicprof = $(DEFAULT_CXX)
+  CPPFLAGS_basicprof = -O2 -DGRPC_BASIC_PROFILER -DGRPC_TIMERS_RDTSC
+  LDFLAGS_basicprof =
+  DEFINES_basicprof = NDEBUG
+
+  VALID_CONFIG_stapprof = 1
+  CC_stapprof = $(DEFAULT_CC)
+  CXX_stapprof = $(DEFAULT_CXX)
+  LD_stapprof = $(DEFAULT_CC)
+  LDXX_stapprof = $(DEFAULT_CXX)
+  CPPFLAGS_stapprof = -O2 -DGRPC_STAP_PROFILER
+  LDFLAGS_stapprof =
+  DEFINES_stapprof = NDEBUG
+
+  VALID_CONFIG_dbg = 1
+  CC_dbg = $(DEFAULT_CC)
+  CXX_dbg = $(DEFAULT_CXX)
+  LD_dbg = $(DEFAULT_CC)
+  LDXX_dbg = $(DEFAULT_CXX)
+  CPPFLAGS_dbg = -O0
+  LDFLAGS_dbg =
+  DEFINES_dbg = _DEBUG DEBUG
+
+  VALID_CONFIG_mutrace = 1
+  CC_mutrace = $(DEFAULT_CC)
+  CXX_mutrace = $(DEFAULT_CXX)
+  LD_mutrace = $(DEFAULT_CC)
+  LDXX_mutrace = $(DEFAULT_CXX)
+  CPPFLAGS_mutrace = -O0
+  LDFLAGS_mutrace = -rdynamic
+  DEFINES_mutrace = _DEBUG DEBUG
+
+  VALID_CONFIG_valgrind = 1
+  REQUIRE_CUSTOM_LIBRARIES_valgrind = 1
+  CC_valgrind = $(DEFAULT_CC)
+  CXX_valgrind = $(DEFAULT_CXX)
+  LD_valgrind = $(DEFAULT_CC)
+  LDXX_valgrind = $(DEFAULT_CXX)
+  CPPFLAGS_valgrind = -O0
+  OPENSSL_CFLAGS_valgrind = -DPURIFY
+  LDFLAGS_valgrind =
+  DEFINES_valgrind = _DEBUG DEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=20
+
+  VALID_CONFIG_tsan = 1
+  REQUIRE_CUSTOM_LIBRARIES_tsan = 1
+  CC_tsan = clang
+  CXX_tsan = clang++
+  LD_tsan = clang
+  LDXX_tsan = clang++
+  CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-error=unused-command-line-argument
+  LDFLAGS_tsan = -fsanitize=thread
+  DEFINES_tsan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=10
+
+  VALID_CONFIG_asan = 1
+  REQUIRE_CUSTOM_LIBRARIES_asan = 1
+  CC_asan = clang
+  CXX_asan = clang++
+  LD_asan = clang
+  LDXX_asan = clang++
+  CPPFLAGS_asan = -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-error=unused-command-line-argument
+  LDFLAGS_asan = -fsanitize=address
+  DEFINES_asan = GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
+
+  VALID_CONFIG_msan = 1
+  REQUIRE_CUSTOM_LIBRARIES_msan = 1
+  CC_msan = clang
+  CXX_msan = clang++-libc++
+  LD_msan = clang
+  LDXX_msan = clang++-libc++
+  CPPFLAGS_msan = -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-error=unused-command-line-argument
+  OPENSSL_CFLAGS_msan = -DPURIFY
+  LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1
+  DEFINES_msan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=4
+
+  VALID_CONFIG_ubsan = 1
+  REQUIRE_CUSTOM_LIBRARIES_ubsan = 1
+  CC_ubsan = clang
+  CXX_ubsan = clang++
+  LD_ubsan = clang
+  LDXX_ubsan = clang++
+  CPPFLAGS_ubsan = -O1 -fsanitize=undefined -fno-omit-frame-pointer -Wno-error=unused-command-line-argument
+  OPENSSL_CFLAGS_ubsan = -DPURIFY
+  LDFLAGS_ubsan = -fsanitize=undefined
+  DEFINES_ubsan = NDEBUG GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
+
+  VALID_CONFIG_gcov = 1
+  CC_gcov = gcc
+  CXX_gcov = g++
+  LD_gcov = gcc
+  LDXX_gcov = g++
+  CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage
+  LDFLAGS_gcov = -fprofile-arcs -ftest-coverage
+  DEFINES_gcov = _DEBUG DEBUG
+
+
+  # General settings.
+  # You may want to change these depending on your system.
+
+  prefix ?= /usr/local
+
+  PROTOC = protoc
+  DTRACE = dtrace
+  CONFIG ?= opt
+  CC = $(CC_$(CONFIG))
+  CXX = $(CXX_$(CONFIG))
+  LD = $(LD_$(CONFIG))
+  LDXX = $(LDXX_$(CONFIG))
+  AR = ar
+  ifeq ($(SYSTEM),Linux)
+  STRIP = strip --strip-unneeded
+  else
+  ifeq ($(SYSTEM),Darwin)
+  STRIP = strip -x
+  else
+  STRIP = strip
+  endif
+  endif
+  INSTALL = install
+  RM = rm -f
+  PKG_CONFIG = pkg-config
+
+  ifndef VALID_CONFIG_$(CONFIG)
+  $(error Invalid CONFIG value '$(CONFIG)')
+  endif
+
+  ifeq ($(SYSTEM),Linux)
+  TMPOUT = /dev/null
+  else
+  TMPOUT = `mktemp /tmp/test-out-XXXXXX`
+  endif
+
+  # Detect if we can use C++11
+  CXX11_CHECK_CMD = $(CXX) -std=c++11 -o $(TMPOUT) -c test/build/c++11.cc
+  HAS_CXX11 = $(shell $(CXX11_CHECK_CMD) 2> /dev/null && echo true || echo false)
+
+  # The HOST compiler settings are used to compile the protoc plugins.
+  # In most cases, you won't have to change anything, but if you are
+  # cross-compiling, you can override these variables from GNU make's
+  # command line: make CC=cross-gcc HOST_CC=gcc
+
+  HOST_CC = $(CC)
+  HOST_CXX = $(CXX)
+  HOST_LD = $(LD)
+  HOST_LDXX = $(LDXX)
+
+  ifdef EXTRA_DEFINES
+  DEFINES += $(EXTRA_DEFINES)
+  endif
+
+  CFLAGS += -std=c89 -pedantic
+  ifeq ($(HAS_CXX11),true)
+  CXXFLAGS += -std=c++11
+  else
+  CXXFLAGS += -std=c++0x
+  endif
+  CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
+  LDFLAGS += -g
+
+  CPPFLAGS += $(CPPFLAGS_$(CONFIG))
+  DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\"
+  LDFLAGS += $(LDFLAGS_$(CONFIG))
+
+  ifneq ($(SYSTEM),MINGW32)
+  PIC_CPPFLAGS = -fPIC
+  CPPFLAGS += -fPIC
+  LDFLAGS += -fPIC
+  endif
+
+  INCLUDES = . include $(GENDIR)
+  LDFLAGS += -Llibs/$(CONFIG)
+
+  ifeq ($(SYSTEM),Darwin)
+  ifneq ($(wildcard /usr/local/ssl/include),)
+  INCLUDES += /usr/local/ssl/include
+  endif
+  ifneq ($(wildcard /opt/local/include),)
+  INCLUDES += /opt/local/include
+  endif
+  ifneq ($(wildcard /usr/local/include),)
+  INCLUDES += /usr/local/include
+  endif
+  LIBS = m z
+  ifneq ($(wildcard /usr/local/ssl/lib),)
+  LDFLAGS += -L/usr/local/ssl/lib
+  endif
+  ifneq ($(wildcard /opt/local/lib),)
+  LDFLAGS += -L/opt/local/lib
+  endif
+  ifneq ($(wildcard /usr/local/lib),)
+  LDFLAGS += -L/usr/local/lib
+  endif
+  endif
+
+  ifeq ($(SYSTEM),Linux)
+  LIBS = rt m z pthread
+  LDFLAGS += -pthread
+  endif
+
+  ifeq ($(SYSTEM),MINGW32)
+  LIBS = m z pthread
+  LDFLAGS += -pthread
+  endif
+
+  GTEST_LIB = -Ithird_party/googletest/include -Ithird_party/googletest third_party/googletest/src/gtest-all.cc
+  GTEST_LIB += -lgflags
+  ifeq ($(V),1)
+  E = @:
+  Q =
+  else
+  E = @echo
+  Q = @
+  endif
+
+  VERSION = ${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}
+
+  CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
+  CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
+
+  LDFLAGS += $(ARCH_FLAGS)
+  LDLIBS += $(addprefix -l, $(LIBS))
+  LDLIBSXX += $(addprefix -l, $(LIBSXX))
+
+  HOST_CPPFLAGS = $(CPPFLAGS)
+  HOST_CFLAGS = $(CFLAGS)
+  HOST_CXXFLAGS = $(CXXFLAGS)
+  HOST_LDFLAGS = $(LDFLAGS)
+  HOST_LDLIBS = $(LDLIBS)
+
+
+  # These are automatically computed variables.
+  # There shouldn't be any need to change anything from now on.
+
+  -include cache.mk
+
+  CACHE_MK =
+
+  HAS_PKG_CONFIG ?= $(shell command -v $(PKG_CONFIG) >/dev/null 2>&1 && echo true || echo false)
+
+  ifeq ($(HAS_PKG_CONFIG), true)
+  CACHE_MK += HAS_PKG_CONFIG = true,
+  endif
+
+  PC_TEMPLATE = prefix=$(prefix),\
+  exec_prefix=${'\$${prefix}'},\
+  includedir=${'\$${prefix}'}/include,\
+  libdir=${'\$${exec_prefix}'}/lib,\
+  ,\
+  Name: $(PC_NAME),\
+  Description: $(PC_DESCRIPTION),\
+  Version: $(VERSION),\
+  Cflags: -I${'\$${includedir}'} $(PC_CFLAGS),\
+  Requires.private: $(PC_REQUIRES_PRIVATE),\
+  Libs: -L${'\$${libdir}'} $(PC_LIB),\
+  Libs.private: $(PC_LIBS_PRIVATE)
+
+  # gpr .pc file
+  PC_NAME = gRPC Portable Runtime
+  PC_DESCRIPTION = gRPC Portable Runtime
+  PC_CFLAGS = -pthread
+  PC_REQUIRES_PRIVATE =
+  PC_LIBS_PRIVATE = -lpthread
+  PC_LIB = -lgpr
+  ifneq ($(SYSTEM),Darwin)
+  PC_LIBS_PRIVATE += -lrt
+  endif
+  GPR_PC_FILE := $(PC_TEMPLATE)
+
+  ifeq ($(SYSTEM),MINGW32)
+  SHARED_EXT = dll
+  endif
+  ifeq ($(SYSTEM),Darwin)
+  SHARED_EXT = dylib
+  endif
+  ifeq ($(SHARED_EXT),)
+  SHARED_EXT = so.$(VERSION)
+  endif
+
+  ifeq ($(wildcard .git),)
+  IS_GIT_FOLDER = false
+  else
+  IS_GIT_FOLDER = true
+  endif
+
+  ifeq ($(SYSTEM),Linux)
+  OPENSSL_REQUIRES_DL = true
+  endif
+
+  ifeq ($(SYSTEM),Darwin)
+  OPENSSL_REQUIRES_DL = true
+  endif
+
+  ifeq ($(HAS_PKG_CONFIG),true)
+  OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
+  OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl
+  ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
+  PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf
+  else # HAS_PKG_CONFIG
+
+  ifeq ($(SYSTEM),MINGW32)
+  OPENSSL_LIBS = ssl32 eay32
+  else
+  OPENSSL_LIBS = ssl crypto
+  endif
+
+  OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/openssl-alpn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
+  OPENSSL_NPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/openssl-npn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
+  ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
+  PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
+
+  ifeq ($(OPENSSL_REQUIRES_DL),true)
+  OPENSSL_ALPN_CHECK_CMD += -ldl
+  OPENSSL_NPN_CHECK_CMD += -ldl
+  endif
+
+  endif # HAS_PKG_CONFIG
+
+  PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
+
+  PROTOC_CHECK_CMD = which protoc > /dev/null
+  PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
+  DTRACE_CHECK_CMD = which dtrace > /dev/null
+  SYSTEMTAP_HEADERS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/systemtap.c $(LDFLAGS)
+  ZOOKEEPER_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zookeeper.c $(LDFLAGS) -lzookeeper_mt
+
+  ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
+  HAS_SYSTEM_PERFTOOLS ?= $(shell $(PERFTOOLS_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  ifeq ($(HAS_SYSTEM_PERFTOOLS),true)
+  DEFINES += GRPC_HAVE_PERFTOOLS
+  LIBS += profiler
+  CACHE_MK += HAS_SYSTEM_PERFTOOLS = true,
+  endif
+  endif
+
+  HAS_SYSTEM_PROTOBUF_VERIFY = $(shell $(PROTOBUF_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
+  HAS_SYSTEM_OPENSSL_ALPN ?= $(shell $(OPENSSL_ALPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
+  HAS_SYSTEM_OPENSSL_NPN = true
+  CACHE_MK += HAS_SYSTEM_OPENSSL_ALPN = true,
+  else
+  HAS_SYSTEM_OPENSSL_NPN ?= $(shell $(OPENSSL_NPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  endif
+  ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
+  CACHE_MK += HAS_SYSTEM_OPENSSL_NPN = true,
+  endif
+  HAS_SYSTEM_ZLIB ?= $(shell $(ZLIB_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  ifeq ($(HAS_SYSTEM_ZLIB),true)
+  CACHE_MK += HAS_SYSTEM_ZLIB = true,
+  endif
+  HAS_SYSTEM_PROTOBUF ?= $(HAS_SYSTEM_PROTOBUF_VERIFY)
+  ifeq ($(HAS_SYSTEM_PROTOBUF),true)
+  CACHE_MK += HAS_SYSTEM_PROTOBUF = true,
+  endif
+  else
+  # override system libraries if the config requires a custom compiled library
+  HAS_SYSTEM_OPENSSL_ALPN = false
+  HAS_SYSTEM_OPENSSL_NPN = false
+  HAS_SYSTEM_ZLIB = false
+  HAS_SYSTEM_PROTOBUF = false
+  endif
+
+  HAS_PROTOC ?= $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  ifeq ($(HAS_PROTOC),true)
+  CACHE_MK += HAS_PROTOC = true,
+  HAS_VALID_PROTOC ?= $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
+  ifeq ($(HAS_VALID_PROTOC),true)
+  CACHE_MK += HAS_VALID_PROTOC = true,
+  endif
+  else
+  HAS_VALID_PROTOC = false
+  endif
+
+  # Check for Systemtap (https://sourceware.org/systemtap/), first by making sure <sys/sdt.h> is present
+  # in the system and secondly by checking for the "dtrace" binary (on Linux, this is part of the Systemtap
+  # distribution. It's part of the base system on BSD/Solaris machines).
+  ifndef HAS_SYSTEMTAP
+  HAS_SYSTEMTAP_HEADERS = $(shell $(SYSTEMTAP_HEADERS_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  HAS_DTRACE = $(shell $(DTRACE_CHECK_CMD) 2> /dev/null && echo true || echo false)
+  HAS_SYSTEMTAP = false
+  ifeq ($(HAS_SYSTEMTAP_HEADERS),true)
+  ifeq ($(HAS_DTRACE),true)
+  HAS_SYSTEMTAP = true
+  endif
+  endif
+  endif
+
+  ifeq ($(HAS_SYSTEMTAP),true)
+  CACHE_MK += HAS_SYSTEMTAP = true,
+  endif
+
+  HAS_ZOOKEEPER = $(shell $(ZOOKEEPER_CHECK_CMD) 2> /dev/null && echo true || echo false)
+
+  # Note that for testing purposes, one can do:
+  #   make HAS_EMBEDDED_OPENSSL_ALPN=false
+  # to emulate the fact we do not have OpenSSL in the third_party folder.
+  ifeq ($(wildcard third_party/openssl/ssl/ssl.h),)
+  HAS_EMBEDDED_OPENSSL_ALPN = false
+  else
+  HAS_EMBEDDED_OPENSSL_ALPN = true
+  endif
+
+  ifeq ($(wildcard third_party/zlib/zlib.h),)
+  HAS_EMBEDDED_ZLIB = false
+  else
+  HAS_EMBEDDED_ZLIB = true
+  endif
+
+  ifeq ($(wildcard third_party/protobuf/src/google/protobuf/descriptor.pb.h),)
+  HAS_EMBEDDED_PROTOBUF = false
+  ifneq ($(HAS_VALID_PROTOC),true)
+  NO_PROTOC = true
+  endif
+  else
+  HAS_EMBEDDED_PROTOBUF = true
+  endif
+
+  PC_REQUIRES_GRPC = gpr
+  PC_LIBS_GRPC =
+
+  ifeq ($(HAS_SYSTEM_ZLIB),false)
+  ifeq ($(HAS_EMBEDDED_ZLIB),true)
+  ZLIB_DEP = $(LIBDIR)/$(CONFIG)/zlib/libz.a
+  CPPFLAGS += -Ithird_party/zlib
+  LDFLAGS += -L$(LIBDIR)/$(CONFIG)/zlib
+  else
+  DEP_MISSING += zlib
+  endif
+  else
+  ifeq ($(HAS_PKG_CONFIG),true)
+  CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib)
+  LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L zlib)
+  PC_REQUIRES_GRPC += zlib
+  else
+  PC_LIBS_GRPC += -lz
+  endif
+  endif
+
+  OPENSSL_PKG_CONFIG = false
+
+  PC_REQUIRES_SECURE =
+  PC_LIBS_SECURE =
+
+  ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
+  ifeq ($(HAS_PKG_CONFIG),true)
+  OPENSSL_PKG_CONFIG = true
+  PC_REQUIRES_SECURE = openssl
+  CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
+  LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
+  ifeq ($(SYSTEM),Linux)
+  ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
+  LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
+  endif
+  endif
+  LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
+  else
+  LIBS_SECURE = $(OPENSSL_LIBS)
+  ifeq ($(OPENSSL_REQUIRES_DL),true)
+  LIBS_SECURE += dl
+  PC_LIBS_SECURE = $(addprefix -l, $(LIBS_SECURE))
+  endif
+  endif
+  else
+  ifeq ($(HAS_EMBEDDED_OPENSSL_ALPN),true)
+  USE_SYSTEM_OPENSSL = false
+  OPENSSL_DEP = $(LIBDIR)/$(CONFIG)/openssl/libssl.a
+  OPENSSL_MERGE_LIBS += $(LIBDIR)/$(CONFIG)/openssl/libssl.a $(LIBDIR)/$(CONFIG)/openssl/libcrypto.a
+  # need to prefix these to ensure overriding system libraries
+  CPPFLAGS := -Ithird_party/openssl/include $(CPPFLAGS)
+  LDFLAGS := -L$(LIBDIR)/$(CONFIG)/openssl $(LDFLAGS)
+  ifeq ($(OPENSSL_REQUIRES_DL),true)
+  LIBS_SECURE = dl
+  endif
+  else
+  ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
+  USE_SYSTEM_OPENSSL = true
+  CPPFLAGS += -DTSI_OPENSSL_ALPN_SUPPORT=0
+  LIBS_SECURE = $(OPENSSL_LIBS)
+  ifeq ($(OPENSSL_REQUIRES_DL),true)
+  LIBS_SECURE += dl
+  endif
+  else
+  NO_SECURE = true
+  endif
+  endif
+  endif
+
+  ifeq ($(OPENSSL_PKG_CONFIG),true)
+  LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
+  else
+  LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
+  endif
+
+  # grpc .pc file
+  PC_NAME = gRPC
+  PC_DESCRIPTION = high performance general RPC framework
+  PC_CFLAGS =
+  PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE)
+  PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) $(PC_LIBS_SECURE)
+  PC_LIB = -lgrpc
+  GRPC_PC_FILE := $(PC_TEMPLATE)
+
+  # gprc_unsecure .pc file
+  PC_NAME = gRPC unsecure
+  PC_DESCRIPTION = high performance general RPC framework without SSL
+  PC_CFLAGS =
+  PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC)
+  PC_LIBS_PRIVATE = $(PC_LIBS_GRPC)
+  PC_LIB = -lgrpc
+  GRPC_UNSECURE_PC_FILE := $(PC_TEMPLATE)
+
+  # gprc_zookeeper .pc file
+  PC_NAME = gRPC zookeeper
+  PC_DESCRIPTION = gRPC's zookeeper plugin
+  PC_CFLAGS =
+  PC_REQUIRES_PRIVATE =
+  PC_LIBS_PRIVATE = -lzookeeper_mt
+  GRPC_ZOOKEEPER_PC_FILE := $(PC_TEMPLATE)
+
+  PROTOBUF_PKG_CONFIG = false
+
+  PC_REQUIRES_GRPCXX =
+  PC_LIBS_GRPCXX =
+
+  CPPFLAGS := -Ithird_party/googletest/include $(CPPFLAGS)
+
+  ifeq ($(HAS_SYSTEM_PROTOBUF),true)
+  ifeq ($(HAS_PKG_CONFIG),true)
+  PROTOBUF_PKG_CONFIG = true
+  PC_REQUIRES_GRPCXX = protobuf
+  CPPFLAGS := $(shell $(PKG_CONFIG) --cflags protobuf) $(CPPFLAGS)
+  LDFLAGS_PROTOBUF_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L protobuf)
+  ifeq ($(SYSTEM),Linux)
+  ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),)
+  LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/)
+  endif
+  endif
+  else
+  PC_LIBS_GRPCXX = -lprotobuf
+  endif
+  else
+  ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
+  PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
+  CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
+  LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
+  PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
+  else
+  NO_PROTOBUF = true
+  endif
+  endif
+
+  LIBS_PROTOBUF = protobuf
+  LIBS_PROTOC = protoc protobuf
+
+  HOST_LDLIBS_PROTOC += $(addprefix -l, $(LIBS_PROTOC))
+
+  ifeq ($(PROTOBUF_PKG_CONFIG),true)
+  LDLIBS_PROTOBUF += $(shell $(PKG_CONFIG) --libs-only-l protobuf)
+  else
+  LDLIBS_PROTOBUF += $(addprefix -l, $(LIBS_PROTOBUF))
+  endif
+
+  # grpc++ .pc file
+  PC_NAME = gRPC++
+  PC_DESCRIPTION = C++ wrapper for gRPC
+  PC_CFLAGS =
+  PC_REQUIRES_PRIVATE = grpc $(PC_REQUIRES_GRPCXX)
+  PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
+  PC_LIB = -lgrpc++
+  GRPCXX_PC_FILE := $(PC_TEMPLATE)
+
+  # grpc++_unsecure .pc file
+  PC_NAME = gRPC++ unsecure
+  PC_DESCRIPTION = C++ wrapper for gRPC without SSL
+  PC_CFLAGS =
+  PC_REQUIRES_PRIVATE = grpc_unsecure $(PC_REQUIRES_GRPCXX)
+  PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
+  PC_LIB = -lgrpc++
+  GRPCXX_UNSECURE_PC_FILE := $(PC_TEMPLATE)
+
+  ifeq ($(MAKECMDGOALS),clean)
+  NO_DEPS = true
+  endif
+
+  INSTALL_OK = false
+  ifeq ($(HAS_VALID_PROTOC),true)
+  ifeq ($(HAS_SYSTEM_PROTOBUF_VERIFY),true)
+  INSTALL_OK = true
+  endif
+  endif
+
+  .SECONDARY = %.pb.h %.pb.cc
+
+  PROTOC_PLUGINS =\
+  % for tgt in targets:
+  % if tgt.build == 'protoc':
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
+
+  ifeq ($(DEP_MISSING),)
+  all: static shared plugins\
+  % for tgt in targets:
+  % if tgt.build == 'all':
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
+
+  dep_error:
+  	@echo "You shouldn't see this message - all of your dependencies are correct."
+  else
+  all: dep_error git_update stop
+
+  dep_error:
+  	@echo
+  	@echo "DEPENDENCY ERROR"
+  	@echo
+  	@echo "You are missing system dependencies that are essential to build grpc,"
+  	@echo "and the third_party directory doesn't have them:"
+  	@echo
+  	@echo "  $(DEP_MISSING)"
+  	@echo
+  	@echo "Installing the development packages for your system will solve"
+  	@echo "this issue. Please consult INSTALL to get more information."
+  	@echo
+  	@echo "If you need information about why these tests failed, run:"
+  	@echo
+  	@echo "  make run_dep_checks"
+  	@echo
+  endif
+
+  git_update:
+  ifeq ($(IS_GIT_FOLDER),true)
+  	@echo "Additionally, since you are in a git clone, you can download the"
+  	@echo "missing dependencies in third_party by running the following command:"
+  	@echo
+  	@echo "  git submodule update --init"
+  	@echo
+  endif
+
+  openssl_dep_error: openssl_dep_message git_update stop
+
+  protobuf_dep_error: protobuf_dep_message git_update stop
+
+  protoc_dep_error: protoc_dep_message git_update stop
+
+  openssl_dep_message:
+  	@echo
+  	@echo "DEPENDENCY ERROR"
+  	@echo
+  	@echo "The target you are trying to run requires OpenSSL."
+  	@echo "Your system doesn't have it, and neither does the third_party directory."
+  	@echo
+  	@echo "Please consult INSTALL to get more information."
+  	@echo
+  	@echo "If you need information about why these tests failed, run:"
+  	@echo
+  	@echo "  make run_dep_checks"
+  	@echo
+
+  protobuf_dep_message:
+  	@echo
+  	@echo "DEPENDENCY ERROR"
+  	@echo
+  	@echo "The target you are trying to run requires protobuf 3.0.0+"
+  	@echo "Your system doesn't have it, and neither does the third_party directory."
+  	@echo
+  	@echo "Please consult INSTALL to get more information."
+  	@echo
+  	@echo "If you need information about why these tests failed, run:"
+  	@echo
+  	@echo "  make run_dep_checks"
+  	@echo
+
+  protoc_dep_message:
+  	@echo
+  	@echo "DEPENDENCY ERROR"
+  	@echo
+  	@echo "The target you are trying to run requires protobuf-compiler 3.0.0+"
+  	@echo "Your system doesn't have it, and neither does the third_party directory."
+  	@echo
+  	@echo "Please consult INSTALL to get more information."
+  	@echo
+  	@echo "If you need information about why these tests failed, run:"
+  	@echo
+  	@echo "  make run_dep_checks"
+  	@echo
+
+  systemtap_dep_error:
+  	@echo
+  	@echo "DEPENDENCY ERROR"
+  	@echo
+  	@echo "Under the '$(CONFIG)' configutation, the target you are trying "
+  	@echo "to build requires systemtap 2.7+ (on Linux) or dtrace (on other "
+  	@echo "platforms such as Solaris and *BSD). "
+  	@echo
+  	@echo "Please consult INSTALL to get more information."
+  	@echo
+
+  stop:
+  	@false
+
+  % for tgt in targets:
+  ${tgt.name}: $(BINDIR)/$(CONFIG)/${tgt.name}
+  % endfor
+
+  run_dep_checks:
+  	$(OPENSSL_ALPN_CHECK_CMD) || true
+  	$(OPENSSL_NPN_CHECK_CMD) || true
+  	$(ZLIB_CHECK_CMD) || true
+  	$(PERFTOOLS_CHECK_CMD) || true
+  	$(PROTOBUF_CHECK_CMD) || true
+  	$(PROTOC_CHECK_VERSION_CMD) || true
+  	$(ZOOKEEPER_CHECK_CMD) || true
+
+  $(LIBDIR)/$(CONFIG)/zlib/libz.a:
+  	$(E) "[MAKE]    Building zlib"
+  	$(Q)(cd third_party/zlib ; CC="$(CC)" CFLAGS="$(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(ZLIB_CFLAGS_EXTRA)" ./configure --static)
+  	$(Q)$(MAKE) -C third_party/zlib clean
+  	$(Q)$(MAKE) -C third_party/zlib
+  	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/zlib
+  	$(Q)cp third_party/zlib/libz.a $(LIBDIR)/$(CONFIG)/zlib
+
+  $(LIBDIR)/$(CONFIG)/openssl/libssl.a:
+  	$(E) "[MAKE]    Building openssl for $(SYSTEM)"
+  ifeq ($(SYSTEM),Darwin)
+  	$(Q)(cd third_party/openssl ; CC="$(CC) $(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_EXTRA)" ./Configure darwin64-x86_64-cc)
+  else
+  ifeq ($(SYSTEM),MINGW32)
+  	@echo "We currently don't have a good way to compile OpenSSL in-place under msys."
+  	@echo "Please provide a OpenSSL in your mingw32 system."
+  	@echo
+  	@echo "Note that you can find a compatible version of the libraries here:"
+  	@echo
+  	@echo "http://slproweb.com/products/Win32OpenSSL.html"
+  	@echo
+  	@echo "If you decide to install that one, take the full version. The light"
+  	@echo "version only contains compiled DLLs, without the development files."
+  	@echo
+  	@echo "When installing, chose to copy the OpenSSL dlls to the OpenSSL binaries"
+  	@echo "directory. This way we'll link to them directly."
+  	@echo
+  	@echo "You can then re-start the build the following way:"
+  	@echo
+  	@echo "  CPPFLAGS=-I/c/OpenSSL-Win64/include LDFLAGS=-L/c/OpenSSL-Win64 make"
+  	@false
+  else
+  	$(Q)(cd third_party/openssl ; CC="$(CC) $(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_EXTRA)" ./config no-asm $(OPENSSL_CONFIG_$(CONFIG)))
+  endif
+  endif
+  	$(Q)$(MAKE) -j 1 -C third_party/openssl clean
+  	$(Q)(unset CPPFLAGS; $(MAKE) -j 1 -C third_party/openssl build_crypto build_ssl)
+  	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/openssl
+  	$(Q)cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a $(LIBDIR)/$(CONFIG)/openssl
+
+  third_party/protobuf/configure:
+  	$(E) "[AUTOGEN] Preparing protobuf"
+  	$(Q)(cd third_party/protobuf ; autoreconf -f -i -Wall,no-obsolete)
+
+  $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure
+  	$(E) "[MAKE]    Building protobuf"
+  	$(Q)(cd third_party/protobuf ; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(PROTOBUF_LDFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(PROTOBUF_CPPFLAGS_EXTRA)" ./configure --disable-shared --enable-static)
+  	$(Q)$(MAKE) -C third_party/protobuf clean
+  	$(Q)$(MAKE) -C third_party/protobuf
+  	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/protobuf
+  	$(Q)mkdir -p $(BINDIR)/$(CONFIG)/protobuf
+  	$(Q)cp third_party/protobuf/src/.libs/libprotoc.a $(LIBDIR)/$(CONFIG)/protobuf
+  	$(Q)cp third_party/protobuf/src/.libs/libprotobuf.a $(LIBDIR)/$(CONFIG)/protobuf
+  	$(Q)cp third_party/protobuf/src/protoc $(BINDIR)/$(CONFIG)/protobuf
+
+  static: static_c static_cxx
+
+  static_c: pc_c pc_c_unsecure cache.mk pc_gpr pc_c_zookeeper\
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'c' and not lib.get('external_deps', None):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
+  % endif
+  % endfor
+   static_zookeeper_libs
+
+
+  static_cxx: pc_cxx pc_cxx_unsecure pc_gpr cache.mk \
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'c++':
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
+  % endif
+  % endfor
+
+
+  shared: shared_c shared_cxx
+
+  shared_c: pc_c pc_c_unsecure pc_gpr cache.mk pc_c_zookeeper\
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'c' and not lib.get('external_deps', None):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
+  % endif
+  % endfor
+   shared_zookeeper_libs
+
+  shared_cxx: pc_cxx pc_cxx_unsecure cache.mk\
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'c++':
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
+  % endif
+  % endfor
+
+
+  shared_csharp: shared_c \
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'csharp':
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
+  % endif
+  % endfor
+
+  ifeq ($(HAS_ZOOKEEPER),true)
+  static_zookeeper_libs:\
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'c' and 'zookeeper' in lib.get('external_deps', []):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
+  % endif
+  % endfor
+
+  shared_zookeeper_libs:\
+  % for lib in libs:
+  % if lib.build == 'all' and lib.language == 'c' and 'zookeeper' in lib.get('external_deps', []):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)\
+  % endif
+  % endfor
+
+  else
+
+  static_zookeeper_libs:
+
+  shared_zookeeper_libs:
+
+  endif
+
+  grpc_csharp_ext: shared_csharp
+
+  plugins: $(PROTOC_PLUGINS)
+
+  privatelibs: privatelibs_c privatelibs_cxx
+
+  privatelibs_c: \
+  % for lib in libs:
+  % if lib.build == 'private' and lib.language == 'c' and not lib.get('external_deps', None):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
+  % endif
+  % endfor
 
-pc_gpr: $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc
+  pc_gpr: $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc
 
-pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc
+  pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc
 
-pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc
-
-ifeq ($(HAS_ZOOKEEPER),true)
-pc_c_zookeeper: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_zookeeper.pc
-else
-pc_c_zookeeper:
-endif
+  pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc
+
+  ifeq ($(HAS_ZOOKEEPER),true)
+  pc_c_zookeeper: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_zookeeper.pc
+  else
+  pc_c_zookeeper:
+  endif
 
-pc_cxx: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc
+  pc_cxx: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc
 
-pc_cxx_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc
+  pc_cxx_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc
 
-privatelibs_cxx: \
-% for lib in libs:
-% if lib.build == 'private' and lib.language == 'c++' and not lib.get('external_deps', None):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
-% endif
-% endfor
+  privatelibs_cxx: \
+  % for lib in libs:
+  % if lib.build == 'private' and lib.language == 'c++' and not lib.get('external_deps', None):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
+  % endif
+  % endfor
 
 
-ifeq ($(HAS_ZOOKEEPER),true)
-privatelibs_zookeeper: \
-% for lib in libs:
-% if lib.build == 'private' and lib.language == 'c++' and zookeeper in lib.get('external_deps', []):
- $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
-% endif
-% endfor
+  ifeq ($(HAS_ZOOKEEPER),true)
+  privatelibs_zookeeper: \
+  % for lib in libs:
+  % if lib.build == 'private' and lib.language == 'c++' and zookeeper in lib.get('external_deps', []):
+   $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\
+  % endif
+  % endfor
 
-else
-privatelibs_zookeeper:
-endif
+  else
+  privatelibs_zookeeper:
+  endif
 
 
-buildtests: buildtests_c buildtests_cxx buildtests_zookeeper
+  buildtests: buildtests_c buildtests_cxx buildtests_zookeeper
 
-buildtests_c: privatelibs_c\
-% for tgt in targets:
-% if tgt.build == 'test' and not tgt.language == 'c++' and not tgt.get('external_deps', None):
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
+  buildtests_c: privatelibs_c\
+  % for tgt in targets:
+  % if tgt.build == 'test' and not tgt.language == 'c++' and not tgt.get('external_deps', None):
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
 
 
-buildtests_cxx: buildtests_zookeeper privatelibs_cxx\
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.language == 'c++' and not tgt.get('external_deps', None):
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
+  buildtests_cxx: buildtests_zookeeper privatelibs_cxx\
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.language == 'c++' and not tgt.get('external_deps', None):
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
 
 
-ifeq ($(HAS_ZOOKEEPER),true)
-buildtests_zookeeper: privatelibs_zookeeper\
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.language == 'c++' and 'zookeeper' in tgt.get('external_deps', []):
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
+  ifeq ($(HAS_ZOOKEEPER),true)
+  buildtests_zookeeper: privatelibs_zookeeper\
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.language == 'c++' and 'zookeeper' in tgt.get('external_deps', []):
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
 
-else
-buildtests_zookeeper:
-endif
+  else
+  buildtests_zookeeper:
+  endif
 
 
-test: test_c test_cxx test_zookeeper
+  test: test_c test_cxx test_zookeeper
 
-flaky_test: flaky_test_c flaky_test_cxx flaky_test_zookeeper
+  flaky_test: flaky_test_c flaky_test_cxx flaky_test_zookeeper
 
-test_c: buildtests_c
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++' and not tgt.get('flaky', False) and not tgt.get('external_deps', None):
-	$(E) "[RUN]     Testing ${tgt.name}"
-	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
-% endif
-% endfor
+  test_c: buildtests_c
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++' and not tgt.get('flaky', False) and not tgt.get('external_deps', None):
+  	$(E) "[RUN]     Testing ${tgt.name}"
+  	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
+  % endif
+  % endfor
 
 
-flaky_test_c: buildtests_c
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++' and tgt.get('flaky', False) and not tgt.get('external_deps', None):
-	$(E) "[RUN]     Testing ${tgt.name}"
-	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
-% endif
-% endfor
+  flaky_test_c: buildtests_c
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++' and tgt.get('flaky', False) and not tgt.get('external_deps', None):
+  	$(E) "[RUN]     Testing ${tgt.name}"
+  	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
+  % endif
+  % endfor
 
 
-test_cxx: test_zookeeper buildtests_cxx
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and not tgt.get('flaky', False) and not tgt.get('external_deps', None):
-	$(E) "[RUN]     Testing ${tgt.name}"
-	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
-% endif
-% endfor
+  test_cxx: test_zookeeper buildtests_cxx
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and not tgt.get('flaky', False) and not tgt.get('external_deps', None):
+  	$(E) "[RUN]     Testing ${tgt.name}"
+  	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
+  % endif
+  % endfor
 
 
-flaky_test_cxx: buildtests_cxx
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and tgt.get('flaky', False) and not tgt.get('external_deps', None):
-	$(E) "[RUN]     Testing ${tgt.name}"
-	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
-% endif
-% endfor
-
-
-ifeq ($(HAS_ZOOKEEPER),true)
-test_zookeeper: buildtests_zookeeper
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and not tgt.get('flaky', False) and 'zookeeper' in tgt.get('external_deps', []):
-	$(E) "[RUN]     Testing ${tgt.name}"
-	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
-% endif
-% endfor
-
-
-flaky_test_zookeeper: buildtests_zookeeper
-% for tgt in targets:
-% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and tgt.get('flaky', False) and 'zookeeper' in tgt.get('external_deps', []):
-	$(E) "[RUN]     Testing ${tgt.name}"
-	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
-% endif
-% endfor
-
-else
-test_zookeeper:
-flaky_test_zookeeper:
-endif
-
-
-test_python: static_c
-	$(E) "[RUN]     Testing python code"
-	$(Q) tools/run_tests/run_tests.py -lpython -c$(CONFIG)
-
-
-tools: tools_c tools_cxx
-
-
-tools_c: privatelibs_c\
-% for tgt in targets:
-% if tgt.build == 'tool' and not tgt.language=='c++':
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
-
-
-tools_cxx: privatelibs_cxx\
-% for tgt in targets:
-% if tgt.build == 'tool' and tgt.language=='c++':
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
-
-
-buildbenchmarks: privatelibs\
-% for tgt in targets:
-% if tgt.build == 'benchmark':
- $(BINDIR)/$(CONFIG)/${tgt.name}\
-% endif
-% endfor
-
-
-benchmarks: buildbenchmarks
-
-strip: strip-static strip-shared
-
-strip-static: strip-static_c strip-static_cxx
-
-strip-shared: strip-shared_c strip-shared_cxx
-
-
-# TODO(nnoble): the strip target is stripping in-place, instead
-# of copying files in a temporary folder.
-# This prevents proper debugging after running make install.
-
-strip-static_c: static_c
-ifeq ($(CONFIG),opt)
-% for lib in libs:
-% if lib.language == "c":
-% if lib.build == "all":
-% if not lib.get('external_deps', None):
-	$(E) "[STRIP]   Stripping lib${lib.name}.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
-% endif
-% endif
-% endif
-% endfor
-ifeq ($(HAS_ZOOKEEPER),true)
-% for lib in libs:
-% if lib.language == "c":
-% if lib.build == "all":
-% if 'zookeeper' in lib.get('external_deps', []):
-	$(E) "[STRIP]   Stripping lib${lib.name}.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
-% endif
-% endif
-% endif
-% endfor
-endif
-endif
-
-strip-static_cxx: static_cxx
-ifeq ($(CONFIG),opt)
-% for lib in libs:
-% if lib.language == "c++":
-% if lib.build == "all":
-	$(E) "[STRIP]   Stripping lib${lib.name}.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
-% endif
-% endif
-% endfor
-endif
-
-strip-shared_c: shared_c
-ifeq ($(CONFIG),opt)
-% for lib in libs:
-% if lib.language == "c":
-% if lib.build == "all":
-% if not lib.get('external_deps', None):
-	$(E) "[STRIP]   Stripping lib${lib.name}.so"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
-% endif
-% endif
-% endif
-% endfor
-ifeq ($(HAS_ZOOKEEPER),true)
-% for lib in libs:
-% if lib.language == "c":
-% if lib.build == "all":
-% if 'zookeeper' in lib.get('external_deps', []):
-	$(E) "[STRIP]   Stripping lib${lib.name}.so"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
-% endif
-% endif
-% endif
-% endfor
-endif
-endif
-
-strip-shared_cxx: shared_cxx
-ifeq ($(CONFIG),opt)
-% for lib in libs:
-% if lib.language == "c++":
-% if lib.build == "all":
-	$(E) "[STRIP]   Stripping lib${lib.name}.so"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
-% endif
-% endif
-% endfor
-endif
-
-strip-shared_csharp: shared_csharp
-ifeq ($(CONFIG),opt)
-% for lib in libs:
-% if lib.language == "csharp":
-% if lib.build == "all":
-	$(E) "[STRIP]   Stripping lib${lib.name}.so"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
-% endif
-% endif
-% endfor
-endif
-
-cache.mk::
-	$(E) "[MAKE]    Generating $@"
-	$(Q) echo "$(CACHE_MK)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GPR_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPC_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPC_UNSECURE_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc_zookeeper.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo -e "$(GRPC_ZOOKEEPER_PC_FILE)" >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPCXX_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPCXX_UNSECURE_PC_FILE)" | tr , '\n' >$@
-
-% for p in protos:
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/${p}.pb.cc: protoc_dep_error
-$(GENDIR)/${p}.grpc.pb.cc: protoc_dep_error
-else
-$(GENDIR)/${p}.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/${p}.grpc.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
-endif
-
-% endfor
-
-ifeq ($(CONFIG),stapprof)
-src/core/profiling/stap_timers.c: $(GENDIR)/src/core/profiling/stap_probes.h
-ifeq ($(HAS_SYSTEMTAP),true)
-$(GENDIR)/src/core/profiling/stap_probes.h: src/core/profiling/stap_probes.d
-	$(E) "[DTRACE]  Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(DTRACE) -C -h -s $< -o $@
-else
-$(GENDIR)/src/core/profiling/stap_probes.h: systemtap_dep_error stop
-endif
-endif
-
-$(OBJDIR)/$(CONFIG)/%.o : %.c
-	$(E) "[C]       Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/%.o : $(GENDIR)/%.pb.cc
-	$(E) "[CXX]     Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/src/compiler/%.o : src/compiler/%.cc
-	$(E) "[HOSTCXX] Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_CXX) $(HOST_CXXFLAGS) $(HOST_CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/%.o : %.cc
-	$(E) "[CXX]     Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-install: install_c install_cxx install-plugins install-certs verify-install
-
-install_c: install-headers_c install-static_c install-shared_c
-
-install_cxx: install-headers_cxx install-static_cxx install-shared_cxx
-
-install_csharp: install-shared_csharp install_c
-
-install_grpc_csharp_ext: install_csharp
-
-install-headers: install-headers_c install-headers_cxx
-
-install-headers_c:
-	$(E) "[INSTALL] Installing public C headers"
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
-install-headers_cxx:
-	$(E) "[INSTALL] Installing public C++ headers"
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
-install-static: install-static_c install-static_cxx
-
-install-static_c: static_c strip-static_c install-pkg-config_c
-% for lib in libs:
-% if lib.language == "c":
-% if lib.build == "all":
-% if not lib.get('external_deps', None):
-	$(E) "[INSTALL] Installing lib${lib.name}.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(prefix)/lib/lib${lib.name}.a
-% endif
-% endif
-% endif
-% endfor
-ifeq ($(HAS_ZOOKEEPER),true)
-% for lib in libs:
-% if lib.language == "c":
-% if lib.build == "all":
-% if 'zookeeper' in lib.get('external_deps', []):
-	$(E) "[INSTALL] Installing lib${lib.name}.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(prefix)/lib/lib${lib.name}.a
-% endif
-% endif
-% endif
-% endfor
-endif
-
-install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx
-% for lib in libs:
-% if lib.language == "c++":
-% if lib.build == "all":
-	$(E) "[INSTALL] Installing lib${lib.name}.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(prefix)/lib/lib${lib.name}.a
-% endif
-% endif
-% endfor
-
-<%def name="install_shared(lang_filter)">\
-% for lib in libs:
-% if lib.language == lang_filter:
-% if lib.build == "all":
-% if not lib.get('external_deps', None):
-ifeq ($(SYSTEM),MINGW32)
-	$(E) "[INSTALL] Installing ${lib.name}.$(SHARED_EXT)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT) $(prefix)/lib/${lib.name}.$(SHARED_EXT)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}-imp.a $(prefix)/lib/lib${lib.name}-imp.a
-else
-	$(E) "[INSTALL] Installing lib${lib.name}.$(SHARED_EXT)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.$(SHARED_EXT)
-ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so.${settings.version.major}
-	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so
-endif
-endif
-% endif
-% endif
-% endif
-% endfor
-ifeq ($(HAS_ZOOKEEPER),true)
-% for lib in libs:
-% if lib.language == lang_filter:
-% if lib.build == "all":
-% if 'zookeeper' in lib.get('external_deps', []):
-ifeq ($(SYSTEM),MINGW32)
-	$(E) "[INSTALL] Installing ${lib.name}.$(SHARED_EXT)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT) $(prefix)/lib/${lib.name}.$(SHARED_EXT)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}-imp.a $(prefix)/lib/lib${lib.name}-imp.a
-else
-	$(E) "[INSTALL] Installing lib${lib.name}.$(SHARED_EXT)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.$(SHARED_EXT)
-ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so.${settings.version.major}
-	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so
-endif
-endif
-% endif
-% endif
-% endif
-% endfor
-endif
-ifneq ($(SYSTEM),MINGW32)
-ifneq ($(SYSTEM),Darwin)
-	$(Q) ldconfig || true
-endif
-endif
-</%def>
-
-install-shared_c: shared_c strip-shared_c install-pkg-config_c
-${install_shared("c")}
-
-install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
-${install_shared("c++")}
-
-install-shared_csharp: shared_csharp strip-shared_csharp
-${install_shared("csharp")}
-
-install-plugins: $(PROTOC_PLUGINS)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) false
-else
-	$(E) "[INSTALL] Installing grpc protoc plugins"
-% for tgt in targets:
-% if tgt.build == 'protoc':
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/${tgt.name} $(prefix)/bin/${tgt.name}
-% endif
-% endfor
-endif
-
-install-pkg-config_c: pc_gpr pc_c pc_c_unsecure pc_c_zookeeper
-	$(E) "[INSTALL] Installing C pkg-config files"
-	$(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc $(prefix)/lib/pkgconfig/gpr.pc
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(prefix)/lib/pkgconfig/grpc.pc
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(prefix)/lib/pkgconfig/grpc_unsecure.pc
-ifeq ($(HAS_ZOOKEEPER),true)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_zookeeper.pc $(prefix)/lib/pkgconfig/grpc_zookeeper.pc
-endif
-
-install-pkg-config_cxx: pc_cxx pc_cxx_unsecure
-	$(E) "[INSTALL] Installing C++ pkg-config files"
-	$(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc $(prefix)/lib/pkgconfig/grpc++.pc
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc $(prefix)/lib/pkgconfig/grpc++_unsecure.pc
-
-install-certs: etc/roots.pem
-	$(E) "[INSTALL] Installing root certificates"
-	$(Q) $(INSTALL) -d $(prefix)/share/grpc
-	$(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem
-
-verify-install:
-ifeq ($(INSTALL_OK),true)
-	@echo "Your system looks ready to go."
-	@echo
-else
-	@echo "We couldn't find protoc 3.0.0+ installed on your system. While this"
-	@echo "won't prevent grpc from working, you won't be able to compile"
-	@echo "and run any meaningful code with it."
-	@echo
-	@echo
-	@echo "Please download and install protobuf 3.0.0+ from:"
-	@echo
-	@echo "   https://github.com/google/protobuf/releases"
-	@echo
-	@echo "Once you've done so, or if you think this message is in error,"
-	@echo "you can re-run this check by doing:"
-	@echo
-	@echo "   make verify-install"
-endif
-
-clean:
-	$(E) "[CLEAN]   Cleaning build directories."
-	$(Q) $(RM) -rf $(OBJDIR) $(LIBDIR) $(BINDIR) $(GENDIR) cache.mk
-
-
-# The various libraries
-
-% for lib in libs:
-${makelib(lib)}
-% endfor
-
-
-# All of the test targets, and protoc plugins
-
-% for tgt in targets:
-${maketarget(tgt)}
-% endfor
-
-<%def name="makelib(lib)">
-LIB${lib.name.upper()}_SRC = \\
-
-% for src in lib.src:
-    ${proto_to_cc(src)} \\
-
-% endfor
-
-% if "public_headers" in lib:
-% if lib.language == "c++":
-PUBLIC_HEADERS_CXX += \\
-
-% else:
-PUBLIC_HEADERS_C += \\
-
-% endif
-% for hdr in lib.public_headers:
-    ${hdr} \\
-
-% endfor
-% endif
-
-LIB${lib.name.upper()}_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIB${lib.name.upper()}_SRC))))
-
-## If the library requires OpenSSL, let's add some restrictions.
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.a: openssl_dep_error
-
-% if lib.build == "all":
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT): openssl_dep_error
-else
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT): openssl_dep_error
-endif
-% endif
-
-else
-
-% if lib.language == 'c++':
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.a: protobuf_dep_error
-
-% if lib.build == "all":
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT): protobuf_dep_error
-else
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT): protobuf_dep_error
-endif
-% endif
-
-else
-% endif
-
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP)\
-## The else here corresponds to the if secure earlier.
-% else:
-% if lib.language == 'c++':
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.a: protobuf_dep_error
-
-% if lib.build == "all":
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT): protobuf_dep_error
-else
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT): protobuf_dep_error
-endif
-% endif
-
-else
-
-% endif
-$(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP)\
-% endif
-% if lib.language == 'c++':
- $(PROTOBUF_DEP)\
-% endif
- $(LIB${lib.name.upper()}_OBJS)
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
-	$(Q) $(AR) rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS)
-% if lib.get('baselib', False):
-% if lib.get('secure', 'check') == 'yes':
-	$(Q) rm -rf tmp-merge-${lib.name}
-	$(Q) mkdir tmp-merge-${lib.name}
-	$(Q) ( cd tmp-merge-${lib.name} ; $(AR) x ../$(LIBDIR)/$(CONFIG)/lib${lib.name}.a )
-	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge-${lib.name} ; <%text>ar x ../$${l}</%text> ) ; done
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/__.SYMDEF*
-	$(Q) ar rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/*
-	$(Q) rm -rf tmp-merge-${lib.name}
-% endif
-% endif
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
-endif
-
-<%
-
-  if lib.language == 'c++':
-    ld = '$(LDXX)'
-  else:
-    ld = '$(LD)'
-
-  out_base = '$(LIBDIR)/$(CONFIG)/' + lib.name
-  out_libbase = '$(LIBDIR)/$(CONFIG)/lib' + lib.name
-
-  common = '$(LIB' + lib.name.upper() + '_OBJS) $(LDLIBS)'
-
-  libs = ''
-  lib_deps = ' $(ZLIB_DEP)'
-  mingw_libs = ''
-  mingw_lib_deps = ' $(ZLIB_DEP)'
-  if lib.language == 'c++':
-    lib_deps += ' $(PROTOBUF_DEP)'
-    mingw_lib_deps += ' $(PROTOBUF_DEP)'
-  for dep in lib.get('deps', []):
-    libs = libs + ' -l' + dep
-    lib_deps = lib_deps + ' $(LIBDIR)/$(CONFIG)/lib' + dep + '.$(SHARED_EXT)'
-    mingw_libs = mingw_libs + ' -l' + dep + '-imp'
-    mingw_lib_deps = mingw_lib_deps + ' $(LIBDIR)/$(CONFIG)/' + dep + '.$(SHARED_EXT)'
-
-  security = lib.get('secure', 'check')
-  if security == 'yes':
-    common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)'
-
-  if security in ['yes', 'check']:
-    for src in lib.src:
-      if not proto_re.match(src):
-        sources_that_need_openssl.add(src)
-  else:
-    for src in lib.src:
-      sources_that_don_t_need_openssl.add(src)
-
-  if 'zookeeper' in lib.get('external_deps', []):
-    libs = libs + ' -lzookeeper_mt'
-
-  if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
-    lib_deps = lib_deps + ' $(OPENSSL_DEP)'
-    mingw_lib_deps = mingw_lib_deps + ' $(OPENSSL_DEP)'
-
-  if lib.language == 'c++':
-    common = common + ' $(LDLIBSXX) $(LDLIBS_PROTOBUF)'
-%>
-
-% if lib.build == "all":
-ifeq ($(SYSTEM),MINGW32)
-${out_base}.$(SHARED_EXT): $(LIB${lib.name.upper()}_OBJS) ${mingw_lib_deps}
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) ${ld} $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=${out_base}.def -Wl,--out-implib=${out_libbase}-imp.a -o ${out_base}.$(SHARED_EXT) ${common}${mingw_libs}
-else
-${out_libbase}.$(SHARED_EXT): $(LIB${lib.name.upper()}_OBJS) ${lib_deps}
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ${ld} $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name lib${lib.name}.$(SHARED_EXT) -dynamiclib -o ${out_libbase}.$(SHARED_EXT) ${common}${libs}
-else
-	$(Q) ${ld} $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,lib${lib.name}.so.${settings.version.major} -o ${out_libbase}.$(SHARED_EXT) ${common}${libs}
-	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) ${out_libbase}.so.${settings.version.major}
-	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) ${out_libbase}.so
-endif
-endif
-% endif
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
-## If the lib was secure, we have to close the Makefile's if that tested
-## the presence of OpenSSL.
-
-endif
-% endif
-% if lib.language == 'c++':
-## If the lib was C++, we have to close the Makefile's if that tested
-## the presence of protobuf 3.0.0+
-
-endif
-% endif
-
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
-ifneq ($(NO_SECURE),true)
-% endif
-ifneq ($(NO_DEPS),true)
--include $(LIB${lib.name.upper()}_OBJS:.o=.dep)
-endif
-% if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
-endif
-% endif
-% for src in lib.src:
-% if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src):
-$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: ${' '.join(proto_to_cc(src2) for src2 in lib.src if proto_re.match(src2))}
-% endif
-% endfor
-</%def>
-
-<%def name="maketarget(tgt)"><% has_no_sources = not tgt.src %>
-% if not has_no_sources:
-${tgt.name.upper()}_SRC = \\
-
-% for src in tgt.src:
-    ${proto_to_cc(src)} \\
-
-% endfor
-
-${tgt.name.upper()}_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(${tgt.name.upper()}_SRC))))
-% endif
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/${tgt.name}: openssl_dep_error
-
-else
-
-% endif
-##
-## We're not trying to add a dependency on building zlib and openssl here,
-## as it's already done in the libraries. We're assuming that the build
-## trickles down, and that a secure target requires a secure version of
-## a library.
-##
-## That simplifies the codegen a bit, but prevents a fully defined Makefile.
-## I can live with that.
-##
-% if tgt.build == 'protoc' or tgt.language == 'c++':
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/${tgt.name}: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/${tgt.name}: \
-% if not has_no_sources:
-$(PROTOBUF_DEP) $(${tgt.name.upper()}_OBJS)\
-% endif
-% else:
-$(BINDIR)/$(CONFIG)/${tgt.name}: \
-% if not has_no_sources:
-$(${tgt.name.upper()}_OBJS)\
-% endif
-% endif
-% for dep in tgt.deps:
- $(LIBDIR)/$(CONFIG)/lib${dep}.a\
-% endfor
-
-% if tgt.language == "c++":
-## C++ targets specificies.
-% if tgt.build == 'protoc':
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) \
-% if not has_no_sources:
-$(${tgt.name.upper()}_OBJS)\
-% endif
-% else:
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) \
-% if not has_no_sources:
-$(${tgt.name.upper()}_OBJS)\
-% endif
-% endif
-% else:
-## C-only targets specificities.
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) \
-% if not has_no_sources:
-$(${tgt.name.upper()}_OBJS)\
-% endif
-% endif
-% for dep in tgt.deps:
- $(LIBDIR)/$(CONFIG)/lib${dep}.a\
-% endfor
-% if 'zookeeper' in tgt.get('external_deps', []):
- -lzookeeper_mt\
-% endif
-% if tgt.language == "c++":
-% if tgt.build == 'protoc':
- $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC)\
-% else:
- $(LDLIBSXX) $(LDLIBS_PROTOBUF)\
-% endif
-% endif
-% if tgt.build == 'protoc':
- $(HOST_LDLIBS)\
-% else:
- $(LDLIBS)\
-% endif
-% if tgt.build == 'protoc':
- $(HOST_LDLIBS_PROTOC)\
-% elif tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
- $(LDLIBS_SECURE)\
-% endif
-% if tgt.language == 'c++' and tgt.build == 'test':
- $(GTEST_LIB)\
-% elif tgt.language == 'c++' and tgt.build == 'benchmark':
- $(GTEST_LIB)\
-% endif
- -o $(BINDIR)/$(CONFIG)/${tgt.name}
-% if tgt.build == 'protoc' or tgt.language == 'c++':
-
-endif
-% endif
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
-
-endif
-% endif
-
-% for src in tgt.src:
-$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
-% for dep in tgt.deps:
- $(LIBDIR)/$(CONFIG)/lib${dep}.a\
-% endfor
-
-% endfor
-% if not has_no_sources:
-deps_${tgt.name}: $(${tgt.name.upper()}_OBJS:.o=.dep)
-% endif
-
-% if not has_no_sources:
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
-ifneq ($(NO_SECURE),true)
-% endif
-ifneq ($(NO_DEPS),true)
--include $(${tgt.name.upper()}_OBJS:.o=.dep)
-endif
-% if tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check':
-endif
-% endif
-% endif
-</%def>
-
-ifneq ($(OPENSSL_DEP),)
-# This is to ensure the embedded OpenSSL is built beforehand, properly
-# installing headers to their final destination on the drive. We need this
-# otherwise parallel compilation will fail if a source is compiled first.
-% for src in sorted(sources_that_need_openssl):
-% if src not in sources_that_don_t_need_openssl:
-${src}: $(OPENSSL_DEP)
-% endif
-% endfor
-endif
-
-.PHONY: all strip tools \
-dep_error openssl_dep_error openssl_dep_message git_update stop \
-buildtests buildtests_c buildtests_cxx \
-test test_c test_cxx \
-install install_c install_cxx \
-install-headers install-headers_c install-headers_cxx \
-install-shared install-shared_c install-shared_cxx \
-install-static install-static_c install-static_cxx \
-strip strip-shared strip-static \
-strip_c strip-shared_c strip-static_c \
-strip_cxx strip-shared_cxx strip-static_cxx \
-dep_c dep_cxx bins_dep_c bins_dep_cxx \
-clean
+  flaky_test_cxx: buildtests_cxx
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and tgt.get('flaky', False) and not tgt.get('external_deps', None):
+  	$(E) "[RUN]     Testing ${tgt.name}"
+  	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
+  % endif
+  % endfor
+
+
+  ifeq ($(HAS_ZOOKEEPER),true)
+  test_zookeeper: buildtests_zookeeper
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and not tgt.get('flaky', False) and 'zookeeper' in tgt.get('external_deps', []):
+  	$(E) "[RUN]     Testing ${tgt.name}"
+  	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
+  % endif
+  % endfor
+
+
+  flaky_test_zookeeper: buildtests_zookeeper
+  % for tgt in targets:
+  % if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and tgt.get('flaky', False) and 'zookeeper' in tgt.get('external_deps', []):
+  	$(E) "[RUN]     Testing ${tgt.name}"
+  	$(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 )
+  % endif
+  % endfor
+
+  else
+  test_zookeeper:
+  flaky_test_zookeeper:
+  endif
+
+
+  test_python: static_c
+  	$(E) "[RUN]     Testing python code"
+  	$(Q) tools/run_tests/run_tests.py -lpython -c$(CONFIG)
+
+
+  tools: tools_c tools_cxx
+
+
+  tools_c: privatelibs_c\
+  % for tgt in targets:
+  % if tgt.build == 'tool' and not tgt.language=='c++':
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
+
+
+  tools_cxx: privatelibs_cxx\
+  % for tgt in targets:
+  % if tgt.build == 'tool' and tgt.language=='c++':
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
+
+
+  buildbenchmarks: privatelibs\
+  % for tgt in targets:
+  % if tgt.build == 'benchmark':
+   $(BINDIR)/$(CONFIG)/${tgt.name}\
+  % endif
+  % endfor
+
+
+  benchmarks: buildbenchmarks
+
+  strip: strip-static strip-shared
+
+  strip-static: strip-static_c strip-static_cxx
+
+  strip-shared: strip-shared_c strip-shared_cxx
+
+
+  # TODO(nnoble): the strip target is stripping in-place, instead
+  # of copying files in a temporary folder.
+  # This prevents proper debugging after running make install.
+
+  strip-static_c: static_c
+  ifeq ($(CONFIG),opt)
+  % for lib in libs:
+  % if lib.language == "c":
+  % if lib.build == "all":
+  % if not lib.get('external_deps', None):
+  	$(E) "[STRIP]   Stripping lib${lib.name}.a"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
+  % endif
+  % endif
+  % endif
+  % endfor
+  ifeq ($(HAS_ZOOKEEPER),true)
+  % for lib in libs:
+  % if lib.language == "c":
+  % if lib.build == "all":
+  % if 'zookeeper' in lib.get('external_deps', []):
+  	$(E) "[STRIP]   Stripping lib${lib.name}.a"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
+  % endif
+  % endif
+  % endif
+  % endfor
+  endif
+  endif
+
+  strip-static_cxx: static_cxx
+  ifeq ($(CONFIG),opt)
+  % for lib in libs:
+  % if lib.language == "c++":
+  % if lib.build == "all":
+  	$(E) "[STRIP]   Stripping lib${lib.name}.a"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
+  % endif
+  % endif
+  % endfor
+  endif
+
+  strip-shared_c: shared_c
+  ifeq ($(CONFIG),opt)
+  % for lib in libs:
+  % if lib.language == "c":
+  % if lib.build == "all":
+  % if not lib.get('external_deps', None):
+  	$(E) "[STRIP]   Stripping lib${lib.name}.so"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
+  % endif
+  % endif
+  % endif
+  % endfor
+  ifeq ($(HAS_ZOOKEEPER),true)
+  % for lib in libs:
+  % if lib.language == "c":
+  % if lib.build == "all":
+  % if 'zookeeper' in lib.get('external_deps', []):
+  	$(E) "[STRIP]   Stripping lib${lib.name}.so"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
+  % endif
+  % endif
+  % endif
+  % endfor
+  endif
+  endif
+
+  strip-shared_cxx: shared_cxx
+  ifeq ($(CONFIG),opt)
+  % for lib in libs:
+  % if lib.language == "c++":
+  % if lib.build == "all":
+  	$(E) "[STRIP]   Stripping lib${lib.name}.so"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
+  % endif
+  % endif
+  % endfor
+  endif
+
+  strip-shared_csharp: shared_csharp
+  ifeq ($(CONFIG),opt)
+  % for lib in libs:
+  % if lib.language == "csharp":
+  % if lib.build == "all":
+  	$(E) "[STRIP]   Stripping lib${lib.name}.so"
+  	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT)
+  % endif
+  % endif
+  % endfor
+  endif
+
+  cache.mk::
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) echo "$(CACHE_MK)" | tr , '\n' >$@
+
+  $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc:
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) mkdir -p $(@D)
+  	$(Q) echo "$(GPR_PC_FILE)" | tr , '\n' >$@
+
+  $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc:
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) mkdir -p $(@D)
+  	$(Q) echo "$(GRPC_PC_FILE)" | tr , '\n' >$@
+
+  $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc:
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) mkdir -p $(@D)
+  	$(Q) echo "$(GRPC_UNSECURE_PC_FILE)" | tr , '\n' >$@
+
+  $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_zookeeper.pc:
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) mkdir -p $(@D)
+  	$(Q) echo -e "$(GRPC_ZOOKEEPER_PC_FILE)" >$@
+
+  $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc:
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) mkdir -p $(@D)
+  	$(Q) echo "$(GRPCXX_PC_FILE)" | tr , '\n' >$@
+
+  $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc:
+  	$(E) "[MAKE]    Generating $@"
+  	$(Q) mkdir -p $(@D)
+  	$(Q) echo "$(GRPCXX_UNSECURE_PC_FILE)" | tr , '\n' >$@
+
+  % for p in protos:
+  ifeq ($(NO_PROTOC),true)
+  $(GENDIR)/${p}.pb.cc: protoc_dep_error
+  $(GENDIR)/${p}.grpc.pb.cc: protoc_dep_error
+  else
+  $(GENDIR)/${p}.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+  	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(PROTOC) --cpp_out=$(GENDIR) $<
+
+  $(GENDIR)/${p}.grpc.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+  	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
+  endif
+
+  % endfor
+
+  ifeq ($(CONFIG),stapprof)
+  src/core/profiling/stap_timers.c: $(GENDIR)/src/core/profiling/stap_probes.h
+  ifeq ($(HAS_SYSTEMTAP),true)
+  $(GENDIR)/src/core/profiling/stap_probes.h: src/core/profiling/stap_probes.d
+  	$(E) "[DTRACE]  Compiling $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(DTRACE) -C -h -s $< -o $@
+  else
+  $(GENDIR)/src/core/profiling/stap_probes.h: systemtap_dep_error stop
+  endif
+  endif
+
+  $(OBJDIR)/$(CONFIG)/%.o : %.c
+  	$(E) "[C]       Compiling $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
+
+  $(OBJDIR)/$(CONFIG)/%.o : $(GENDIR)/%.pb.cc
+  	$(E) "[CXX]     Compiling $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
+
+  $(OBJDIR)/$(CONFIG)/src/compiler/%.o : src/compiler/%.cc
+  	$(E) "[HOSTCXX] Compiling $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(HOST_CXX) $(HOST_CXXFLAGS) $(HOST_CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
+
+  $(OBJDIR)/$(CONFIG)/%.o : %.cc
+  	$(E) "[CXX]     Compiling $<"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
+
+  install: install_c install_cxx install-plugins install-certs verify-install
+
+  install_c: install-headers_c install-static_c install-shared_c
+
+  install_cxx: install-headers_cxx install-static_cxx install-shared_cxx
+
+  install_csharp: install-shared_csharp install_c
+
+  install_grpc_csharp_ext: install_csharp
+
+  install-headers: install-headers_c install-headers_cxx
+
+  install-headers_c:
+  	$(E) "[INSTALL] Installing public C headers"
+  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
+
+  install-headers_cxx:
+  	$(E) "[INSTALL] Installing public C++ headers"
+  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
+
+  install-static: install-static_c install-static_cxx
+
+  install-static_c: static_c strip-static_c install-pkg-config_c
+  % for lib in libs:
+  % if lib.language == "c":
+  % if lib.build == "all":
+  % if not lib.get('external_deps', None):
+  	$(E) "[INSTALL] Installing lib${lib.name}.a"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(prefix)/lib/lib${lib.name}.a
+  % endif
+  % endif
+  % endif
+  % endfor
+  ifeq ($(HAS_ZOOKEEPER),true)
+  % for lib in libs:
+  % if lib.language == "c":
+  % if lib.build == "all":
+  % if 'zookeeper' in lib.get('external_deps', []):
+  	$(E) "[INSTALL] Installing lib${lib.name}.a"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(prefix)/lib/lib${lib.name}.a
+  % endif
+  % endif
+  % endif
+  % endfor
+  endif
+
+  install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx
+  % for lib in libs:
+  % if lib.language == "c++":
+  % if lib.build == "all":
+  	$(E) "[INSTALL] Installing lib${lib.name}.a"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(prefix)/lib/lib${lib.name}.a
+  % endif
+  % endif
+  % endfor
+
+  <%def name="install_shared(lang_filter)">\
+  % for lib in libs:
+  % if lib.language == lang_filter:
+  % if lib.build == "all":
+  % if not lib.get('external_deps', None):
+  ifeq ($(SYSTEM),MINGW32)
+  	$(E) "[INSTALL] Installing ${lib.name}.$(SHARED_EXT)"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT) $(prefix)/lib/${lib.name}.$(SHARED_EXT)
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}-imp.a $(prefix)/lib/lib${lib.name}-imp.a
+  else
+  	$(E) "[INSTALL] Installing lib${lib.name}.$(SHARED_EXT)"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.$(SHARED_EXT)
+  ifneq ($(SYSTEM),Darwin)
+  	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so.${settings.version.major}
+  	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so
+  endif
+  endif
+  % endif
+  % endif
+  % endif
+  % endfor
+  ifeq ($(HAS_ZOOKEEPER),true)
+  % for lib in libs:
+  % if lib.language == lang_filter:
+  % if lib.build == "all":
+  % if 'zookeeper' in lib.get('external_deps', []):
+  ifeq ($(SYSTEM),MINGW32)
+  	$(E) "[INSTALL] Installing ${lib.name}.$(SHARED_EXT)"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT) $(prefix)/lib/${lib.name}.$(SHARED_EXT)
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}-imp.a $(prefix)/lib/lib${lib.name}-imp.a
+  else
+  	$(E) "[INSTALL] Installing lib${lib.name}.$(SHARED_EXT)"
+  	$(Q) $(INSTALL) -d $(prefix)/lib
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.$(SHARED_EXT)
+  ifneq ($(SYSTEM),Darwin)
+  	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so.${settings.version.major}
+  	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) $(prefix)/lib/lib${lib.name}.so
+  endif
+  endif
+  % endif
+  % endif
+  % endif
+  % endfor
+  endif
+  ifneq ($(SYSTEM),MINGW32)
+  ifneq ($(SYSTEM),Darwin)
+  	$(Q) ldconfig || true
+  endif
+  endif
+  </%def>
+
+  install-shared_c: shared_c strip-shared_c install-pkg-config_c
+  ${install_shared("c")}
+
+  install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
+  ${install_shared("c++")}
+
+  install-shared_csharp: shared_csharp strip-shared_csharp
+  ${install_shared("csharp")}
+
+  install-plugins: $(PROTOC_PLUGINS)
+  ifeq ($(SYSTEM),MINGW32)
+  	$(Q) false
+  else
+  	$(E) "[INSTALL] Installing grpc protoc plugins"
+  % for tgt in targets:
+  % if tgt.build == 'protoc':
+  	$(Q) $(INSTALL) -d $(prefix)/bin
+  	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/${tgt.name} $(prefix)/bin/${tgt.name}
+  % endif
+  % endfor
+  endif
+
+  install-pkg-config_c: pc_gpr pc_c pc_c_unsecure pc_c_zookeeper
+  	$(E) "[INSTALL] Installing C pkg-config files"
+  	$(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc $(prefix)/lib/pkgconfig/gpr.pc
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(prefix)/lib/pkgconfig/grpc.pc
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(prefix)/lib/pkgconfig/grpc_unsecure.pc
+  ifeq ($(HAS_ZOOKEEPER),true)
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_zookeeper.pc $(prefix)/lib/pkgconfig/grpc_zookeeper.pc
+  endif
+
+  install-pkg-config_cxx: pc_cxx pc_cxx_unsecure
+  	$(E) "[INSTALL] Installing C++ pkg-config files"
+  	$(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc $(prefix)/lib/pkgconfig/grpc++.pc
+  	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc $(prefix)/lib/pkgconfig/grpc++_unsecure.pc
+
+  install-certs: etc/roots.pem
+  	$(E) "[INSTALL] Installing root certificates"
+  	$(Q) $(INSTALL) -d $(prefix)/share/grpc
+  	$(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem
+
+  verify-install:
+  ifeq ($(INSTALL_OK),true)
+  	@echo "Your system looks ready to go."
+  	@echo
+  else
+  	@echo "We couldn't find protoc 3.0.0+ installed on your system. While this"
+  	@echo "won't prevent grpc from working, you won't be able to compile"
+  	@echo "and run any meaningful code with it."
+  	@echo
+  	@echo
+  	@echo "Please download and install protobuf 3.0.0+ from:"
+  	@echo
+  	@echo "   https://github.com/google/protobuf/releases"
+  	@echo
+  	@echo "Once you've done so, or if you think this message is in error,"
+  	@echo "you can re-run this check by doing:"
+  	@echo
+  	@echo "   make verify-install"
+  endif
+
+  clean:
+  	$(E) "[CLEAN]   Cleaning build directories."
+  	$(Q) $(RM) -rf $(OBJDIR) $(LIBDIR) $(BINDIR) $(GENDIR) cache.mk
+
+
+  # The various libraries
+
+  % for lib in libs:
+  ${makelib(lib)}
+  % endfor
+
+
+  # All of the test targets, and protoc plugins
+
+  % for tgt in targets:
+  ${maketarget(tgt)}
+  % endfor
+
+  <%def name="makelib(lib)">
+  LIB${lib.name.upper()}_SRC = \\
+
+  % for src in lib.src:
+      ${proto_to_cc(src)} \\
+
+  % endfor
+
+  % if "public_headers" in lib:
+  % if lib.language == "c++":
+  PUBLIC_HEADERS_CXX += \\
+
+  % else:
+  PUBLIC_HEADERS_C += \\
+
+  % endif
+  % for hdr in lib.public_headers:
+      ${hdr} \\
+
+  % endfor
+  % endif
+
+  LIB${lib.name.upper()}_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIB${lib.name.upper()}_SRC))))
+
+  ## If the library requires OpenSSL, let's add some restrictions.
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  ifeq ($(NO_SECURE),true)
+
+  # You can't build secure libraries if you don't have OpenSSL.
+
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: openssl_dep_error
+
+  % if lib.build == "all":
+  ifeq ($(SYSTEM),MINGW32)
+  $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT): openssl_dep_error
+  else
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT): openssl_dep_error
+  endif
+  % endif
+
+  else
+
+  % if lib.language == 'c++':
+  ifeq ($(NO_PROTOBUF),true)
+
+  # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
+
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: protobuf_dep_error
+
+  % if lib.build == "all":
+  ifeq ($(SYSTEM),MINGW32)
+  $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT): protobuf_dep_error
+  else
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT): protobuf_dep_error
+  endif
+  % endif
+
+  else
+  % endif
+
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP)\
+  ## The else here corresponds to the if secure earlier.
+  % else:
+  % if lib.language == 'c++':
+  ifeq ($(NO_PROTOBUF),true)
+
+  # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
+
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: protobuf_dep_error
+
+  % if lib.build == "all":
+  ifeq ($(SYSTEM),MINGW32)
+  $(LIBDIR)/$(CONFIG)/${lib.name}.$(SHARED_EXT): protobuf_dep_error
+  else
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.$(SHARED_EXT): protobuf_dep_error
+  endif
+  % endif
+
+  else
+
+  % endif
+  $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP)\
+  % endif
+  % if lib.language == 'c++':
+   $(PROTOBUF_DEP)\
+  % endif
+   $(LIB${lib.name.upper()}_OBJS)
+  	$(E) "[AR]      Creating $@"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
+  	$(Q) $(AR) rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS)
+  % if lib.get('baselib', False):
+  % if lib.get('secure', 'check') == True:
+  	$(Q) rm -rf tmp-merge-${lib.name}
+  	$(Q) mkdir tmp-merge-${lib.name}
+  	$(Q) ( cd tmp-merge-${lib.name} ; $(AR) x ../$(LIBDIR)/$(CONFIG)/lib${lib.name}.a )
+  	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge-${lib.name} ; <%text>ar x ../$${l}</%text> ) ; done
+  	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/__.SYMDEF*
+  	$(Q) ar rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/*
+  	$(Q) rm -rf tmp-merge-${lib.name}
+  % endif
+  % endif
+  ifeq ($(SYSTEM),Darwin)
+  	$(Q) ranlib $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
+  endif
+
+  <%
+
+    if lib.language == 'c++':
+      ld = '$(LDXX)'
+    else:
+      ld = '$(LD)'
+
+    out_base = '$(LIBDIR)/$(CONFIG)/' + lib.name
+    out_libbase = '$(LIBDIR)/$(CONFIG)/lib' + lib.name
+
+    common = '$(LIB' + lib.name.upper() + '_OBJS) $(LDLIBS)'
+
+    libs = ''
+    lib_deps = ' $(ZLIB_DEP)'
+    mingw_libs = ''
+    mingw_lib_deps = ' $(ZLIB_DEP)'
+    if lib.language == 'c++':
+      lib_deps += ' $(PROTOBUF_DEP)'
+      mingw_lib_deps += ' $(PROTOBUF_DEP)'
+    for dep in lib.get('deps', []):
+      libs = libs + ' -l' + dep
+      lib_deps = lib_deps + ' $(LIBDIR)/$(CONFIG)/lib' + dep + '.$(SHARED_EXT)'
+      mingw_libs = mingw_libs + ' -l' + dep + '-imp'
+      mingw_lib_deps = mingw_lib_deps + ' $(LIBDIR)/$(CONFIG)/' + dep + '.$(SHARED_EXT)'
+
+    security = lib.get('secure', 'check')
+    if security == True:
+      common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)'
+
+    if security in [True, 'check']:
+      for src in lib.src:
+        if not proto_re.match(src):
+          sources_that_need_openssl.add(src)
+    else:
+      for src in lib.src:
+        sources_that_don_t_need_openssl.add(src)
+
+    if 'zookeeper' in lib.get('external_deps', []):
+      libs = libs + ' -lzookeeper_mt'
+
+    if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+      lib_deps = lib_deps + ' $(OPENSSL_DEP)'
+      mingw_lib_deps = mingw_lib_deps + ' $(OPENSSL_DEP)'
+
+    if lib.language == 'c++':
+      common = common + ' $(LDLIBSXX) $(LDLIBS_PROTOBUF)'
+  %>
+
+  % if lib.build == "all":
+  ifeq ($(SYSTEM),MINGW32)
+  ${out_base}.$(SHARED_EXT): $(LIB${lib.name.upper()}_OBJS) ${mingw_lib_deps}
+  	$(E) "[LD]      Linking $@"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) ${ld} $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=${out_base}.def -Wl,--out-implib=${out_libbase}-imp.a -o ${out_base}.$(SHARED_EXT) ${common}${mingw_libs}
+  else
+  ${out_libbase}.$(SHARED_EXT): $(LIB${lib.name.upper()}_OBJS) ${lib_deps}
+  	$(E) "[LD]      Linking $@"
+  	$(Q) mkdir -p `dirname $@`
+  ifeq ($(SYSTEM),Darwin)
+  	$(Q) ${ld} $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name lib${lib.name}.$(SHARED_EXT) -dynamiclib -o ${out_libbase}.$(SHARED_EXT) ${common}${libs}
+  else
+  	$(Q) ${ld} $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,lib${lib.name}.so.${settings.version.major} -o ${out_libbase}.$(SHARED_EXT) ${common}${libs}
+  	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) ${out_libbase}.so.${settings.version.major}
+  	$(Q) ln -sf lib${lib.name}.$(SHARED_EXT) ${out_libbase}.so
+  endif
+  endif
+  % endif
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  ## If the lib was secure, we have to close the Makefile's if that tested
+  ## the presence of OpenSSL.
+
+  endif
+  % endif
+  % if lib.language == 'c++':
+  ## If the lib was C++, we have to close the Makefile's if that tested
+  ## the presence of protobuf 3.0.0+
+
+  endif
+  % endif
+
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  ifneq ($(NO_SECURE),true)
+  % endif
+  ifneq ($(NO_DEPS),true)
+  -include $(LIB${lib.name.upper()}_OBJS:.o=.dep)
+  endif
+  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  endif
+  % endif
+  % for src in lib.src:
+  % if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src):
+  $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: ${' '.join(proto_to_cc(src2) for src2 in lib.src if proto_re.match(src2))}
+  % endif
+  % endfor
+  </%def>
+
+  <%def name="maketarget(tgt)"><% has_no_sources = not tgt.src %>
+  % if not has_no_sources:
+  ${tgt.name.upper()}_SRC = \\
+
+  % for src in tgt.src:
+      ${proto_to_cc(src)} \\
+
+  % endfor
+
+  ${tgt.name.upper()}_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(${tgt.name.upper()}_SRC))))
+  % endif
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
+  ifeq ($(NO_SECURE),true)
+
+  # You can't build secure targets if you don't have OpenSSL.
+
+  $(BINDIR)/$(CONFIG)/${tgt.name}: openssl_dep_error
+
+  else
+
+  % endif
+  ##
+  ## We're not trying to add a dependency on building zlib and openssl here,
+  ## as it's already done in the libraries. We're assuming that the build
+  ## trickles down, and that a secure target requires a secure version of
+  ## a library.
+  ##
+  ## That simplifies the codegen a bit, but prevents a fully defined Makefile.
+  ## I can live with that.
+  ##
+  % if tgt.build == 'protoc' or tgt.language == 'c++':
+
+  ifeq ($(NO_PROTOBUF),true)
+
+  # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
+
+  $(BINDIR)/$(CONFIG)/${tgt.name}: protobuf_dep_error
+
+  else
+
+  $(BINDIR)/$(CONFIG)/${tgt.name}: \
+  % if not has_no_sources:
+  $(PROTOBUF_DEP) $(${tgt.name.upper()}_OBJS)\
+  % endif
+  % else:
+  $(BINDIR)/$(CONFIG)/${tgt.name}: \
+  % if not has_no_sources:
+  $(${tgt.name.upper()}_OBJS)\
+  % endif
+  % endif
+  % for dep in tgt.deps:
+   $(LIBDIR)/$(CONFIG)/lib${dep}.a\
+  % endfor
+
+  % if tgt.language == "c++":
+  ## C++ targets specificies.
+  % if tgt.build == 'protoc':
+  	$(E) "[HOSTLD]  Linking $@"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) \
+  % if not has_no_sources:
+  $(${tgt.name.upper()}_OBJS)\
+  % endif
+  % else:
+  	$(E) "[LD]      Linking $@"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(LDXX) $(LDFLAGS) \
+  % if not has_no_sources:
+  $(${tgt.name.upper()}_OBJS)\
+  % endif
+  % endif
+  % else:
+  ## C-only targets specificities.
+  	$(E) "[LD]      Linking $@"
+  	$(Q) mkdir -p `dirname $@`
+  	$(Q) $(LD) $(LDFLAGS) \
+  % if not has_no_sources:
+  $(${tgt.name.upper()}_OBJS)\
+  % endif
+  % endif
+  % for dep in tgt.deps:
+   $(LIBDIR)/$(CONFIG)/lib${dep}.a\
+  % endfor
+  % if 'zookeeper' in tgt.get('external_deps', []):
+   -lzookeeper_mt\
+  % endif
+  % if tgt.language == "c++":
+  % if tgt.build == 'protoc':
+   $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC)\
+  % else:
+   $(LDLIBSXX) $(LDLIBS_PROTOBUF)\
+  % endif
+  % endif
+  % if tgt.build == 'protoc':
+   $(HOST_LDLIBS)\
+  % else:
+   $(LDLIBS)\
+  % endif
+  % if tgt.build == 'protoc':
+   $(HOST_LDLIBS_PROTOC)\
+  % elif tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
+   $(LDLIBS_SECURE)\
+  % endif
+  % if tgt.language == 'c++' and tgt.build == 'test':
+   $(GTEST_LIB)\
+  % elif tgt.language == 'c++' and tgt.build == 'benchmark':
+   $(GTEST_LIB)\
+  % endif
+   -o $(BINDIR)/$(CONFIG)/${tgt.name}
+  % if tgt.build == 'protoc' or tgt.language == 'c++':
+
+  endif
+  % endif
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
+
+  endif
+  % endif
+
+  % for src in tgt.src:
+  $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
+  % for dep in tgt.deps:
+   $(LIBDIR)/$(CONFIG)/lib${dep}.a\
+  % endfor
+
+  % endfor
+  % if not has_no_sources:
+  deps_${tgt.name}: $(${tgt.name.upper()}_OBJS:.o=.dep)
+  % endif
+
+  % if not has_no_sources:
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
+  ifneq ($(NO_SECURE),true)
+  % endif
+  ifneq ($(NO_DEPS),true)
+  -include $(${tgt.name.upper()}_OBJS:.o=.dep)
+  endif
+  % if tgt.get('secure', 'check') == True or tgt.get('secure', 'check') == 'check':
+  endif
+  % endif
+  % endif
+  </%def>
+
+  ifneq ($(OPENSSL_DEP),)
+  # This is to ensure the embedded OpenSSL is built beforehand, properly
+  # installing headers to their final destination on the drive. We need this
+  # otherwise parallel compilation will fail if a source is compiled first.
+  % for src in sorted(sources_that_need_openssl):
+  % if src not in sources_that_don_t_need_openssl:
+  ${src}: $(OPENSSL_DEP)
+  % endif
+  % endfor
+  endif
+
+  .PHONY: all strip tools \
+  dep_error openssl_dep_error openssl_dep_message git_update stop \
+  buildtests buildtests_c buildtests_cxx \
+  test test_c test_cxx \
+  install install_c install_cxx \
+  install-headers install-headers_c install-headers_cxx \
+  install-shared install-shared_c install-shared_cxx \
+  install-static install-static_c install-static_cxx \
+  strip strip-shared strip-static \
+  strip_c strip-shared_c strip-static_c \
+  strip_cxx strip-shared_cxx strip-static_cxx \
+  dep_c dep_cxx bins_dep_c bins_dep_cxx \
+  clean
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index d675a1a7f0..060961f401 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -1,155 +1,157 @@
-# GRPC CocoaPods podspec
-# This file has been automatically generated from a template file.
-# Please look at the templates directory instead.
-# This file can be regenerated from the template by running
-# tools/buildgen/generate_projects.sh
-
-# Copyright 2015, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-<%!
-bad_header_names = ('time.h', 'string.h')
-def fix_header_name(name):
-  split_name = name.split('/')
-  if split_name[-1] in bad_header_names:
-    split_name[-1] = 'grpc_' + split_name[-1]
-  if split_name[0] == 'include':
-    split_name = split_name[1:]
-  return '/'.join(split_name)
-
-def grpc_files(libs):
-  out = []
-  for lib in libs:
-    if lib.name in ("grpc", "gpr"):
-      out.extend(fix_header_name(h) for h in lib.get('headers', []))
-      out.extend(fix_header_name(h) for h in lib.get('public_headers', []))
-      out.extend(lib.get('src', []))
-  return out;
-
-def grpc_private_headers(libs):
-  out = []
-  for lib in libs:
-    if lib.name in ("grpc", "gpr"):
-      out.extend(lib.get('headers', []))
-  return out
-%>
-Pod::Spec.new do |s|
-  s.name     = 'gRPC'
-  s.version  = '0.7.0'
-  s.summary  = 'gRPC client library for iOS/OSX'
-  s.homepage = 'http://www.grpc.io'
-  s.license  = 'New BSD'
-  s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }
-
-  # s.source = { :git => 'https://github.com/grpc/grpc.git',
-  #              :tag => 'release-0_10_0-objectivec-0.6.0' }
-
-  s.ios.deployment_target = '6.0'
-  s.osx.deployment_target = '10.8'
-  s.requires_arc = true
-
-  objc_dir = 'src/objective-c'
-
-  # Reactive Extensions library for iOS.
-  s.subspec 'RxLibrary' do |ss|
-    src_dir = "#{objc_dir}/RxLibrary"
-    ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
-    ss.private_header_files = "#{src_dir}/private/*.h"
-    ss.header_mappings_dir = "#{objc_dir}"
-  end
-
-  # Core cross-platform gRPC library, written in C.
-  s.subspec 'C-Core' do |ss|
-    ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))}
-
-    ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))}
-
-    ss.header_mappings_dir = '.'
-
-    ss.requires_arc = false
-    ss.libraries = 'z'
-    ss.dependency 'OpenSSL', '~> 1.0.200'
-
-    # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
-  end
-
-  # This is a workaround for Cocoapods Issue #1437.
-  # It renames time.h and string.h to grpc_time.h and grpc_string.h.
-  # It needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run
-  # prepare_command's of subspecs.
+%YAML 1.2
+--- |
+  # GRPC CocoaPods podspec
+  # This file has been automatically generated from a template file.
+  # Please look at the templates directory instead.
+  # This file can be regenerated from the template by running
+  # tools/buildgen/generate_projects.sh
+  
+  # Copyright 2015, Google Inc.
+  # All rights reserved.
   #
-  # TODO(jcanizales): Try out others' solutions at Issue #1437.
-  s.prepare_command = <<-CMD
-    # Move contents of include up a level to avoid manually specifying include paths
-    cp -r "include/grpc" "."
-
-    DIR_TIME="grpc/support"
-    BAD_TIME="$DIR_TIME/time.h"
-    GOOD_TIME="$DIR_TIME/grpc_time.h"
-    grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
-    if [ -f "$BAD_TIME" ];
-    then
-      mv -f "$BAD_TIME" "$GOOD_TIME"
-    fi
-
-    DIR_STRING="src/core/support"
-    BAD_STRING="$DIR_STRING/string.h"
-    GOOD_STRING="$DIR_STRING/grpc_string.h"
-    grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
-    if [ -f "$BAD_STRING" ];
-    then
-      mv -f "$BAD_STRING" "$GOOD_STRING"
-    fi
-  CMD
-
-  # Objective-C wrapper around the core gRPC library.
-  s.subspec 'GRPCClient' do |ss|
-    src_dir = "#{objc_dir}/GRPCClient"
-    ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
-    ss.private_header_files = "#{src_dir}/private/*.h"
-    ss.header_mappings_dir = "#{objc_dir}"
-
-    ss.dependency 'gRPC/C-Core'
-    ss.dependency 'gRPC/RxLibrary'
-
-    # Certificates, to be able to establish TLS connections:
-    ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
-  end
-
-  # RPC library for ProtocolBuffers, based on gRPC
-  s.subspec 'ProtoRPC' do |ss|
-    src_dir = "#{objc_dir}/ProtoRPC"
-    ss.source_files = "#{src_dir}/*.{h,m}"
-    ss.header_mappings_dir = "#{objc_dir}"
-
-    ss.dependency 'gRPC/GRPCClient'
-    ss.dependency 'gRPC/RxLibrary'
-    ss.dependency 'Protobuf', '~> 3.0.0-alpha-3'
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions are
+  # met:
+  #
+  #     * Redistributions of source code must retain the above copyright
+  # notice, this list of conditions and the following disclaimer.
+  #     * Redistributions in binary form must reproduce the above
+  # copyright notice, this list of conditions and the following disclaimer
+  # in the documentation and/or other materials provided with the
+  # distribution.
+  #     * Neither the name of Google Inc. nor the names of its
+  # contributors may be used to endorse or promote products derived from
+  # this software without specific prior written permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  
+  <%!
+  bad_header_names = ('time.h', 'string.h')
+  def fix_header_name(name):
+    split_name = name.split('/')
+    if split_name[-1] in bad_header_names:
+      split_name[-1] = 'grpc_' + split_name[-1]
+    if split_name[0] == 'include':
+      split_name = split_name[1:]
+    return '/'.join(split_name)
+  
+  def grpc_files(libs):
+    out = []
+    for lib in libs:
+      if lib.name in ("grpc", "gpr"):
+        out.extend(fix_header_name(h) for h in lib.get('headers', []))
+        out.extend(fix_header_name(h) for h in lib.get('public_headers', []))
+        out.extend(lib.get('src', []))
+    return out;
+  
+  def grpc_private_headers(libs):
+    out = []
+    for lib in libs:
+      if lib.name in ("grpc", "gpr"):
+        out.extend(lib.get('headers', []))
+    return out
+  %>
+  Pod::Spec.new do |s|
+    s.name     = 'gRPC'
+    s.version  = '0.7.0'
+    s.summary  = 'gRPC client library for iOS/OSX'
+    s.homepage = 'http://www.grpc.io'
+    s.license  = 'New BSD'
+    s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }
+  
+    # s.source = { :git => 'https://github.com/grpc/grpc.git',
+    #              :tag => 'release-0_10_0-objectivec-0.6.0' }
+  
+    s.ios.deployment_target = '6.0'
+    s.osx.deployment_target = '10.8'
+    s.requires_arc = true
+  
+    objc_dir = 'src/objective-c'
+  
+    # Reactive Extensions library for iOS.
+    s.subspec 'RxLibrary' do |ss|
+      src_dir = "#{objc_dir}/RxLibrary"
+      ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
+      ss.private_header_files = "#{src_dir}/private/*.h"
+      ss.header_mappings_dir = "#{objc_dir}"
+    end
+  
+    # Core cross-platform gRPC library, written in C.
+    s.subspec 'C-Core' do |ss|
+      ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))}
+  
+      ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))}
+  
+      ss.header_mappings_dir = '.'
+  
+      ss.requires_arc = false
+      ss.libraries = 'z'
+      ss.dependency 'OpenSSL', '~> 1.0.200'
+  
+      # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w'
+    end
+  
+    # This is a workaround for Cocoapods Issue #1437.
+    # It renames time.h and string.h to grpc_time.h and grpc_string.h.
+    # It needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run
+    # prepare_command's of subspecs.
+    #
+    # TODO(jcanizales): Try out others' solutions at Issue #1437.
+    s.prepare_command = <<-CMD
+      # Move contents of include up a level to avoid manually specifying include paths
+      cp -r "include/grpc" "."
+  
+      DIR_TIME="grpc/support"
+      BAD_TIME="$DIR_TIME/time.h"
+      GOOD_TIME="$DIR_TIME/grpc_time.h"
+      grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
+      if [ -f "$BAD_TIME" ];
+      then
+        mv -f "$BAD_TIME" "$GOOD_TIME"
+      fi
+  
+      DIR_STRING="src/core/support"
+      BAD_STRING="$DIR_STRING/string.h"
+      GOOD_STRING="$DIR_STRING/grpc_string.h"
+      grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
+      if [ -f "$BAD_STRING" ];
+      then
+        mv -f "$BAD_STRING" "$GOOD_STRING"
+      fi
+    CMD
+  
+    # Objective-C wrapper around the core gRPC library.
+    s.subspec 'GRPCClient' do |ss|
+      src_dir = "#{objc_dir}/GRPCClient"
+      ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
+      ss.private_header_files = "#{src_dir}/private/*.h"
+      ss.header_mappings_dir = "#{objc_dir}"
+  
+      ss.dependency 'gRPC/C-Core'
+      ss.dependency 'gRPC/RxLibrary'
+  
+      # Certificates, to be able to establish TLS connections:
+      ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
+    end
+  
+    # RPC library for ProtocolBuffers, based on gRPC
+    s.subspec 'ProtoRPC' do |ss|
+      src_dir = "#{objc_dir}/ProtoRPC"
+      ss.source_files = "#{src_dir}/*.{h,m}"
+      ss.header_mappings_dir = "#{objc_dir}"
+  
+      ss.dependency 'gRPC/GRPCClient'
+      ss.dependency 'gRPC/RxLibrary'
+      ss.dependency 'Protobuf', '~> 3.0.0-alpha-3'
+    end
   end
-end
diff --git a/templates/src/core/surface/version.c.template b/templates/src/core/surface/version.c.template
index 936341c3cf..3e6840460f 100644
--- a/templates/src/core/surface/version.c.template
+++ b/templates/src/core/surface/version.c.template
@@ -1,41 +1,43 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/* This file is autogenerated from:
-   templates/src/core/surface/version.c.template */
-
-#include <grpc/grpc.h>
-
-const char *grpc_version_string(void) {
-	return "${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}";
-}
+%YAML 1.2
+--- |
+  /*
+   *
+   * Copyright 2015, Google Inc.
+   * All rights reserved.
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are
+   * met:
+   *
+   *     * Redistributions of source code must retain the above copyright
+   * notice, this list of conditions and the following disclaimer.
+   *     * Redistributions in binary form must reproduce the above
+   * copyright notice, this list of conditions and the following disclaimer
+   * in the documentation and/or other materials provided with the
+   * distribution.
+   *     * Neither the name of Google Inc. nor the names of its
+   * contributors may be used to endorse or promote products derived from
+   * this software without specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   *
+   */
+  
+  /* This file is autogenerated from:
+     templates/src/core/surface/version.c.template */
+  
+  #include <grpc/grpc.h>
+  
+  const char *grpc_version_string(void) {
+  	return "${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}";
+  }
diff --git a/templates/tools/doxygen/Doxyfile.c++.internal.template b/templates/tools/doxygen/Doxyfile.c++.internal.template
index abaf52440a..c77f1f2d95 100644
--- a/templates/tools/doxygen/Doxyfile.c++.internal.template
+++ b/templates/tools/doxygen/Doxyfile.c++.internal.template
@@ -1,2 +1,4 @@
-<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
-${gen_doxyfile(['grpc++'], 'C++', libs, True)}
+%YAML 1.2
+--- |
+  <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
+  ${gen_doxyfile(['grpc++'], 'C++', libs, True)}
diff --git a/templates/tools/doxygen/Doxyfile.c++.template b/templates/tools/doxygen/Doxyfile.c++.template
index 6cedfa5fe5..04f7045e5a 100644
--- a/templates/tools/doxygen/Doxyfile.c++.template
+++ b/templates/tools/doxygen/Doxyfile.c++.template
@@ -1,2 +1,4 @@
-<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
-${gen_doxyfile(['grpc++'], 'C++', libs, False)}
+%YAML 1.2
+--- |
+  <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
+  ${gen_doxyfile(['grpc++'], 'C++', libs, False)}
diff --git a/templates/tools/doxygen/Doxyfile.core.internal.template b/templates/tools/doxygen/Doxyfile.core.internal.template
index 8d7963aa85..05be9d81aa 100644
--- a/templates/tools/doxygen/Doxyfile.core.internal.template
+++ b/templates/tools/doxygen/Doxyfile.core.internal.template
@@ -1,2 +1,4 @@
-<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
-${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)}
+%YAML 1.2
+--- |
+  <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
+  ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)}
diff --git a/templates/tools/doxygen/Doxyfile.core.template b/templates/tools/doxygen/Doxyfile.core.template
index 69b189fdfd..8004294ec1 100644
--- a/templates/tools/doxygen/Doxyfile.core.template
+++ b/templates/tools/doxygen/Doxyfile.core.template
@@ -1,2 +1,4 @@
-<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
-${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)}
+%YAML 1.2
+--- |
+  <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
+  ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)}
diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template
index 1c0e04283a..6f51ed7323 100644
--- a/templates/tools/run_tests/sources_and_headers.json.template
+++ b/templates/tools/run_tests/sources_and_headers.json.template
@@ -1,33 +1,35 @@
-<%!
-import json
-import os
-
-def proto_headers(src):
-	out = []
-	for f in src:
-		name, ext = os.path.splitext(f)
-		if ext == '.proto':
-			out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h'])
-	return out
-
-def no_protos(src):
-	out = []
-	for f in src:
-		if os.path.splitext(f)[1] != '.proto':
-			out.append(f)
-	return out
-%>
-
-${json.dumps([{"name": tgt.name,
-               "language": tgt.language,
-               "src": sorted(
-                   no_protos(tgt.src) + 
-                   tgt.get('public_headers', []) + 
-                   tgt.get('headers', [])),
-               "headers": sorted(
-                   tgt.get('public_headers', []) + 
-                   tgt.get('headers', []) + 
-                   proto_headers(tgt.src)),
-               "deps": sorted(tgt.get('deps', []))}
-              for tgt in (targets + libs)],
-             sort_keys=True, indent=2)}
+%YAML 1.2
+--- |
+  <%!
+  import json
+  import os
+  
+  def proto_headers(src):
+  	out = []
+  	for f in src:
+  		name, ext = os.path.splitext(f)
+  		if ext == '.proto':
+  			out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h'])
+  	return out
+  
+  def no_protos(src):
+  	out = []
+  	for f in src:
+  		if os.path.splitext(f)[1] != '.proto':
+  			out.append(f)
+  	return out
+  %>
+  
+  ${json.dumps([{"name": tgt.name,
+                 "language": tgt.language,
+                 "src": sorted(
+                     no_protos(tgt.src) + 
+                     tgt.get('public_headers', []) + 
+                     tgt.get('headers', [])),
+                 "headers": sorted(
+                     tgt.get('public_headers', []) + 
+                     tgt.get('headers', []) + 
+                     proto_headers(tgt.src)),
+                 "deps": sorted(tgt.get('deps', []))}
+                for tgt in (targets + libs)],
+               sort_keys=True, indent=2)}
diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template
index 63046731de..655976ac86 100644
--- a/templates/tools/run_tests/tests.json.template
+++ b/templates/tools/run_tests/tests.json.template
@@ -1,13 +1,15 @@
-<%!
-import json
-%>
-
-${json.dumps([{"name": tgt.name,
-               "language": tgt.language,
-               "platforms": tgt.platforms,
-               "ci_platforms": tgt.ci_platforms,
-	       "exclude_configs": tgt.get("exclude_configs", []),
-               "flaky": tgt.flaky}
-              for tgt in targets
-              if tgt.get('run', True) and tgt.build == 'test'],
-             sort_keys=True, indent=2)}
+%YAML 1.2
+--- |
+  <%!
+  import json
+  %>
+  
+  ${json.dumps([{"name": tgt.name,
+                 "language": tgt.language,
+                 "platforms": tgt.platforms,
+                 "ci_platforms": tgt.ci_platforms,
+  	       "exclude_configs": tgt.get("exclude_configs", []),
+                 "flaky": tgt.flaky}
+                for tgt in targets
+                if tgt.get('run', True) and tgt.build == 'test'],
+               sort_keys=True, indent=2)}
diff --git a/templates/vsprojects/Grpc.mak.template b/templates/vsprojects/Grpc.mak.template
index 9d2f676d38..12a1dbf2d6 100644
--- a/templates/vsprojects/Grpc.mak.template
+++ b/templates/vsprojects/Grpc.mak.template
@@ -1,206 +1,208 @@
-# Copyright 2015, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-<%!
-  import re
-%>\
-<%namespace file="packages.include" import="get_openssl,get_zlib"/>\
-<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
-<%
-  build_from_project_file = set(['gpr',
-                                 'gpr_test_util',
-                                 'grpc',
-                                 'grpc_test_util',
-                                 'grpc_test_util_unsecure',
-                                 'grpc_unsecure',
-                                 'grpc++',
-                                 'grpc++_unsecure'
-                                ])
-  buildable_targets = [ target for target in targets + libs
-                        if target.build in ['all', 'test', 'private', 'tool', 'benchmark'] and
-                        target.language in ['c', 'c++'] and
-                        all([(src.endswith('.c') or src.endswith('.cc') or src.endswith('.proto')) for src in target.src]) and
-                        'windows' in target.get('platforms', ['windows']) ]
-  c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ]
-  cxx_test_targets = [ target for target in buildable_targets if target.build == 'test' and target.language == 'c++' ]
-%>\
-# NMake file to build secondary gRPC targets on Windows.
-# Use grpc.sln to solution to build the gRPC libraries.
-
-OUT_DIR=test_bin
-
-CC=cl.exe /nologo
-LINK=link.exe /nologo
-LIBTOOL=lib.exe /nologo /nodefaultlib
-
-REPO_ROOT=..
-OPENSSL_INCLUDES = .\packages\${get_openssl()}\build\native\include
-ZLIB_INCLUDES = .\packages\${get_zlib()}\build\native\include
-INCLUDES=/I$(REPO_ROOT) /I$(REPO_ROOT)\include /I$(OPENSSL_INCLUDES) /I$(ZLIB_INCLUDES)
-
-GFLAGS_INCLUDES = .\..\third_party\gflags\include
-GTEST_INCLUDES = .\..\third_party\gtest\include
-PROTOBUF_INCLUDES = .\..\third_party\protobuf\src
-CXX_INCLUDES=/I$(GFLAGS_INCLUDES) /I$(GTEST_INCLUDES) /I$(PROTOBUF_INCLUDES)
-
-#_SCL_SECURE_NO_WARNINGS supresses a ton of "potentially unsafe use of std lib" warnings
-DEFINES=/D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /D _CRT_SECURE_NO_WARNINGS /D _SCL_SECURE_NO_WARNINGS
-
-#important options: /TC vs. /TP: compile as C vs. compile as C++
-CFLAGS=/c $(INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze-
-CXXFLAGS=/c $(INCLUDES) $(CXX_INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP /analyze-
-
-LFLAGS=/DEBUG /INCREMENTAL /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86
-
-OPENSSL_LIBS=.\packages\${get_openssl()}\build\native\lib\v120\Win32\Debug\static\ssleay32.lib .\packages\${get_openssl()}\build\native\lib\v120\Win32\Debug\static\libeay32.lib
-WINSOCK_LIBS=ws2_32.lib
-GENERAL_LIBS=advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib winspool.lib
-ZLIB_LIBS=.\packages\${get_zlib()}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
-LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS)
-
-#shlwapi.lib provides PathMatchSpec() for gflags in windows
-GFLAGS_LIBS=.\..\third_party\gflags\lib\Debug\gflags.lib shlwapi.lib
-GTEST_LIBS=.\..\third_party\gtest\msvc\gtest\Debug\gtestd.lib
-PROTOBUF_LIBS=.\..\third_party\protobuf\vsprojects\Debug\libprotobuf.lib
-CXX_LIBS=$(GFLAGS_LIBS) $(GTEST_LIBS) $(PROTOBUF_LIBS)
-
-all: buildtests
-
-tools:
-
-tools_c:
-
-tools_cxx:
-
-$(OUT_DIR):
-	mkdir $(OUT_DIR)
-
-build_libs: \
-% for target in buildable_targets:
-% if target.build == 'private' or target.build == 'all':
-% if target.name in build_from_project_file:
-build_${target.name} \
-% else:
-Debug\${target.name}.lib \
-% endif
-% endif
-% endfor
-
-buildtests: buildtests_c buildtests_cxx
-
-buildtests_c: \
-% for target in c_test_targets:
-${target.name}.exe \
-% endfor
-
-	echo All C tests built.
-
-buildtests_cxx: \
-% for target in cxx_test_targets:
-${target.name}.exe \
-% endfor
-
-	echo All C++ tests built.
-
-% for target in buildable_targets:
-
-## replace all .proto includes with .pb.cc / .grpc.pb.cc
-%if target.src:
-%for source in target.src:
-%if source.endswith(".proto"):
-<%
-      src_name_parts = source.split(".")
-      target.src.append(src_name_parts[0] + ".pb.cc")
-      target.src.append(src_name_parts[0] + ".grpc.pb.cc")
-%>\
-%endif
-%endfor
-%endif
-## remove all .proto includes
-<%
-  target.src = [item for item in target.src if not re.search('([^/]+)\.proto$', item)]
-%>\
-%if target.name in build_from_project_file:
-build_${target.name}:
-	msbuild grpc.sln /t:${target.name} /p:Configuration=Debug /p:Linkage-grpc_dependencies_zlib=static
-%else:
-%if target.build == 'private':
-Debug\${target.name}.lib: \
-%else:
-${target.name}.exe: \
-%for dep in target.get('deps', []):
-%if dep in build_from_project_file:
-build_${dep} \
-%else:
-Debug\${dep}.lib \
-%endif
-%endfor
-%endif
-$(OUT_DIR)
-	echo Building ${target.name}
-%if target.language == 'c++':
-    $(CC) $(CXXFLAGS) /Fo:$(OUT_DIR)\ \
-%else:
-	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ \
-%endif
-%for source in target.src:
-$(REPO_ROOT)\${to_windows_path(source)} \
-%endfor
-%if not target.src:
-$(REPO_ROOT)\${to_windows_path('vsprojects/dummy.c')} \
-%endif
-
-%if target.build == 'private':
-	$(LIBTOOL) /OUT:"Debug\${target.name}.lib" \
-%else:
-	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\${target.name}.exe" \
-%for dep in target.get('deps', []):
-Debug\${dep}.lib \
-%endfor
-%if target.language == 'c++':
-$(CXX_LIBS) \
-%endif
-$(LIBS) \
-%endif
-%if not target.src:
-$(OUT_DIR)\dummy.obj \
-%else:
-%for source in target.src:
-%if re.search('([^/]+)\.c{1,2}$', source):
-$(OUT_DIR)\${re.search('([^/]+)\.c{1,2}$', source).group(1)}.obj \
-%endif
-%endfor
-%endif
-
-%if target.build != 'private':
-${target.name}: ${target.name}.exe
-	echo Running ${target.name}
-	$(OUT_DIR)\${target.name}.exe
-%endif
-%endif
-% endfor
+%YAML 1.2
+--- |
+  # Copyright 2015, Google Inc.
+  # All rights reserved.
+  #
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions are
+  # met:
+  #
+  #     * Redistributions of source code must retain the above copyright
+  # notice, this list of conditions and the following disclaimer.
+  #     * Redistributions in binary form must reproduce the above
+  # copyright notice, this list of conditions and the following disclaimer
+  # in the documentation and/or other materials provided with the
+  # distribution.
+  #     * Neither the name of Google Inc. nor the names of its
+  # contributors may be used to endorse or promote products derived from
+  # this software without specific prior written permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  <%!
+    import re
+  %>\
+  <%namespace file="packages.include" import="get_name"/>\
+  <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
+  <%
+    build_from_project_file = set(['gpr',
+                                   'gpr_test_util',
+                                   'grpc',
+                                   'grpc_test_util',
+                                   'grpc_test_util_unsecure',
+                                   'grpc_unsecure',
+                                   'grpc++',
+                                   'grpc++_unsecure'
+                                  ])
+    buildable_targets = [ target for target in targets + libs
+                          if target.build in ['all', 'test', 'private', 'tool', 'benchmark'] and
+                          target.language in ['c', 'c++'] and
+                          all([(src.endswith('.c') or src.endswith('.cc') or src.endswith('.proto')) for src in target.src]) and
+                          'windows' in target.get('platforms', ['windows']) ]
+    c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ]
+    cxx_test_targets = [ target for target in buildable_targets if target.build == 'test' and target.language == 'c++' ]
+  %>\
+  # NMake file to build secondary gRPC targets on Windows.
+  # Use grpc.sln to solution to build the gRPC libraries.
+  
+  OUT_DIR=test_bin
+  
+  CC=cl.exe /nologo
+  LINK=link.exe /nologo
+  LIBTOOL=lib.exe /nologo /nodefaultlib
+  
+  REPO_ROOT=..
+  OPENSSL_INCLUDES = .\packages\${get_name(vsprojects, 'openssl')}\build\native\include
+  ZLIB_INCLUDES = .\packages\${get_name(vsprojects, 'zlib')}\build\native\include
+  INCLUDES=/I$(REPO_ROOT) /I$(REPO_ROOT)\include /I$(OPENSSL_INCLUDES) /I$(ZLIB_INCLUDES)
+  
+  GFLAGS_INCLUDES = .\..\third_party\gflags\include
+  GTEST_INCLUDES = .\..\third_party\gtest\include
+  PROTOBUF_INCLUDES = .\..\third_party\protobuf\src
+  CXX_INCLUDES=/I$(GFLAGS_INCLUDES) /I$(GTEST_INCLUDES) /I$(PROTOBUF_INCLUDES)
+  
+  #_SCL_SECURE_NO_WARNINGS supresses a ton of "potentially unsafe use of std lib" warnings
+  DEFINES=/D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /D _CRT_SECURE_NO_WARNINGS /D _SCL_SECURE_NO_WARNINGS
+  
+  #important options: /TC vs. /TP: compile as C vs. compile as C++
+  CFLAGS=/c $(INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze-
+  CXXFLAGS=/c $(INCLUDES) $(CXX_INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP /analyze-
+  
+  LFLAGS=/DEBUG /INCREMENTAL /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86
+  
+  OPENSSL_LIBS=.\packages\${get_name(vsprojects, 'openssl')}\build\native\lib\v120\Win32\Debug\static\ssleay32.lib .\packages\${get_name(vsprojects, 'openssl')}\build\native\lib\v120\Win32\Debug\static\libeay32.lib
+  WINSOCK_LIBS=ws2_32.lib
+  GENERAL_LIBS=advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib winspool.lib
+  ZLIB_LIBS=.\packages\${get_name(vsprojects, 'zlib')}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
+  LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS)
+  
+  #shlwapi.lib provides PathMatchSpec() for gflags in windows
+  GFLAGS_LIBS=.\..\third_party\gflags\lib\Debug\gflags.lib shlwapi.lib
+  GTEST_LIBS=.\..\third_party\gtest\msvc\gtest\Debug\gtestd.lib
+  PROTOBUF_LIBS=.\..\third_party\protobuf\vsprojects\Debug\libprotobuf.lib
+  CXX_LIBS=$(GFLAGS_LIBS) $(GTEST_LIBS) $(PROTOBUF_LIBS)
+  
+  all: buildtests
+  
+  tools:
+  
+  tools_c:
+  
+  tools_cxx:
+  
+  $(OUT_DIR):
+  	mkdir $(OUT_DIR)
+  
+  build_libs: \
+  % for target in buildable_targets:
+  % if target.build == 'private' or target.build == 'all':
+  % if target.name in build_from_project_file:
+  build_${target.name} \
+  % else:
+  Debug\${target.name}.lib \
+  % endif
+  % endif
+  % endfor
+  
+  buildtests: buildtests_c buildtests_cxx
+  
+  buildtests_c: \
+  % for target in c_test_targets:
+  ${target.name}.exe \
+  % endfor
+  
+  	echo All C tests built.
+  
+  buildtests_cxx: \
+  % for target in cxx_test_targets:
+  ${target.name}.exe \
+  % endfor
+  
+  	echo All C++ tests built.
+  
+  % for target in buildable_targets:
+  
+  ## replace all .proto includes with .pb.cc / .grpc.pb.cc
+  %if target.src:
+  %for source in target.src:
+  %if source.endswith(".proto"):
+  <%
+        src_name_parts = source.split(".")
+        target.src.append(src_name_parts[0] + ".pb.cc")
+        target.src.append(src_name_parts[0] + ".grpc.pb.cc")
+  %>\
+  %endif
+  %endfor
+  %endif
+  ## remove all .proto includes
+  <%
+    target.src = [item for item in target.src if not re.search('([^/]+)\.proto$', item)]
+  %>\
+  %if target.name in build_from_project_file:
+  build_${target.name}:
+  	msbuild grpc.sln /t:${target.name} /p:Configuration=Debug /p:Linkage-grpc_dependencies_zlib=static
+  %else:
+  %if target.build == 'private':
+  Debug\${target.name}.lib: \
+  %else:
+  ${target.name}.exe: \
+  %for dep in target.get('deps', []):
+  %if dep in build_from_project_file:
+  build_${dep} \
+  %else:
+  Debug\${dep}.lib \
+  %endif
+  %endfor
+  %endif
+  $(OUT_DIR)
+  	echo Building ${target.name}
+  %if target.language == 'c++':
+      $(CC) $(CXXFLAGS) /Fo:$(OUT_DIR)\ \
+  %else:
+  	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ \
+  %endif
+  %for source in target.src:
+  $(REPO_ROOT)\${to_windows_path(source)} \
+  %endfor
+  %if not target.src:
+  $(REPO_ROOT)\${to_windows_path('vsprojects/dummy.c')} \
+  %endif
+  
+  %if target.build == 'private':
+  	$(LIBTOOL) /OUT:"Debug\${target.name}.lib" \
+  %else:
+  	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\${target.name}.exe" \
+  %for dep in target.get('deps', []):
+  Debug\${dep}.lib \
+  %endfor
+  %if target.language == 'c++':
+  $(CXX_LIBS) \
+  %endif
+  $(LIBS) \
+  %endif
+  %if not target.src:
+  $(OUT_DIR)\dummy.obj \
+  %else:
+  %for source in target.src:
+  %if re.search('([^/]+)\.c{1,2}$', source):
+  $(OUT_DIR)\${re.search('([^/]+)\.c{1,2}$', source).group(1)}.obj \
+  %endif
+  %endfor
+  %endif
+  
+  %if target.build != 'private':
+  ${target.name}: ${target.name}.exe
+  	echo Running ${target.name}
+  	$(OUT_DIR)\${target.name}.exe
+  %endif
+  %endif
+  % endfor
diff --git a/templates/vsprojects/cpptest.props.template b/templates/vsprojects/cpptest.props.template
new file mode 100644
index 0000000000..14169d6ddf
--- /dev/null
+++ b/templates/vsprojects/cpptest.props.template
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\include;$(SolutionDir)\..\third_party\protobuf\src;$(SolutionDir)\..\third_party\gtest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gpr_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;gpr.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\gtest\msvc\gtest\Debug;$(SolutionDir)\..\third_party\gflags\lib\Debug;$(SolutionDir)\..\Debug;$(SolutionDir)\..\packages\grpc.dependencies.openssl.${vspackages_dict['grpc.dependencies.openssl'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/templates/vsprojects/global.props.template b/templates/vsprojects/global.props.template
new file mode 100644
index 0000000000..d28b239547
--- /dev/null
+++ b/templates/vsprojects/global.props.template
@@ -0,0 +1,16 @@
+%YAML 1.2
+--- |
+  <?xml version="1.0" encoding="utf-8"?>
+  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ImportGroup Label="PropertySheets" />
+    <PropertyGroup Label="UserMacros" />
+    <PropertyGroup />
+    <ItemDefinitionGroup>
+      <ClCompile>
+        <AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\include;$(SolutionDir)\..\third_party\protobuf\src;${';'.join('$(SolutionDir)\\packages\\%s.%s\\build\\native\\include' % (p.name, p.version) for p in vspackages)};%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+        <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        <WarningLevel>EnableAllWarnings</WarningLevel>
+      </ClCompile>
+    </ItemDefinitionGroup>
+    <ItemGroup />
+  </Project>
diff --git a/templates/vsprojects/gpr/gpr.vcxproj.filters.template b/templates/vsprojects/gpr/gpr.vcxproj.filters.template
deleted file mode 100644
index 779a36bf0f..0000000000
--- a/templates/vsprojects/gpr/gpr.vcxproj.filters.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
-${gen_filters('gpr', libs)}
diff --git a/templates/vsprojects/gpr/gpr.vcxproj.template b/templates/vsprojects/gpr/gpr.vcxproj.template
deleted file mode 100644
index ca217c2762..0000000000
--- a/templates/vsprojects/gpr/gpr.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('gpr', libs)}
diff --git a/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template b/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template
deleted file mode 100644
index d412d646e7..0000000000
--- a/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('gpr_test_util', libs)}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template b/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template
deleted file mode 100644
index 70e0a6c13b..0000000000
--- a/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
-${gen_filters('grpc++', libs)}
diff --git a/templates/vsprojects/grpc++/grpc++.vcxproj.template b/templates/vsprojects/grpc++/grpc++.vcxproj.template
deleted file mode 100644
index 5f13591b2d..0000000000
--- a/templates/vsprojects/grpc++/grpc++.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc++', libs)}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters.template b/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters.template
index 465a3d76f5..99f707ad41 100644
--- a/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters.template
+++ b/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
-${gen_filters('grpc++_unsecure', libs)}
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
+  ${gen_filters('grpc++_unsecure', libs)}
diff --git a/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.template b/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.template
index 62016ccc0a..a6a7b2c108 100644
--- a/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.template
+++ b/templates/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc++_unsecure', libs)}
\ No newline at end of file
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project('grpc++_unsecure', libs)}
diff --git a/templates/vsprojects/grpc+tests.sln.template b/templates/vsprojects/grpc+tests.sln.template
new file mode 100644
index 0000000000..eb314a3097
--- /dev/null
+++ b/templates/vsprojects/grpc+tests.sln.template
@@ -0,0 +1,7 @@
+%YAML 1.2
+--- |
+  <%namespace file="sln_defs.include" import="gen_solution"/>\
+  <%
+  solution_projects = [p for p in vsprojects if p.build != 'protoc' and p.language in ['c', 'c++'] and not (p.language == 'c++' and p.build in ['private', 'test'])]
+  %>\
+  ${gen_solution(solution_projects, use_dlls='yes')}
diff --git a/templates/vsprojects/grpc.sln.template b/templates/vsprojects/grpc.sln.template
index 5c5e28c885..dbbb2c2ad1 100644
--- a/templates/vsprojects/grpc.sln.template
+++ b/templates/vsprojects/grpc.sln.template
@@ -1,5 +1,7 @@
-<%namespace file="sln_defs.include" import="gen_solution"/>\
-<%
-solution_projects = [p for p in vsprojects if p.build != 'protoc' and p.language in ['c', 'c++']]
-%>\
-${gen_solution(solution_projects, use_dlls='yes')}
\ No newline at end of file
+%YAML 1.2
+--- |
+  <%namespace file="sln_defs.include" import="gen_solution"/>\
+  <%
+  solution_projects = [p for p in vsprojects if p.build not in ['protoc', 'test'] and p.language in ['c', 'c++'] and p.vs_proj_dir == '.' and not (p.build == 'private' and p.language == 'c++')]
+  %>\
+  ${gen_solution(solution_projects, use_dlls='yes')}
diff --git a/templates/vsprojects/grpc/grpc.vcxproj.filters.template b/templates/vsprojects/grpc/grpc.vcxproj.filters.template
deleted file mode 100644
index 9607d23324..0000000000
--- a/templates/vsprojects/grpc/grpc.vcxproj.filters.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
-${gen_filters('grpc', libs)}
diff --git a/templates/vsprojects/grpc/grpc.vcxproj.template b/templates/vsprojects/grpc/grpc.vcxproj.template
deleted file mode 100644
index a19214e0a4..0000000000
--- a/templates/vsprojects/grpc/grpc.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc', libs, packages=['openssl','zlib'])}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc/packages.config.template b/templates/vsprojects/grpc/packages.config.template
deleted file mode 100644
index 66ac90eb08..0000000000
--- a/templates/vsprojects/grpc/packages.config.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../packages.include" import="gen_packages_config"/>\
-${gen_packages_config(['openssl','zlib'])}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.template b/templates/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.template
index 49ab1b7385..980bc589e4 100644
--- a/templates/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.template
+++ b/templates/vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_cpp_plugin', targets, configuration_type='Application')}
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project('grpc_cpp_plugin', targets)}
diff --git a/templates/vsprojects/grpc_csharp_ext.sln.template b/templates/vsprojects/grpc_csharp_ext.sln.template
index eb33ce2eb6..1013d7bd97 100644
--- a/templates/vsprojects/grpc_csharp_ext.sln.template
+++ b/templates/vsprojects/grpc_csharp_ext.sln.template
@@ -1,5 +1,7 @@
-<%namespace file="sln_defs.include" import="gen_solution"/>\
-<%
-solution_projects = [p for p in vsprojects if p.build == 'all' and p.language in ['c', 'csharp']]
-%>\
-${gen_solution(solution_projects, use_dlls='only')}
\ No newline at end of file
+%YAML 1.2
+--- |
+  <%namespace file="sln_defs.include" import="gen_solution"/>\
+  <%
+  solution_projects = [p for p in vsprojects if p.build == 'all' and p.language in ['c', 'csharp']]
+  %>\
+  ${gen_solution(solution_projects, use_dlls='only')}
diff --git a/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template b/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template
deleted file mode 100644
index 25b02b8c82..0000000000
--- a/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_csharp_ext', libs, configuration_type = 'DynamicLibrary', props=['zlib-dll'], packages=['openssl','zlib'])}
diff --git a/templates/vsprojects/grpc_csharp_ext/packages.config.template b/templates/vsprojects/grpc_csharp_ext/packages.config.template
deleted file mode 100644
index 4953b6451c..0000000000
--- a/templates/vsprojects/grpc_csharp_ext/packages.config.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../packages.include" import="gen_packages_config"/>\
-${gen_packages_config(['openssl','zlib'])}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj.template b/templates/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj.template
index 9d94e27c3a..2c677d7f75 100644
--- a/templates/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj.template
+++ b/templates/vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_csharp_plugin', targets, configuration_type='Application')}
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project('grpc_csharp_plugin', targets)}
diff --git a/templates/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj.template b/templates/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj.template
index 794c7310c5..a31f3e383a 100644
--- a/templates/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj.template
+++ b/templates/vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_objective_c_plugin', targets, configuration_type='Application')}
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project('grpc_objective_c_plugin', targets)}
diff --git a/templates/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj.template b/templates/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj.template
deleted file mode 100644
index 409e88f289..0000000000
--- a/templates/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_plugin_support', libs)}
diff --git a/templates/vsprojects/grpc_protoc_plugins.sln.template b/templates/vsprojects/grpc_protoc_plugins.sln.template
index 1c171f4f94..06f182b601 100644
--- a/templates/vsprojects/grpc_protoc_plugins.sln.template
+++ b/templates/vsprojects/grpc_protoc_plugins.sln.template
@@ -1,5 +1,7 @@
-<%namespace file="sln_defs.include" import="gen_solution"/>\
-<%
-solution_projects = [p for p in vsprojects if p.build == 'protoc']
-%>\
-${gen_solution(solution_projects)}
\ No newline at end of file
+%YAML 1.2
+--- |
+  <%namespace file="sln_defs.include" import="gen_solution"/>\
+  <%
+  solution_projects = [p for p in vsprojects if p.build == 'protoc']
+  %>\
+  ${gen_solution(solution_projects)}
diff --git a/templates/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj.template b/templates/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj.template
index 977e015d6d..c2ef396842 100644
--- a/templates/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj.template
+++ b/templates/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_python_plugin', targets, configuration_type='Application')}
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project('grpc_python_plugin', targets)}
diff --git a/templates/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj.template b/templates/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj.template
index ecf42ae04e..e7c094f5f9 100644
--- a/templates/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj.template
+++ b/templates/vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj.template
@@ -1,2 +1,4 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_ruby_plugin', targets, configuration_type='Application')}
+%YAML 1.2
+--- |
+  <%namespace file="../vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project('grpc_ruby_plugin', targets)}
diff --git a/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template b/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template
deleted file mode 100644
index 3781023837..0000000000
--- a/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_test_util', libs)}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj.template b/templates/vsprojects/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj.template
deleted file mode 100644
index 98c5f500f5..0000000000
--- a/templates/vsprojects/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_test_util_unsecure', libs)}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template b/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template
deleted file mode 100644
index aef6465915..0000000000
--- a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\
-${gen_filters('grpc_unsecure', libs)}
diff --git a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template b/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template
deleted file mode 100644
index fd827d191a..0000000000
--- a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc_unsecure', libs, packages=['zlib'])}
\ No newline at end of file
diff --git a/templates/vsprojects/grpc_unsecure/packages.config.template b/templates/vsprojects/grpc_unsecure/packages.config.template
deleted file mode 100644
index 1337b5df2b..0000000000
--- a/templates/vsprojects/grpc_unsecure/packages.config.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<%namespace file="../packages.include" import="gen_packages_config"/>\
-${gen_packages_config(['zlib'])}
\ No newline at end of file
diff --git a/templates/vsprojects/openssl.props.template b/templates/vsprojects/openssl.props.template
new file mode 100644
index 0000000000..32c3604405
--- /dev/null
+++ b/templates/vsprojects/openssl.props.template
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ImportGroup Label="PropertySheets" />

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup />

+  <ItemDefinitionGroup>

+    <Link>

+      <AdditionalDependencies>ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.openssl.${vspackages_dict['grpc.dependencies.openssl'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup />

+</Project>

diff --git a/templates/vsprojects/packages.include b/templates/vsprojects/packages.include
index 2eba362179..f3c57634f9 100644
--- a/templates/vsprojects/packages.include
+++ b/templates/vsprojects/packages.include
@@ -1,54 +1,53 @@
-<%!
-  openssl_pkg_name = "grpc.dependencies.openssl"
-  openssl_pkg_version = "1.0.2.2"
-  zlib_pkg_name = "grpc.dependencies.zlib"
-  zlib_pkg_version = "1.2.8.9"
-%>\
-<%def name="get_openssl()">${openssl_pkg_name}.${openssl_pkg_version}</%def>\
-<%def name="get_zlib()">${zlib_pkg_name}.${zlib_pkg_version}</%def>\
+<%def name="get_name(vspackages, package)">${''.join('%s.%s' % (p.name, p.version) for p in vspackages if p.name == package)}</%def>
 <%def name="gen_packages_config(packages)">\
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  % if 'openssl' in packages:
-  <package id="${openssl_pkg_name}" version="${openssl_pkg_version}" targetFramework="Native" />
-  <package id="${openssl_pkg_name}.redist" version="${openssl_pkg_version}" targetFramework="Native" />
-  % endif
-  % if 'zlib' in packages:
-  <package id="${zlib_pkg_name}" version="${zlib_pkg_version}" targetFramework="Native" />
-  <package id="${zlib_pkg_name}.redist" version="${zlib_pkg_version}" targetFramework="Native" />
-  % endif
+  % for package in vspackages:
+  %  if packages == 'all' or package.name in packages:
+  <package id="${package.name}" version="${package.version}" targetFramework="Native" />
+  %   if package.redist:
+  <package id="${package.name}.redist" version="${package.version}" targetFramework="Native" />
+  %   endif
+  %  endif
+  % endfor
 </packages>
 </%def>\
-<%def name="gen_package_props(packages)">\
-% if 'openssl' in packages:
-  <Import Project="..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props" Condition="Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props')" />
-% endif
+<%def name="gen_package_props(packages, repo_root)">\
+  % for package in vspackages:
+  %  if packages == 'all' or package.name in packages:
+  %   if package.props:
+  <Import Project="${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\${package.name}.props" Condition="Exists('${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\${package.version}.props')" />
+  %   endif
+  %  endif
+  % endfor
 </%def>\
-<%def name="gen_package_targets(packages)">\
-    % if 'zlib' in packages:
-    <Import Project="..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets" Condition="Exists('..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets')" />
-    <Import Project="..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets" Condition="Exists('..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets')" />
-    %endif
-    % if 'openssl' in packages:
-    <Import Project="..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets" Condition="Exists('..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets')" />
-    <Import Project="..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets" Condition="Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets')" />
-    % endif
+<%def name="gen_package_targets(packages, repo_root)">\
+  % for package in vspackages:
+  %  if packages == 'all' or package.name in packages:
+  %   if package.redist:
+  <Import Project="${repo_root}\vsprojects\packages\${package.name}.redist.${package.version}\build\native\${package.name}.redist.targets" Condition="Exists('${repo_root}\vsprojects\packages\${package.name}.redist.${package.version}\build\native\grpc.dependencies\${package.name}.targets')" />
+  %   endif
+  <Import Project="${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\${package.name}.targets" Condition="Exists('${repo_root}\vsprojects\packages\${package.name}.${package.version}\build\native\grpc.dependencies\${package.name}.targets')" />
+  %  endif
+  % endfor
 </%def>\
-<%def name="gen_package_ensure(packages)">\
-  % if packages:
+<%def name="check_file_inner(file)"><Error Condition="!Exists('${file}')" Text="$([System.String]::Format('$(ErrorText)', '${file}')" /></%def>\
+<%def name="check_file(file, repo_root, package)">${check_file_inner(file % {'root':repo_root, 'name':package.name, 'version':package.version})}</%def>\
+<%def name="gen_package_ensure(packages, repo_root)">\
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    % if 'zlib' in packages:
-    <Error Condition="!Exists('..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${zlib_pkg_name}.redist.${zlib_pkg_version}\build\native\${zlib_pkg_name}.redist.targets'))" />
-    <Error Condition="!Exists('..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${zlib_pkg_name}.${zlib_pkg_version}\build\native\${zlib_pkg_name}.targets'))" />
-    %endif
-    % if 'openssl' in packages:
-    <Error Condition="!Exists('..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${openssl_pkg_name}.redist.${openssl_pkg_version}\build\native\${openssl_pkg_name}.redist.targets'))" />
-    <Error Condition="!Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.props'))" />
-    <Error Condition="!Exists('..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\${openssl_pkg_name}.${openssl_pkg_version}\build\native\${openssl_pkg_name}.targets'))" />
-    %endif
+    % for package in vspackages:
+    %  if packages == 'all' or package.name in packages:
+    %   if package.redist:
+    ${check_file('%(root)s\\vsprojects\\packages\\%(name)s.redist.%(version)s\\build\\native\\%(name)s.redist.targets', repo_root, package)}
+    %   endif
+    %   if package.props:
+    ${check_file('%(root)s\\vsprojects\\packages\\%(name)s.%(version)s\\build\\native\\%(name)s.props', repo_root, package)}
+    %   endif
+    ${check_file('%(root)s\\vsprojects\\packages\\%(name)s.%(version)s\\build\\native\\%(name)s.targets', repo_root, package)}
+    %  endif
+    % endfor
   </Target>
-  %endif
 </%def>\
diff --git a/templates/vsprojects/protobuf.props.template b/templates/vsprojects/protobuf.props.template
new file mode 100644
index 0000000000..48f9431c1c
--- /dev/null
+++ b/templates/vsprojects/protobuf.props.template
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ImportGroup Label="PropertySheets" />

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup />

+  <ItemDefinitionGroup>

+    <Link>

+      <AdditionalDependencies>libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup />

+</Project>

diff --git a/templates/vsprojects/protoc.props.template b/templates/vsprojects/protoc.props.template
new file mode 100644
index 0000000000..a869005dae
--- /dev/null
+++ b/templates/vsprojects/protoc.props.template
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ImportGroup Label="PropertySheets" />

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup />

+  <ItemDefinitionGroup>

+    <Link>

+      <AdditionalDependencies>libprotoc.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup />

+</Project>

diff --git a/templates/vsprojects/sln_defs.include b/templates/vsprojects/sln_defs.include
index 224f2cd1d5..a0489411c6 100644
--- a/templates/vsprojects/sln_defs.include
+++ b/templates/vsprojects/sln_defs.include
@@ -14,7 +14,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 cpp_proj_type = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
 %>\
 % for project in solution_projects:
-Project("${cpp_proj_type}") = "${project.name}", "${project.name}\${project.name}.vcxproj", "${project.vs_project_guid}"
+Project("${cpp_proj_type}") = "${project.name}", "vcxproj\${project.vs_proj_dir}\${project.name}\${project.name}.vcxproj", "${project.vs_project_guid}"
 	ProjectSection(myProperties) = preProject
   % if project.is_library:
         	lib = "True"
@@ -53,7 +53,7 @@ Global
 		${project.vs_project_guid}.Debug|x64.ActiveCfg = Debug|x64
 		${project.vs_project_guid}.Release|Win32.ActiveCfg = Release|Win32
 		${project.vs_project_guid}.Release|x64.ActiveCfg = Release|x64
-    % if project.get('dll', 'no') != 'only':
+    % if project.get('dll', False) != 'only':
 		${project.vs_project_guid}.Debug|Win32.Build.0 = Debug|Win32
 		${project.vs_project_guid}.Debug|x64.Build.0 = Debug|x64
 		${project.vs_project_guid}.Release|Win32.Build.0 = Release|Win32
@@ -61,7 +61,7 @@ Global
     % endif
   % endif
   % if use_dlls == 'yes':
-    % if project.get('dll', 'no') == 'no':
+    % if project.get('dll', False) == False:
 		${project.vs_project_guid}.Debug-DLL|Win32.ActiveCfg = Debug|Win32
 		${project.vs_project_guid}.Debug-DLL|Win32.Build.0 = Debug|Win32
 		${project.vs_project_guid}.Debug-DLL|x64.ActiveCfg = Debug|x64
@@ -82,7 +82,7 @@ Global
     % endif
   % endif
   % if use_dlls == 'only':
-    % if project.get('dll', 'no') == 'yes':
+    % if project.get('dll', False) == True:
 		${project.vs_project_guid}.Debug|Win32.ActiveCfg = Debug-DLL|Win32
 		${project.vs_project_guid}.Debug|Win32.Build.0 = Debug-DLL|Win32
 		${project.vs_project_guid}.Debug|x64.ActiveCfg = Debug-DLL|x64
diff --git a/templates/vsprojects/vcxproj.filters_defs.include b/templates/vsprojects/vcxproj.filters_defs.include
index 787d66eeff..d1ebb56709 100644
--- a/templates/vsprojects/vcxproj.filters_defs.include
+++ b/templates/vsprojects/vcxproj.filters_defs.include
@@ -5,7 +5,7 @@
   def calc_to_filter(path):
     return '\\'.join(path.split('/')[:-1])
 %>\
-<%def name="get_repo_root()">..\..</%def>\
+<%def name="get_repo_root(proj)">${'..\..\..' + ('\..' if proj.vs_proj_dir != '.' else '')}</%def>\
 <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
 <%def name="to_filter(path)">${calc_to_filter(path)}</%def>\
 <%def name="filter_to_guid(proj, filter)">${re.sub('(........)(....)(....)(....)', r'\1-\2-\3-\4-', hashlib.md5(''.join([filter, proj])).hexdigest())}</%def>\
@@ -17,7 +17,7 @@
   % if project.get('src',[]):
   <ItemGroup>
     % for src_name in project.src:
-    <ClCompile Include="${get_repo_root()}\${to_windows_path(src_name)}">
+    <ClCompile Include="${get_repo_root(project)}\${to_windows_path(src_name)}">
       <Filter>${to_filter(src_name)}</Filter>
     </ClCompile>
     % endfor
@@ -26,7 +26,7 @@
   % if project.get('public_headers',[]):
   <ItemGroup>
     % for public_header in project.public_headers:
-    <ClInclude Include="${get_repo_root()}\${to_windows_path(public_header)}">
+    <ClInclude Include="${get_repo_root(project)}\${to_windows_path(public_header)}">
       <Filter>${to_filter(public_header)}</Filter>
     </ClInclude>
     % endfor
@@ -35,7 +35,7 @@
   % if project.get('headers',[]):
   <ItemGroup>
     % for header in project.headers:
-    <ClInclude Include="${get_repo_root()}\${to_windows_path(header)}">
+    <ClInclude Include="${get_repo_root(project)}\${to_windows_path(header)}">
       <Filter>${to_filter(header)}</Filter>
     </ClInclude>
     % endfor
diff --git a/templates/vsprojects/vcxproj.template b/templates/vsprojects/vcxproj.template
new file mode 100644
index 0000000000..ecf113b4a8
--- /dev/null
+++ b/templates/vsprojects/vcxproj.template
@@ -0,0 +1,18 @@
+%YAML 1.2
+---
+foreach: vsprojects
+output_name: ${selected.vs_proj_dir}/${selected.name}/${selected.name}.vcxproj
+template: |
+  <%namespace file="vcxproj_defs.include" import="gen_project"/>\
+  ${gen_project(selected.name, vsprojects)}
+---
+foreach: vsprojects
+output_name: ${selected.vs_proj_dir}/${selected.name}/${selected.name}.vcxproj.filters
+template: |
+  <%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\
+  ${gen_filters(selected.name, vsprojects)}
+---
+output_name: grpc/packages.config
+template: |
+  <%namespace file="packages.include" import="gen_packages_config"/>\
+  ${gen_packages_config('all')}
diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include
index b1ed89897f..7057d11143 100644
--- a/templates/vsprojects/vcxproj_defs.include
+++ b/templates/vsprojects/vcxproj_defs.include
@@ -1,8 +1,7 @@
 <%namespace file="packages.include" import="gen_package_props,gen_package_targets,gen_package_ensure"/>\
-<%def name="get_repo_root()">..\..</%def>\
 <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
 <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}</%def>\
-<%def name="gen_project(name, collection, configuration_type = None, project_guid = None, props = [], packages = [])">\
+<%def name="gen_project(name, collection)">\
 <%
   target = None
   for p in vsprojects:
@@ -11,14 +10,9 @@
   for t in collection:
     if t.name == name:
       target = t
-  if not configuration_type and target:
-    print target.name
-    if target.build == 'test' or target.build == 'tool':
-      configuration_type = 'Application'
-  if not configuration_type:
-    configuration_type = 'StaticLibrary'
-  if not project_guid:
-    project_guid = project.vs_project_guid
+  props = project.vs_props
+  configuration_type = project.vs_config_type
+  project_guid = project.vs_project_guid
   if target.build == 'test' and target.language == 'c++':
     props.extend(['cpptest'])
   if configuration_type == 'Application':
@@ -29,13 +23,16 @@
   else:
     props.extend(['winsock'])
   props.extend(['global'])
-  dll = project.get('dll', 'no')
+  props = sorted(list(set(props)))
+  dll = project.get('dll', False)
+  packages = project.vs_packages
+  repo_root = '..\..\..' + ('\..' if project.vs_proj_dir != '.' else '')
 %>\
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-${gen_package_props(packages)}\
+${gen_package_props(packages, repo_root)}\
   <ItemGroup Label="ProjectConfigurations">
-% if dll == 'yes':
+% if dll and dll != 'only':
     <ProjectConfiguration Include="Debug-DLL|Win32">
       <Configuration>Debug-DLL</Configuration>
       <Platform>Win32</Platform>
@@ -94,7 +91,7 @@ ${gen_package_props(packages)}\
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-% if dll == 'yes':
+% if dll and dll != 'only':
   <PropertyGroup Condition="'$(Configuration)'=='Debug-DLL'" Label="Configuration">
     <ConfigurationType>${configuration_type}</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -113,31 +110,24 @@ ${gen_package_props(packages)}\
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     % for prop in props:
-    <Import Project="..\${prop}.props" />
+    <Import Project="${repo_root}\vsprojects\${prop}.props" />
     % endfor
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+% for config in ['Debug', 'Release']:# + (['Debug-DLL', 'Release-DLL'] if dll and dll != 'only' else []):
+  <PropertyGroup Condition="'$(Configuration)'=='${config}'">
     <TargetName>${name}</TargetName>
-    % if "zlib" in packages:
-    <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
-    <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
-    % endif
-    % if "openssl" in packages:
-    <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
-    % endif
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>${name}</TargetName>
-    % if "zlib" in packages:
-    <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
-    <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
-    % endif
-    % if "openssl" in packages:
-    <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
-    % endif
+    % for package in vspackages:
+    %  if packages == 'all' or package.name in packages:
+    %   if package.get('linkage', None) is not None:
+    <Linkage-${package.name.replace('.', '_')}>${package.linkage}</Linkage-${package.name.replace('.', '_')}>
+    %   endif
+    <Configuration-${package.name.replace('.', '_')}>Debug</Configuration-${package.name.replace('.', '_')}>
+    %  endif
+    % endfor
   </PropertyGroup>
-  % if dll == 'yes':
+% endfor
+  % if dll and dll != 'only':
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -270,14 +260,14 @@ ${gen_package_props(packages)}\
   % if project.get('public_headers',[]):
   <ItemGroup>
     % for public_header in project.public_headers:
-    <ClInclude Include="${get_repo_root()}\${to_windows_path(public_header)}" />
+    <ClInclude Include="${repo_root}\${to_windows_path(public_header)}" />
     % endfor
   </ItemGroup>
   % endif
   % if project.get('headers',[]):
   <ItemGroup>
     % for header in project.headers:
-    <ClInclude Include="${get_repo_root()}\${to_windows_path(header)}" />
+    <ClInclude Include="${repo_root}\${to_windows_path(header)}" />
     % endfor
   </ItemGroup>
   % endif
@@ -286,30 +276,30 @@ ${gen_package_props(packages)}\
     % for src_name in project.src:
       % if src_name.endswith(".proto"):
 <% src_name_parts = src_name.split(".") %>\
-    <ClCompile Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".pb.cc")}">
+    <ClCompile Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".pb.cc")}">
     </ClCompile>
-    <ClInclude Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".pb.h")}">
+    <ClInclude Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".pb.h")}">
     </ClInclude>
-    <ClCompile Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".grpc.pb.cc")}">
+    <ClCompile Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".grpc.pb.cc")}">
     </ClCompile>
-    <ClInclude Include="${get_repo_root()}\${to_windows_path(src_name_parts[0] + ".grpc.pb.h")}">
+    <ClInclude Include="${repo_root}\${to_windows_path(src_name_parts[0] + ".grpc.pb.h")}">
     </ClInclude>
       % else:
-    <ClCompile Include="${get_repo_root()}\${to_windows_path(src_name)}">
+    <ClCompile Include="${repo_root}\${to_windows_path(src_name)}">
     </ClCompile>
       % endif
     % endfor
   </ItemGroup>
   % elif configuration_type != 'StaticLibrary':
   <ItemGroup>
-    <ClCompile Include="${get_repo_root()}\${to_windows_path('vsprojects/dummy.c')}">
+    <ClCompile Include="${repo_root}\${to_windows_path('vsprojects/dummy.c')}">
     </ClCompile>
   </ItemGroup>
   % endif
   % if project.get('deps',[]):
   <ItemGroup>
     % for dep in project.deps:
-    <ProjectReference Include="..\${dep}\${dep}.vcxproj">
+    <ProjectReference Include="${repo_root}\vsprojects\vcxproj\${vsproject_dict[dep].vs_proj_dir}\${dep}\${dep}.vcxproj">
       <Project>${vsproject_dict[dep].vs_project_guid}</Project>
     </ProjectReference>
     % endfor
@@ -322,8 +312,8 @@ ${gen_package_props(packages)}\
   %endif
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-${gen_package_targets(packages)}\
+${gen_package_targets(packages, repo_root)}\
   </ImportGroup>
-${gen_package_ensure(packages)}\
+${gen_package_ensure(packages, repo_root)}\
 </Project>
 </%def>\
diff --git a/templates/vsprojects/winsock.props.template b/templates/vsprojects/winsock.props.template
new file mode 100644
index 0000000000..7db6731bd3
--- /dev/null
+++ b/templates/vsprojects/winsock.props.template
@@ -0,0 +1,14 @@
+%YAML 1.2
+--- |
+  <?xml version="1.0" encoding="utf-8"?>
+  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ImportGroup Label="PropertySheets" />
+    <PropertyGroup Label="UserMacros" />
+    <PropertyGroup />
+    <ItemDefinitionGroup>
+      <Link>
+        <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      </Link>
+    </ItemDefinitionGroup>
+    <ItemGroup />
+  </Project>
\ No newline at end of file
diff --git a/templates/vsprojects/zlib-dll.props.template b/templates/vsprojects/zlib-dll.props.template
new file mode 100644
index 0000000000..eb83ca7c0a
--- /dev/null
+++ b/templates/vsprojects/zlib-dll.props.template
@@ -0,0 +1,15 @@
+%YAML 1.2
+--- |
+  <?xml version="1.0" encoding="utf-8"?>
+  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ImportGroup Label="PropertySheets" />
+    <PropertyGroup Label="UserMacros" />
+    <PropertyGroup />
+    <ItemDefinitionGroup>
+      <Link>
+        <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+        <AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.zlib.${vspackages_dict['grpc.dependencies.zlib'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\dynamic\cdecl;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      </Link>
+    </ItemDefinitionGroup>
+    <ItemGroup />
+  </Project>
diff --git a/templates/vsprojects/zlib.props.template b/templates/vsprojects/zlib.props.template
new file mode 100644
index 0000000000..d14a3942b7
--- /dev/null
+++ b/templates/vsprojects/zlib.props.template
@@ -0,0 +1,15 @@
+%YAML 1.2
+--- |
+  <?xml version="1.0" encoding="utf-8"?>
+  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ImportGroup Label="PropertySheets" />
+    <PropertyGroup Label="UserMacros" />
+    <PropertyGroup />
+    <ItemDefinitionGroup>
+      <Link>
+        <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+        <AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.zlib.${vspackages_dict['grpc.dependencies.zlib'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static\cdecl;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      </Link>
+    </ItemDefinitionGroup>
+    <ItemGroup />
+  </Project>
diff --git a/test/core/bad_client/gen_build_json.py b/test/core/bad_client/gen_build_yaml.py
index 33bf65ac04..02dda10be0 100755
--- a/test/core/bad_client/gen_build_json.py
+++ b/test/core/bad_client/gen_build_yaml.py
@@ -32,8 +32,8 @@
 """Generates the appropriate build.json data for all the end2end tests."""
 
 
-import simplejson
 import collections
+import yaml
 
 TestOptions = collections.namedtuple('TestOptions', 'flaky')
 default_test_options = TestOptions(False)
@@ -58,6 +58,7 @@ def main():
             'headers': [
               'test/core/bad_client/bad_client.h'
             ],
+            'vs_proj_dir': 'test',
             'deps': [
               'grpc_test_util_unsecure',
               'grpc_unsecure',
@@ -72,7 +73,7 @@ def main():
               'language': 'c',
               'secure': 'no',
               'src': ['test/core/bad_client/tests/%s.c' % t],
-              'flaky': 'invoke_large_request' in t,
+              'vs_proj_dir': 'test',
               'deps': [
                   'bad_client_test',
                   'grpc_test_util_unsecure',
@@ -82,7 +83,7 @@ def main():
               ]
           }
       for t in sorted(BAD_CLIENT_TESTS.keys())]}
-  print simplejson.dumps(json, sort_keys=True, indent=2 * ' ')
+  print yaml.dump(json)
 
 
 if __name__ == '__main__':
diff --git a/test/core/end2end/fixtures/chttp2_fullstack_compression.c b/test/core/end2end/fixtures/h2_compress.c
index 6e7a1faf55..6e7a1faf55 100644
--- a/test/core/end2end/fixtures/chttp2_fullstack_compression.c
+++ b/test/core/end2end/fixtures/h2_compress.c
diff --git a/test/core/end2end/fixtures/chttp2_fake_security.c b/test/core/end2end/fixtures/h2_fakesec.c
index 3e64cc08e8..3e64cc08e8 100644
--- a/test/core/end2end/fixtures/chttp2_fake_security.c
+++ b/test/core/end2end/fixtures/h2_fakesec.c
diff --git a/test/core/end2end/fixtures/chttp2_fullstack_with_poll.c b/test/core/end2end/fixtures/h2_full+poll.c
index 48feefc931..48feefc931 100644
--- a/test/core/end2end/fixtures/chttp2_fullstack_with_poll.c
+++ b/test/core/end2end/fixtures/h2_full+poll.c
diff --git a/test/core/end2end/fixtures/chttp2_fullstack.c b/test/core/end2end/fixtures/h2_full.c
index 0170dcf0e5..0170dcf0e5 100644
--- a/test/core/end2end/fixtures/chttp2_fullstack.c
+++ b/test/core/end2end/fixtures/h2_full.c
diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c b/test/core/end2end/fixtures/h2_oauth2.c
index e61e276fff..e61e276fff 100644
--- a/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c
+++ b/test/core/end2end/fixtures/h2_oauth2.c
diff --git a/test/core/end2end/fixtures/chttp2_fullstack_with_proxy.c b/test/core/end2end/fixtures/h2_proxy.c
index 44083e2676..44083e2676 100644
--- a/test/core/end2end/fixtures/chttp2_fullstack_with_proxy.c
+++ b/test/core/end2end/fixtures/h2_proxy.c
diff --git a/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index 588c4b23e1..588c4b23e1 100644
--- a/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
diff --git a/test/core/end2end/fixtures/chttp2_socket_pair.c b/test/core/end2end/fixtures/h2_sockpair.c
index 16a04fbebf..16a04fbebf 100644
--- a/test/core/end2end/fixtures/chttp2_socket_pair.c
+++ b/test/core/end2end/fixtures/h2_sockpair.c
diff --git a/test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c
index 94fc36f5ec..94fc36f5ec 100644
--- a/test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.c
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c
diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c b/test/core/end2end/fixtures/h2_ssl+poll.c
index 2c605d1471..2c605d1471 100644
--- a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c
+++ b/test/core/end2end/fixtures/h2_ssl+poll.c
diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c b/test/core/end2end/fixtures/h2_ssl.c
index 9193a09b17..9193a09b17 100644
--- a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c
+++ b/test/core/end2end/fixtures/h2_ssl.c
diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_proxy.c b/test/core/end2end/fixtures/h2_ssl_proxy.c
index 8133a69a0c..8133a69a0c 100644
--- a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_proxy.c
+++ b/test/core/end2end/fixtures/h2_ssl_proxy.c
diff --git a/test/core/end2end/fixtures/chttp2_fullstack_uds_posix_with_poll.c b/test/core/end2end/fixtures/h2_uds+poll.c
index 05b9ea0949..05b9ea0949 100644
--- a/test/core/end2end/fixtures/chttp2_fullstack_uds_posix_with_poll.c
+++ b/test/core/end2end/fixtures/h2_uds+poll.c
diff --git a/test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c b/test/core/end2end/fixtures/h2_uds.c
index 59d39bbb0f..59d39bbb0f 100644
--- a/test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c
+++ b/test/core/end2end/fixtures/h2_uds.c
diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_yaml.py
index 6f10b78dad..3fe2909493 100755
--- a/test/core/end2end/gen_build_json.py
+++ b/test/core/end2end/gen_build_yaml.py
@@ -32,8 +32,9 @@
 """Generates the appropriate build.json data for all the end2end tests."""
 
 
-import simplejson
+import yaml
 import collections
+import hashlib
 
 
 FixtureOptions = collections.namedtuple('FixtureOptions', 'fullstack includes_proxy dns_resolver secure platforms ci_mac')
@@ -42,22 +43,23 @@ socketpair_unsecure_fixture_options = default_unsecure_fixture_options._replace(
 default_secure_fixture_options = default_unsecure_fixture_options._replace(secure=True)
 uds_fixture_options = default_unsecure_fixture_options._replace(dns_resolver=False, platforms=['linux', 'mac', 'posix'])
 
+
 # maps fixture name to whether it requires the security library
 END2END_FIXTURES = {
-    'chttp2_fake_security': default_secure_fixture_options._replace(ci_mac=False),
-    'chttp2_fullstack': default_unsecure_fixture_options,
-    'chttp2_fullstack_compression': default_unsecure_fixture_options,
-    'chttp2_fullstack_uds_posix': uds_fixture_options,
-    'chttp2_fullstack_uds_posix_with_poll': uds_fixture_options._replace(platforms=['linux']),
-    'chttp2_fullstack_with_poll': default_unsecure_fixture_options._replace(platforms=['linux']),
-    'chttp2_fullstack_with_proxy': default_unsecure_fixture_options._replace(includes_proxy=True, ci_mac=False),
-    'chttp2_simple_ssl_fullstack': default_secure_fixture_options,
-    'chttp2_simple_ssl_fullstack_with_poll': default_secure_fixture_options._replace(platforms=['linux']),
-    'chttp2_simple_ssl_fullstack_with_proxy': default_secure_fixture_options._replace(includes_proxy=True, ci_mac=False),
-    'chttp2_simple_ssl_with_oauth2_fullstack': default_secure_fixture_options._replace(ci_mac=False),
-    'chttp2_socket_pair': socketpair_unsecure_fixture_options._replace(ci_mac=False),
-    'chttp2_socket_pair_one_byte_at_a_time': socketpair_unsecure_fixture_options._replace(ci_mac=False),
-    'chttp2_socket_pair_with_grpc_trace': socketpair_unsecure_fixture_options,
+    'h2_fakesec': default_secure_fixture_options._replace(ci_mac=False),
+    'h2_full': default_unsecure_fixture_options,
+    'h2_compress': default_unsecure_fixture_options,
+    'h2_uds': uds_fixture_options,
+    'h2_uds+poll': uds_fixture_options._replace(platforms=['linux']),
+    'h2_full+poll': default_unsecure_fixture_options._replace(platforms=['linux']),
+    'h2_proxy': default_unsecure_fixture_options._replace(includes_proxy=True, ci_mac=False),
+    'h2_ssl': default_secure_fixture_options,
+    'h2_ssl+poll': default_secure_fixture_options._replace(platforms=['linux']),
+    'h2_ssl_proxy': default_secure_fixture_options._replace(includes_proxy=True, ci_mac=False),
+    'h2_oauth2': default_secure_fixture_options._replace(ci_mac=False),
+    'h2_sockpair': socketpair_unsecure_fixture_options._replace(ci_mac=False),
+    'h2_sockpair_1byte': socketpair_unsecure_fixture_options._replace(ci_mac=False),
+    'h2_sockpair+trace': socketpair_unsecure_fixture_options,
 }
 
 TestOptions = collections.namedtuple('TestOptions', 'needs_fullstack needs_dns proxyable flaky secure')
@@ -67,7 +69,7 @@ connectivity_test_options = default_test_options._replace(needs_fullstack=True)
 # maps test names to options
 END2END_TESTS = {
     'bad_hostname': default_test_options,
-    'cancel_after_accept_and_writes_closed': default_test_options,
+    'cancel_after_client_done': default_test_options,
     'cancel_after_accept': default_test_options,
     'cancel_after_invoke': default_test_options,
     'cancel_before_invoke': default_test_options,
@@ -76,8 +78,8 @@ END2END_TESTS = {
     'channel_connectivity': connectivity_test_options._replace(proxyable=False),
     'default_host': default_test_options._replace(needs_fullstack=True, needs_dns=True),
     'disappearing_server': connectivity_test_options,
-    'early_server_shutdown_finishes_inflight_calls': default_test_options,
-    'early_server_shutdown_finishes_tags': default_test_options,
+    'shutdown_finishes_calls': default_test_options,
+    'shutdown_finishes_tags': default_test_options,
     'empty_batch': default_test_options,
     'graceful_server_shutdown': default_test_options,
     'invoke_large_request': default_test_options,
@@ -86,19 +88,19 @@ END2END_TESTS = {
     'no_op': default_test_options,
     'ping_pong_streaming': default_test_options,
     'registered_call': default_test_options,
-    'request_response_with_binary_metadata_and_payload': default_test_options,
-    'request_response_with_metadata_and_payload': default_test_options,
-    'request_response_with_payload_and_call_creds': default_test_options._replace(secure=True),
-    'request_response_with_payload': default_test_options,
-    'request_response_with_trailing_metadata_and_payload': default_test_options,
-    'request_with_compressed_payload': default_test_options._replace(proxyable=False),
+    'binary_metadata': default_test_options,
+    'metadata': default_test_options,
+    'call_creds': default_test_options._replace(secure=True),
+    'payload': default_test_options,
+    'trailing_metadata': default_test_options,
+    'compressed_payload': default_test_options._replace(proxyable=False),
     'request_with_flags': default_test_options._replace(proxyable=False),
-    'request_with_large_metadata': default_test_options,
+    'large_metadata': default_test_options,
     'request_with_payload': default_test_options,
     'server_finishes_request': default_test_options,
     'simple_delayed_request': connectivity_test_options,
     'simple_request': default_test_options,
-    'simple_request_with_high_initial_sequence_number': default_test_options,
+    'high_initial_seqno': default_test_options,
 }
 
 
@@ -147,6 +149,7 @@ def main():
               'platforms': [ 'linux', 'mac', 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms,
               'deps': sec_deps if END2END_FIXTURES[f].secure else unsec_deps,
               'headers': ['test/core/end2end/end2end_tests.h'],
+              'vs_proj_dir': 'test',
           }
           for f in sorted(END2END_FIXTURES.keys())] + [
           {
@@ -157,7 +160,8 @@ def main():
               'src': ['test/core/end2end/tests/%s.c' % t],
               'headers': ['test/core/end2end/tests/cancel_test_helpers.h',
                           'test/core/end2end/end2end_tests.h'],
-              'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps
+              'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps,
+              'vs_proj_dir': 'test',
           }
           for t in sorted(END2END_TESTS.keys())] + [
           {
@@ -168,7 +172,8 @@ def main():
                   "test/core/end2end/data/test_root_cert.c",
                   "test/core/end2end/data/server1_cert.c",
                   "test/core/end2end/data/server1_key.c"
-              ]
+              ],
+              'vs_proj_dir': 'test',
           }
           ],
       'targets': [
@@ -184,13 +189,14 @@ def main():
                                else without(END2END_FIXTURES[f].platforms, 'mac')),
               'deps': [
                   'end2end_fixture_%s' % f,
-                  'end2end_test_%s' % t] + sec_deps
+                  'end2end_test_%s' % t] + sec_deps,
+              'vs_proj_dir': 'test',
           }
       for f in sorted(END2END_FIXTURES.keys())
       for t in sorted(END2END_TESTS.keys())
       if compatible(f, t)] + [
           {
-              'name': '%s_%s_unsecure_test' % (f, t),
+              'name': '%s_%s_nosec_test' % (f, t),
               'build': 'test',
               'language': 'c',
               'secure': 'no',
@@ -202,11 +208,12 @@ def main():
                                else without(END2END_FIXTURES[f].platforms, 'mac')),
               'deps': [
                   'end2end_fixture_%s' % f,
-                  'end2end_test_%s' % t] + unsec_deps
+                  'end2end_test_%s' % t] + unsec_deps,
+              'vs_proj_dir': 'test',
           }
       for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure
       for t in sorted(END2END_TESTS.keys()) if compatible(f, t) and not END2END_TESTS[t].secure]}
-  print simplejson.dumps(json, sort_keys=True, indent=2 * ' ')
+  print yaml.dump(json)
 
 
 if __name__ == '__main__':
diff --git a/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c b/test/core/end2end/tests/binary_metadata.c
index 2345f94044..2345f94044 100644
--- a/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
+++ b/test/core/end2end/tests/binary_metadata.c
diff --git a/test/core/end2end/tests/request_response_with_payload_and_call_creds.c b/test/core/end2end/tests/call_creds.c
index 75c5bba5bd..75c5bba5bd 100644
--- a/test/core/end2end/tests/request_response_with_payload_and_call_creds.c
+++ b/test/core/end2end/tests/call_creds.c
diff --git a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c b/test/core/end2end/tests/cancel_after_client_done.c
index 2430a6d218..2430a6d218 100644
--- a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
+++ b/test/core/end2end/tests/cancel_after_client_done.c
diff --git a/test/core/end2end/tests/request_with_compressed_payload.c b/test/core/end2end/tests/compressed_payload.c
index 299943c548..299943c548 100644
--- a/test/core/end2end/tests/request_with_compressed_payload.c
+++ b/test/core/end2end/tests/compressed_payload.c
diff --git a/test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c b/test/core/end2end/tests/high_initial_seqno.c
index 0067bb4bef..0067bb4bef 100644
--- a/test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c
+++ b/test/core/end2end/tests/high_initial_seqno.c
diff --git a/test/core/end2end/tests/request_with_large_metadata.c b/test/core/end2end/tests/large_metadata.c
index 98e47aaf98..98e47aaf98 100644
--- a/test/core/end2end/tests/request_with_large_metadata.c
+++ b/test/core/end2end/tests/large_metadata.c
diff --git a/test/core/end2end/tests/request_response_with_metadata_and_payload.c b/test/core/end2end/tests/metadata.c
index a4cc27896c..a4cc27896c 100644
--- a/test/core/end2end/tests/request_response_with_metadata_and_payload.c
+++ b/test/core/end2end/tests/metadata.c
diff --git a/test/core/end2end/tests/request_response_with_payload.c b/test/core/end2end/tests/payload.c
index ff00ae6d9d..ff00ae6d9d 100644
--- a/test/core/end2end/tests/request_response_with_payload.c
+++ b/test/core/end2end/tests/payload.c
diff --git a/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c b/test/core/end2end/tests/shutdown_finishes_calls.c
index 233bc9bee2..233bc9bee2 100644
--- a/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
+++ b/test/core/end2end/tests/shutdown_finishes_calls.c
diff --git a/test/core/end2end/tests/early_server_shutdown_finishes_tags.c b/test/core/end2end/tests/shutdown_finishes_tags.c
index 9b678a1754..9b678a1754 100644
--- a/test/core/end2end/tests/early_server_shutdown_finishes_tags.c
+++ b/test/core/end2end/tests/shutdown_finishes_tags.c
diff --git a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c b/test/core/end2end/tests/trailing_metadata.c
index 8b764751f6..8b764751f6 100644
--- a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
+++ b/test/core/end2end/tests/trailing_metadata.c
diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c
index a06cb50b3a..61535cc5c0 100644
--- a/test/core/util/reconnect_server.c
+++ b/test/core/util/reconnect_server.c
@@ -33,7 +33,6 @@
 
 #include "test/core/util/reconnect_server.h"
 
-#include <arpa/inet.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/host_port.h>
@@ -42,6 +41,7 @@
 #include <grpc/support/time.h>
 #include <string.h>
 #include "src/core/iomgr/endpoint.h"
+#include "src/core/iomgr/sockaddr.h"
 #include "src/core/iomgr/tcp_server.h"
 #include "test/core/util/port.h"
 
@@ -116,7 +116,7 @@ void reconnect_server_start(reconnect_server *server, int port) {
 
   addr.sin_family = AF_INET;
   addr.sin_port = htons(port);
-  inet_pton(AF_INET, "0.0.0.0", &addr.sin_addr);
+  memset(&addr.sin_addr, 0, sizeof(addr.sin_addr));
 
   server->tcp_server = grpc_tcp_server_create();
   port_added =
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc
index 123dca6600..beef604856 100644
--- a/test/cpp/qps/client_sync.cc
+++ b/test/cpp/qps/client_sync.cc
@@ -31,8 +31,6 @@
  *
  */
 
-#include <sys/signal.h>
-
 #include <cassert>
 #include <chrono>
 #include <memory>
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc
index 0e771d6b81..a63548b32d 100644
--- a/test/cpp/qps/driver.cc
+++ b/test/cpp/qps/driver.cc
@@ -31,7 +31,6 @@
  *
  */
 
-#include <unistd.h>
 #include <list>
 #include <thread>
 #include <deque>
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index 4160392cbe..c25d5afc6d 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -35,9 +35,6 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/signal.h>
 #include <thread>
 
 #include <gflags/gflags.h>
diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc
index 01ae3480f9..d930ba2464 100644
--- a/test/cpp/qps/server_sync.cc
+++ b/test/cpp/qps/server_sync.cc
@@ -31,8 +31,6 @@
  *
  */
 
-#include <sys/signal.h>
-#include <unistd.h>
 #include <thread>
 
 #include <gflags/gflags.h>
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index fba103723c..939143c4cb 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -28,16 +28,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# produces cleaner build.json files
+# produces cleaner build.yaml files
 
 import collections
-import json
 import os
 import sys
+import yaml
 
 TEST = (os.environ.get('TEST', 'false') == 'true')
 
-_TOP_LEVEL_KEYS = ['settings', 'filegroups', 'libs', 'targets']
+_TOP_LEVEL_KEYS = ['settings', 'filegroups', 'libs', 'targets', 'vspackages']
 _VERSION_KEYS = ['major', 'minor', 'micro', 'build']
 _ELEM_KEYS = [
     'name',
@@ -50,6 +50,11 @@ _ELEM_KEYS = [
     'src',
     'deps']
 
+def repr_ordered_dict(dumper, odict):
+  return dumper.represent_mapping(u'tag:yaml.org,2002:map', odict.items())
+
+yaml.add_representer(collections.OrderedDict, repr_ordered_dict)
+
 def rebuild_as_ordered_dict(indict, special_keys):
   outdict = collections.OrderedDict()
   for key in sorted(indict.keys()):
@@ -75,7 +80,7 @@ def clean_elem(indict):
 
 for filename in sys.argv[1:]:
   with open(filename) as f:
-    js = json.load(f)
+    js = yaml.load(f)
   js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS)
   js['settings']['version'] = rebuild_as_ordered_dict(
       js['settings']['version'], _VERSION_KEYS)
@@ -83,7 +88,7 @@ for filename in sys.argv[1:]:
     if grp not in js: continue
     js[grp] = sorted([clean_elem(x) for x in js[grp]],
                      key=lambda x: (x.get('language', '_'), x['name']))
-  output = json.dumps(js, indent = 2)
+  output = yaml.dump(js, indent=2, width=80)
   # massage out trailing whitespace
   lines = []
   for line in output.splitlines():
diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh
index 44fc2558fa..b5df150ed1 100644
--- a/tools/buildgen/generate_build_additions.sh
+++ b/tools/buildgen/generate_build_additions.sh
@@ -28,11 +28,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-gen_build_json_dirs="test/core/end2end test/core/bad_client"
+gen_build_yaml_dirs="test/core/end2end test/core/bad_client"
 gen_build_files=""
-for gen_build_json in $gen_build_json_dirs
+for gen_build_yaml in $gen_build_yaml_dirs
 do
   output_file=`mktemp /tmp/genXXXXXX`
-  $gen_build_json/gen_build_json.py > $output_file
+  $gen_build_yaml/gen_build_yaml.py > $output_file
   gen_build_files="$gen_build_files $output_file"
 done
diff --git a/tools/buildgen/generate_projects-old.sh b/tools/buildgen/generate_projects-old.sh
index 5399867746..55d93d4942 100644
--- a/tools/buildgen/generate_projects-old.sh
+++ b/tools/buildgen/generate_projects-old.sh
@@ -40,7 +40,7 @@ cd `dirname $0`/../..
 mako_renderer=tools/buildgen/mako_renderer.py
 
 if [ "x$TEST" != "x" ] ; then
-  tools/buildgen/build-cleaner.py build.json
+  tools/buildgen/build-cleaner.py build.yaml
 fi
 
 . tools/buildgen/generate_build_additions.sh
@@ -58,8 +58,8 @@ for dir in . ; do
     out=${dir}/${file#$dir/templates/}  # strip templates dir prefix
     out=${out%.*}  # strip template extension
     echo "generating file: $out"
-    json_files="build.json $gen_build_files"
-    data=`for i in $json_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '`
+    yaml_files="build.yaml $gen_build_files"
+    data=`for i in $yaml_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '`
     if [ "x$TEST" = "xtrue" ] ; then
       actual_out=$out
       out=`mktemp /tmp/gentXXXXXX`
diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh
index 32fc90fef5..a8878730cf 100755
--- a/tools/buildgen/generate_projects.sh
+++ b/tools/buildgen/generate_projects.sh
@@ -40,11 +40,11 @@ cd `dirname $0`/../..
 mako_renderer=tools/buildgen/mako_renderer.py
 
 if [ "x$TEST" != "x" ] ; then
-  tools/buildgen/build-cleaner.py build.json
+  tools/buildgen/build-cleaner.py build.yaml
 fi
 
 . tools/buildgen/generate_build_additions.sh
 
-tools/buildgen/generate_projects.py build.json $gen_build_files
+tools/buildgen/generate_projects.py build.yaml $gen_build_files
 
 rm $gen_build_files
diff --git a/tools/buildgen/mako_renderer.py b/tools/buildgen/mako_renderer.py
index 534377e69e..08307bda5a 100755
--- a/tools/buildgen/mako_renderer.py
+++ b/tools/buildgen/mako_renderer.py
@@ -38,14 +38,15 @@ Just a wrapper around the mako rendering library.
 import getopt
 import imp
 import os
+import shutil
 import sys
 
 
 from mako.lookup import TemplateLookup
 from mako.runtime import Context
 from mako.template import Template
-import simplejson
 import bunch
+import yaml
 
 
 # Imports a plugin
@@ -76,6 +77,7 @@ def main(argv):
   got_output = False
   output_file = sys.stdout
   plugins = []
+  output_name = None
 
   try:
     opts, args = getopt.getopt(argv, 'hm:d:o:p:')
@@ -95,7 +97,7 @@ def main(argv):
         showhelp()
         sys.exit(3)
       got_output = True
-      output_file = open(arg, 'w')
+      output_name = arg
     elif opt == '-m':
       if module_directory is not None:
         out('Got more than one cache directory')
@@ -104,7 +106,7 @@ def main(argv):
       module_directory = arg
     elif opt == '-d':
       dict_file = open(arg, 'r')
-      bunch.merge_json(json_dict, simplejson.loads(dict_file.read()))
+      bunch.merge_json(json_dict, yaml.load(dict_file.read()))
       dict_file.close()
     elif opt == '-p':
       plugins.append(import_plugin(arg))
@@ -115,14 +117,51 @@ def main(argv):
   for k, v in json_dict.items():
     dictionary[k] = bunch.to_bunch(v)
 
-  ctx = Context(output_file, **dictionary)
-
+  cleared_dir = False
   for arg in args:
     got_input = True
-    template = Template(filename=arg,
-                        module_directory=module_directory,
-                        lookup=TemplateLookup(directories=['.']))
-    template.render_context(ctx)
+    with open(arg) as f:
+      srcs = list(yaml.load_all(f.read()))
+    for src in srcs:
+      if isinstance(src, basestring):
+        assert len(srcs) == 1
+        template = Template(src,
+                            filename=arg,
+                            module_directory=module_directory,
+                            lookup=TemplateLookup(directories=['.']))
+        with open(output_name, 'w') as output_file:
+          template.render_context(Context(output_file, **dictionary))
+      else:
+        # we have optional control data: this template represents
+        # a directory
+        if not cleared_dir:
+          shutil.rmtree(output_name, ignore_errors=True)
+          cleared_dir = True
+        items = []
+        if 'foreach' in src:
+          for el in dictionary[src['foreach']]:
+            if 'cond' in src:
+              args = dict(dictionary)
+              args['selected'] = el
+              if not eval(src['cond'], {}, args):
+                continue
+            items.append(el)
+          assert items
+        else:
+          items = [None]
+        for item in items:
+          args = dict(dictionary)
+          args['selected'] = item
+          item_output_name = os.path.join(
+              output_name, Template(src['output_name']).render(**args))
+          if not os.path.exists(os.path.dirname(item_output_name)):
+            os.makedirs(os.path.dirname(item_output_name))
+          template = Template(src['template'],
+                              filename=arg,
+                              module_directory=module_directory,
+                              lookup=TemplateLookup(directories=['.']))
+          with open(item_output_name, 'w') as output_file:
+            template.render_context(Context(output_file, **args))
 
   if not got_input:
     out('Got nothing to do')
diff --git a/tools/buildgen/plugins/expand_bin_attrs.py b/tools/buildgen/plugins/expand_bin_attrs.py
index d221b3a325..4f359e5933 100755
--- a/tools/buildgen/plugins/expand_bin_attrs.py
+++ b/tools/buildgen/plugins/expand_bin_attrs.py
@@ -37,7 +37,7 @@ This fills in any optional attributes.
 def mako_plugin(dictionary):
   """The exported plugin code for expand_filegroups.
 
-  The list of libs in the build.json file can contain "filegroups" tags.
+  The list of libs in the build.yaml file can contain "filegroups" tags.
   These refer to the filegroups in the root object. We will expand and
   merge filegroups on the src, headers and public_headers properties.
 
diff --git a/tools/buildgen/plugins/expand_filegroups.py b/tools/buildgen/plugins/expand_filegroups.py
index f63072cc5c..156bdc4417 100755
--- a/tools/buildgen/plugins/expand_filegroups.py
+++ b/tools/buildgen/plugins/expand_filegroups.py
@@ -29,7 +29,7 @@
 
 """Buildgen expand filegroups plugin.
 
-This takes the list of libs from our json dictionary,
+This takes the list of libs from our yaml dictionary,
 and expands any and all filegroup.
 
 """
@@ -45,7 +45,7 @@ def excluded(filename, exclude_res):
 def mako_plugin(dictionary):
   """The exported plugin code for expand_filegroups.
 
-  The list of libs in the build.json file can contain "filegroups" tags.
+  The list of libs in the build.yaml file can contain "filegroups" tags.
   These refer to the filegroups in the root object. We will expand and
   merge filegroups on the src, headers and public_headers properties.
 
diff --git a/tools/buildgen/plugins/generate_vsprojects.py b/tools/buildgen/plugins/generate_vsprojects.py
index 413056fe89..841a61f660 100755
--- a/tools/buildgen/plugins/generate_vsprojects.py
+++ b/tools/buildgen/plugins/generate_vsprojects.py
@@ -57,14 +57,27 @@ def mako_plugin(dictionary):
   projects = []
   projects.extend(libs)
   projects.extend(targets)
-  if dictionary.get('debug', False):
-    for target in projects:
-      if not target.get('vs_project_guid', None) and 'windows' in target.get('platforms', ['windows']):
-        name = target['name']
-        guid = re.sub('(........)(....)(....)(....)(.*)',
-               r'{\1-\2-\3-\4-\5}',
-               hashlib.md5(name).hexdigest())
-        target['vs_project_guid'] = guid.upper()
+  for target in projects:
+    if 'build' in target and target['build'] == 'test':
+      default_test_dir = 'test'
+    else:
+      default_test_dir = '.'
+    if 'vs_config_type' not in target:
+      if 'build' in target and target['build'] == 'test':
+        target['vs_config_type'] = 'Application'
+      else:
+        target['vs_config_type'] = 'StaticLibrary'
+    if 'vs_packages' not in target:
+      target['vs_packages'] = []
+    if 'vs_props' not in target:
+      target['vs_props'] = []
+    target['vs_proj_dir'] = target.get('vs_proj_dir', default_test_dir)
+    if target.get('vs_project_guid', None) is None and 'windows' in target.get('platforms', ['windows']):
+      name = target['name']
+      guid = re.sub('(........)(....)(....)(....)(.*)',
+             r'{\1-\2-\3-\4-\5}',
+             hashlib.md5(name).hexdigest())
+      target['vs_project_guid'] = guid.upper()
   # Exclude projects without a visual project guid, such as the tests.
   projects = [project for project in projects
                 if project.get('vs_project_guid', None)]
@@ -74,5 +87,9 @@ def mako_plugin(dictionary):
 
   project_dict = dict([(p['name'], p) for p in projects])
 
+  packages = dictionary.get('vspackages', [])
+  packages_dict = dict([(p['name'], p) for p in packages])
+
   dictionary['vsprojects'] = projects
   dictionary['vsproject_dict'] = project_dict
+  dictionary['vspackages_dict'] = packages_dict
diff --git a/tools/buildgen/plugins/list_protos.py b/tools/buildgen/plugins/list_protos.py
index f12d7260bd..2f2ac5e053 100755
--- a/tools/buildgen/plugins/list_protos.py
+++ b/tools/buildgen/plugins/list_protos.py
@@ -29,7 +29,7 @@
 
 """Buildgen .proto files list plugin.
 
-This parses the list of targets from the json build file, and creates
+This parses the list of targets from the yaml build file, and creates
 a list called "protos" that contains all of the proto file names.
 
 """
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 939261da65..46fb8b28d4 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -1680,7 +1680,7 @@
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
@@ -1689,14 +1689,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_bad_hostname_test", 
+    "name": "h2_compress_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1704,14 +1704,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_after_accept_test", 
+    "name": "h2_compress_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1719,14 +1719,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_compress_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1734,14 +1734,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_after_invoke_test", 
+    "name": "h2_compress_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1749,14 +1749,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_before_invoke_test", 
+    "name": "h2_compress_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1764,14 +1764,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_in_a_vacuum_test", 
+    "name": "h2_compress_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1779,14 +1779,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_census_simple_request_test", 
+    "name": "h2_compress_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1794,14 +1794,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_channel_connectivity_test", 
+    "name": "h2_compress_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1809,14 +1809,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_default_host_test", 
+    "name": "h2_compress_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1824,14 +1824,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_disappearing_server_test", 
+    "name": "h2_compress_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1839,14 +1839,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_compress_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1854,14 +1854,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_compress_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1869,14 +1869,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_empty_batch_test", 
+    "name": "h2_compress_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1884,14 +1884,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_graceful_server_shutdown_test", 
+    "name": "h2_compress_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1899,14 +1899,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_invoke_large_request_test", 
+    "name": "h2_compress_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1914,14 +1914,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_max_concurrent_streams_test", 
+    "name": "h2_compress_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1929,14 +1929,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_max_message_length_test", 
+    "name": "h2_compress_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1944,14 +1944,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_no_op_test", 
+    "name": "h2_compress_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1959,14 +1959,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_ping_pong_streaming_test", 
+    "name": "h2_compress_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1974,14 +1974,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_registered_call_test", 
+    "name": "h2_compress_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1989,14 +1989,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_compress_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2004,14 +2004,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_metadata_and_payload_test", 
+    "name": "h2_compress_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2019,14 +2019,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_payload_test", 
+    "name": "h2_compress_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2034,14 +2034,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_compress_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2049,14 +2049,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_compress_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2064,14 +2064,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_compressed_payload_test", 
+    "name": "h2_compress_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2079,14 +2079,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_flags_test", 
+    "name": "h2_compress_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2094,14 +2094,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_large_metadata_test", 
+    "name": "h2_compress_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2109,14 +2109,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_payload_test", 
+    "name": "h2_compress_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2124,13 +2124,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_server_finishes_request_test", 
+    "name": "h2_compress_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
@@ -2139,13 +2139,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_simple_delayed_request_test", 
+    "name": "h2_compress_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -2154,14 +2154,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_simple_request_test", 
+    "name": "h2_compress_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fake_security", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2169,13 +2169,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fake_security_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_compress_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_fakesec", 
       "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
@@ -2184,14 +2184,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_bad_hostname_test", 
+    "name": "h2_fakesec_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2199,14 +2199,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_test", 
+    "name": "h2_fakesec_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2214,14 +2214,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_fakesec_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2229,14 +2229,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_invoke_test", 
+    "name": "h2_fakesec_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2244,14 +2244,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_before_invoke_test", 
+    "name": "h2_fakesec_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2259,14 +2259,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_in_a_vacuum_test", 
+    "name": "h2_fakesec_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2274,14 +2274,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_census_simple_request_test", 
+    "name": "h2_fakesec_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2289,14 +2289,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_channel_connectivity_test", 
+    "name": "h2_fakesec_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2304,14 +2304,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_default_host_test", 
+    "name": "h2_fakesec_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2319,14 +2319,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_disappearing_server_test", 
+    "name": "h2_fakesec_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2334,14 +2334,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_fakesec_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2349,14 +2349,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_fakesec_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2364,14 +2364,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_empty_batch_test", 
+    "name": "h2_fakesec_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2379,14 +2379,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_graceful_server_shutdown_test", 
+    "name": "h2_fakesec_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2394,14 +2394,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_invoke_large_request_test", 
+    "name": "h2_fakesec_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2409,14 +2409,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_max_concurrent_streams_test", 
+    "name": "h2_fakesec_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2424,14 +2424,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_max_message_length_test", 
+    "name": "h2_fakesec_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2439,14 +2439,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_no_op_test", 
+    "name": "h2_fakesec_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2454,14 +2454,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_ping_pong_streaming_test", 
+    "name": "h2_fakesec_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2469,14 +2469,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_registered_call_test", 
+    "name": "h2_fakesec_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2484,14 +2484,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_fakesec_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2499,14 +2499,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_metadata_and_payload_test", 
+    "name": "h2_fakesec_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2514,14 +2514,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_payload_test", 
+    "name": "h2_fakesec_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2529,14 +2529,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_fakesec_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2544,14 +2544,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_fakesec_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2559,14 +2559,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_compressed_payload_test", 
+    "name": "h2_fakesec_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2574,14 +2574,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_flags_test", 
+    "name": "h2_fakesec_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2589,14 +2589,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_large_metadata_test", 
+    "name": "h2_fakesec_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2604,14 +2604,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_payload_test", 
+    "name": "h2_fakesec_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2619,13 +2619,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_server_finishes_request_test", 
+    "name": "h2_fakesec_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_fakesec", 
       "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
@@ -2634,13 +2634,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_delayed_request_test", 
+    "name": "h2_fakesec_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_fakesec", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -2649,14 +2649,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_test", 
+    "name": "h2_fakesec_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_fakesec", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2664,13 +2664,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_fakesec_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
@@ -2679,14 +2679,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_bad_hostname_test", 
+    "name": "h2_full_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2694,14 +2694,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_test", 
+    "name": "h2_full_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2709,14 +2709,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_full_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2724,14 +2724,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_invoke_test", 
+    "name": "h2_full_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2739,14 +2739,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_before_invoke_test", 
+    "name": "h2_full_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2754,14 +2754,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_in_a_vacuum_test", 
+    "name": "h2_full_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2769,14 +2769,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_census_simple_request_test", 
+    "name": "h2_full_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2784,14 +2784,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_channel_connectivity_test", 
+    "name": "h2_full_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2799,14 +2799,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_default_host_test", 
+    "name": "h2_full_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2814,14 +2814,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_disappearing_server_test", 
+    "name": "h2_full_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2829,14 +2829,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_full_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2844,14 +2844,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_full_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2859,14 +2859,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_empty_batch_test", 
+    "name": "h2_full_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2874,14 +2874,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_graceful_server_shutdown_test", 
+    "name": "h2_full_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2889,14 +2889,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_invoke_large_request_test", 
+    "name": "h2_full_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2904,14 +2904,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_concurrent_streams_test", 
+    "name": "h2_full_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2919,14 +2919,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_message_length_test", 
+    "name": "h2_full_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2934,14 +2934,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_no_op_test", 
+    "name": "h2_full_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2949,14 +2949,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_ping_pong_streaming_test", 
+    "name": "h2_full_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2964,14 +2964,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_registered_call_test", 
+    "name": "h2_full_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2979,14 +2979,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_full_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2994,14 +2994,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_metadata_and_payload_test", 
+    "name": "h2_full_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3009,14 +3009,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_payload_test", 
+    "name": "h2_full_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3024,14 +3024,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_full_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3039,14 +3039,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_full_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3054,14 +3054,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_compressed_payload_test", 
+    "name": "h2_full_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3069,14 +3069,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_flags_test", 
+    "name": "h2_full_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3084,14 +3084,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_large_metadata_test", 
+    "name": "h2_full_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3099,14 +3099,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_payload_test", 
+    "name": "h2_full_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3114,13 +3114,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_server_finishes_request_test", 
+    "name": "h2_full_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
@@ -3129,13 +3129,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_delayed_request_test", 
+    "name": "h2_full_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -3144,14 +3144,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_test", 
+    "name": "h2_full_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3159,13 +3159,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_full_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
@@ -3174,14 +3174,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_bad_hostname_test", 
+    "name": "h2_full+poll_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3189,14 +3189,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_test", 
+    "name": "h2_full+poll_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3204,14 +3204,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_full+poll_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3219,14 +3219,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_invoke_test", 
+    "name": "h2_full+poll_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3234,14 +3234,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_before_invoke_test", 
+    "name": "h2_full+poll_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3249,14 +3249,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_in_a_vacuum_test", 
+    "name": "h2_full+poll_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3264,14 +3264,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_census_simple_request_test", 
+    "name": "h2_full+poll_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3279,14 +3279,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_channel_connectivity_test", 
+    "name": "h2_full+poll_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3294,14 +3294,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_disappearing_server_test", 
+    "name": "h2_full+poll_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3309,14 +3309,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_full+poll_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3324,14 +3324,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_full+poll_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3339,14 +3339,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_empty_batch_test", 
+    "name": "h2_full+poll_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3354,14 +3354,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_graceful_server_shutdown_test", 
+    "name": "h2_full+poll_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3369,14 +3369,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_invoke_large_request_test", 
+    "name": "h2_full+poll_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3384,14 +3384,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_concurrent_streams_test", 
+    "name": "h2_full+poll_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3399,14 +3399,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_message_length_test", 
+    "name": "h2_full+poll_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3414,14 +3414,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_no_op_test", 
+    "name": "h2_full+poll_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3429,14 +3429,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_ping_pong_streaming_test", 
+    "name": "h2_full+poll_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3444,14 +3444,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_registered_call_test", 
+    "name": "h2_full+poll_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3459,14 +3459,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_full+poll_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3474,14 +3474,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_metadata_and_payload_test", 
+    "name": "h2_full+poll_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3489,14 +3489,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_test", 
+    "name": "h2_full+poll_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3504,14 +3504,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_full+poll_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3519,14 +3519,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_full+poll_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3534,13 +3534,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_compressed_payload_test", 
+    "name": "h2_full+poll_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
@@ -3549,14 +3549,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_flags_test", 
+    "name": "h2_full+poll_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3564,14 +3564,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_large_metadata_test", 
+    "name": "h2_full+poll_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3579,14 +3579,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_payload_test", 
+    "name": "h2_full+poll_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3594,14 +3594,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_server_finishes_request_test", 
+    "name": "h2_full+poll_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3609,14 +3609,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_delayed_request_test", 
+    "name": "h2_full+poll_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3624,14 +3624,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_test", 
+    "name": "h2_full+poll_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3639,14 +3639,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_full+poll_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3654,14 +3654,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_bad_hostname_test", 
+    "name": "h2_full+poll_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3669,14 +3669,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_test", 
+    "name": "h2_oauth2_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3684,14 +3684,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_oauth2_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3699,14 +3699,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_invoke_test", 
+    "name": "h2_oauth2_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3714,14 +3714,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_before_invoke_test", 
+    "name": "h2_oauth2_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3729,14 +3729,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_in_a_vacuum_test", 
+    "name": "h2_oauth2_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3744,14 +3744,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_census_simple_request_test", 
+    "name": "h2_oauth2_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3759,14 +3759,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_channel_connectivity_test", 
+    "name": "h2_oauth2_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3774,14 +3774,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_disappearing_server_test", 
+    "name": "h2_oauth2_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3789,14 +3789,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_oauth2_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3804,14 +3804,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_oauth2_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3819,14 +3819,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_empty_batch_test", 
+    "name": "h2_oauth2_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3834,14 +3834,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_graceful_server_shutdown_test", 
+    "name": "h2_oauth2_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3849,14 +3849,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_invoke_large_request_test", 
+    "name": "h2_oauth2_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3864,14 +3864,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_concurrent_streams_test", 
+    "name": "h2_oauth2_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3879,14 +3879,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_message_length_test", 
+    "name": "h2_oauth2_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3894,14 +3894,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_no_op_test", 
+    "name": "h2_oauth2_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3909,14 +3909,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_ping_pong_streaming_test", 
+    "name": "h2_oauth2_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3924,14 +3924,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_registered_call_test", 
+    "name": "h2_oauth2_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3939,14 +3939,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_oauth2_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3954,14 +3954,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_metadata_and_payload_test", 
+    "name": "h2_oauth2_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3969,14 +3969,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_payload_test", 
+    "name": "h2_oauth2_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3984,14 +3984,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_oauth2_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3999,14 +3999,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_oauth2_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4014,14 +4014,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_compressed_payload_test", 
+    "name": "h2_oauth2_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4029,14 +4029,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_flags_test", 
+    "name": "h2_oauth2_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4044,13 +4044,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_large_metadata_test", 
+    "name": "h2_oauth2_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
+      "end2end_fixture_h2_oauth2", 
       "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
@@ -4059,13 +4059,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_payload_test", 
+    "name": "h2_oauth2_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
+      "end2end_fixture_h2_oauth2", 
       "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
@@ -4074,14 +4074,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_server_finishes_request_test", 
+    "name": "h2_oauth2_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4089,14 +4089,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_delayed_request_test", 
+    "name": "h2_oauth2_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4104,14 +4104,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_test", 
+    "name": "h2_oauth2_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4119,14 +4119,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_oauth2_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4134,14 +4134,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_bad_hostname_test", 
+    "name": "h2_oauth2_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_oauth2", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4149,14 +4149,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_test", 
+    "name": "h2_oauth2_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4164,14 +4164,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_proxy_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4179,14 +4179,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_invoke_test", 
+    "name": "h2_proxy_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4194,14 +4194,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_before_invoke_test", 
+    "name": "h2_proxy_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4209,14 +4209,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_in_a_vacuum_test", 
+    "name": "h2_proxy_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4224,14 +4224,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_census_simple_request_test", 
+    "name": "h2_proxy_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4239,14 +4239,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_channel_connectivity_test", 
+    "name": "h2_proxy_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4254,14 +4254,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_default_host_test", 
+    "name": "h2_proxy_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4269,14 +4269,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_disappearing_server_test", 
+    "name": "h2_proxy_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4284,14 +4284,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_proxy_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4299,14 +4299,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_proxy_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4314,14 +4314,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_empty_batch_test", 
+    "name": "h2_proxy_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4329,14 +4329,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_graceful_server_shutdown_test", 
+    "name": "h2_proxy_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4344,14 +4344,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_invoke_large_request_test", 
+    "name": "h2_proxy_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4359,14 +4359,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_concurrent_streams_test", 
+    "name": "h2_proxy_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4374,14 +4374,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_message_length_test", 
+    "name": "h2_proxy_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4389,14 +4389,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_no_op_test", 
+    "name": "h2_proxy_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4404,14 +4404,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_ping_pong_streaming_test", 
+    "name": "h2_proxy_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4419,14 +4419,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_registered_call_test", 
+    "name": "h2_proxy_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4434,14 +4434,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_proxy_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4449,14 +4449,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_metadata_and_payload_test", 
+    "name": "h2_proxy_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4464,14 +4464,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_payload_test", 
+    "name": "h2_proxy_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4479,14 +4479,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_proxy_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4494,14 +4494,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_proxy_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4509,14 +4509,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_compressed_payload_test", 
+    "name": "h2_proxy_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4524,14 +4524,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_flags_test", 
+    "name": "h2_proxy_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4539,14 +4539,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_large_metadata_test", 
+    "name": "h2_proxy_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4554,14 +4554,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_payload_test", 
+    "name": "h2_proxy_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4569,14 +4569,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_server_finishes_request_test", 
+    "name": "h2_proxy_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4584,14 +4584,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_delayed_request_test", 
+    "name": "h2_proxy_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4599,14 +4599,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_test", 
+    "name": "h2_sockpair_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4614,14 +4614,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_sockpair_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4629,13 +4629,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_bad_hostname_test", 
+    "name": "h2_sockpair_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
+      "end2end_fixture_h2_sockpair", 
       "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
@@ -4644,14 +4644,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_test", 
+    "name": "h2_sockpair_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4659,13 +4659,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_sockpair_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
+      "end2end_fixture_h2_sockpair", 
       "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -4674,13 +4674,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_invoke_test", 
+    "name": "h2_sockpair_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
+      "end2end_fixture_h2_sockpair", 
       "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -4689,13 +4689,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_before_invoke_test", 
+    "name": "h2_sockpair_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
+      "end2end_fixture_h2_sockpair", 
       "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
@@ -4704,13 +4704,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_in_a_vacuum_test", 
+    "name": "h2_sockpair_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
+      "end2end_fixture_h2_sockpair", 
       "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -4719,14 +4719,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_census_simple_request_test", 
+    "name": "h2_sockpair_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4734,14 +4734,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_default_host_test", 
+    "name": "h2_sockpair_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4749,14 +4749,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_disappearing_server_test", 
+    "name": "h2_sockpair_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4764,14 +4764,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_sockpair_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4779,14 +4779,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_sockpair_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4794,14 +4794,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_empty_batch_test", 
+    "name": "h2_sockpair_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4809,14 +4809,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_graceful_server_shutdown_test", 
+    "name": "h2_sockpair_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4824,13 +4824,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_invoke_large_request_test", 
+    "name": "h2_sockpair_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
+      "end2end_fixture_h2_sockpair", 
       "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
@@ -4839,14 +4839,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_max_message_length_test", 
+    "name": "h2_sockpair_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4854,14 +4854,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_no_op_test", 
+    "name": "h2_sockpair_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4869,14 +4869,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_ping_pong_streaming_test", 
+    "name": "h2_sockpair_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4884,14 +4884,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_registered_call_test", 
+    "name": "h2_sockpair_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4899,14 +4899,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_sockpair_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4914,14 +4914,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_metadata_and_payload_test", 
+    "name": "h2_sockpair_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4929,14 +4929,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_payload_test", 
+    "name": "h2_sockpair_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4944,14 +4944,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_sockpair_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4959,14 +4959,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_sockpair_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4974,14 +4974,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_large_metadata_test", 
+    "name": "h2_sockpair_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4989,14 +4989,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_payload_test", 
+    "name": "h2_sockpair_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5004,14 +5004,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_server_finishes_request_test", 
+    "name": "h2_sockpair_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5019,14 +5019,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_delayed_request_test", 
+    "name": "h2_sockpair_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5034,14 +5034,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_test", 
+    "name": "h2_sockpair+trace_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5049,14 +5049,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_sockpair+trace_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5064,13 +5064,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_bad_hostname_test", 
+    "name": "h2_sockpair+trace_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
@@ -5079,14 +5079,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_after_accept_test", 
+    "name": "h2_sockpair+trace_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5094,13 +5094,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_sockpair+trace_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -5109,13 +5109,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_after_invoke_test", 
+    "name": "h2_sockpair+trace_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -5124,13 +5124,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_before_invoke_test", 
+    "name": "h2_sockpair+trace_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
@@ -5139,13 +5139,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_in_a_vacuum_test", 
+    "name": "h2_sockpair+trace_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -5154,14 +5154,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_census_simple_request_test", 
+    "name": "h2_sockpair+trace_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5169,14 +5169,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_channel_connectivity_test", 
+    "name": "h2_sockpair+trace_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5184,14 +5184,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_default_host_test", 
+    "name": "h2_sockpair+trace_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5199,14 +5199,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_disappearing_server_test", 
+    "name": "h2_sockpair+trace_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5214,14 +5214,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_sockpair+trace_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5229,14 +5229,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_sockpair+trace_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5244,14 +5244,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_empty_batch_test", 
+    "name": "h2_sockpair+trace_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5259,14 +5259,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_graceful_server_shutdown_test", 
+    "name": "h2_sockpair+trace_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5274,14 +5274,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_invoke_large_request_test", 
+    "name": "h2_sockpair+trace_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5289,14 +5289,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_max_concurrent_streams_test", 
+    "name": "h2_sockpair+trace_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5304,14 +5304,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_max_message_length_test", 
+    "name": "h2_sockpair+trace_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5319,13 +5319,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_no_op_test", 
+    "name": "h2_sockpair+trace_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
@@ -5334,13 +5334,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_ping_pong_streaming_test", 
+    "name": "h2_sockpair+trace_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
+      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
@@ -5349,14 +5349,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_registered_call_test", 
+    "name": "h2_sockpair+trace_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5364,14 +5364,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_sockpair+trace_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5379,14 +5379,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_metadata_and_payload_test", 
+    "name": "h2_sockpair+trace_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5394,14 +5394,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_payload_test", 
+    "name": "h2_sockpair+trace_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5409,14 +5409,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5424,14 +5424,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5439,14 +5439,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_compressed_payload_test", 
+    "name": "h2_sockpair+trace_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5454,14 +5454,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_flags_test", 
+    "name": "h2_sockpair+trace_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5469,14 +5469,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_large_metadata_test", 
+    "name": "h2_sockpair_1byte_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5484,14 +5484,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_payload_test", 
+    "name": "h2_sockpair_1byte_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5499,14 +5499,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_server_finishes_request_test", 
+    "name": "h2_sockpair_1byte_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5514,14 +5514,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_simple_delayed_request_test", 
+    "name": "h2_sockpair_1byte_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5529,14 +5529,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_simple_request_test", 
+    "name": "h2_sockpair_1byte_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5544,14 +5544,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_sockpair_1byte_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5559,14 +5559,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_bad_hostname_test", 
+    "name": "h2_sockpair_1byte_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5574,14 +5574,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_after_accept_test", 
+    "name": "h2_sockpair_1byte_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5589,14 +5589,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_sockpair_1byte_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5604,14 +5604,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_after_invoke_test", 
+    "name": "h2_sockpair_1byte_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5619,14 +5619,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_before_invoke_test", 
+    "name": "h2_sockpair_1byte_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5634,14 +5634,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_in_a_vacuum_test", 
+    "name": "h2_sockpair_1byte_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5649,14 +5649,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_census_simple_request_test", 
+    "name": "h2_sockpair_1byte_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5664,14 +5664,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_channel_connectivity_test", 
+    "name": "h2_sockpair_1byte_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5679,14 +5679,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_default_host_test", 
+    "name": "h2_sockpair_1byte_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5694,14 +5694,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_disappearing_server_test", 
+    "name": "h2_sockpair_1byte_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5709,14 +5709,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_sockpair_1byte_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5724,14 +5724,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_sockpair_1byte_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5739,14 +5739,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_empty_batch_test", 
+    "name": "h2_sockpair_1byte_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5754,14 +5754,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_graceful_server_shutdown_test", 
+    "name": "h2_sockpair_1byte_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5769,14 +5769,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_invoke_large_request_test", 
+    "name": "h2_sockpair_1byte_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5784,14 +5784,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_max_concurrent_streams_test", 
+    "name": "h2_sockpair_1byte_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5799,14 +5799,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_max_message_length_test", 
+    "name": "h2_sockpair_1byte_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5814,14 +5814,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_no_op_test", 
+    "name": "h2_sockpair_1byte_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5829,14 +5829,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_ping_pong_streaming_test", 
+    "name": "h2_sockpair_1byte_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5844,14 +5844,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_registered_call_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5859,14 +5859,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5874,14 +5874,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_metadata_and_payload_test", 
+    "name": "h2_sockpair_1byte_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5889,14 +5889,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_payload_test", 
+    "name": "h2_sockpair_1byte_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5904,14 +5904,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5919,14 +5919,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5934,14 +5934,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_compressed_payload_test", 
+    "name": "h2_ssl_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5949,14 +5949,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_flags_test", 
+    "name": "h2_ssl_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5964,14 +5964,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_large_metadata_test", 
+    "name": "h2_ssl_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5979,14 +5979,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_payload_test", 
+    "name": "h2_ssl_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -5994,14 +5994,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_server_finishes_request_test", 
+    "name": "h2_ssl_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6009,14 +6009,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_simple_delayed_request_test", 
+    "name": "h2_ssl_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6024,14 +6024,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_simple_request_test", 
+    "name": "h2_ssl_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6039,14 +6039,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_ssl_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6054,14 +6054,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_bad_hostname_test", 
+    "name": "h2_ssl_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6069,14 +6069,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_after_accept_test", 
+    "name": "h2_ssl_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6084,14 +6084,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_ssl_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6099,14 +6099,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_after_invoke_test", 
+    "name": "h2_ssl_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6114,14 +6114,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_before_invoke_test", 
+    "name": "h2_ssl_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6129,14 +6129,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_in_a_vacuum_test", 
+    "name": "h2_ssl_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6144,14 +6144,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_census_simple_request_test", 
+    "name": "h2_ssl_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6159,14 +6159,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_default_host_test", 
+    "name": "h2_ssl_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6174,14 +6174,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_disappearing_server_test", 
+    "name": "h2_ssl_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6189,14 +6189,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_ssl_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6204,14 +6204,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_ssl_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6219,14 +6219,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_empty_batch_test", 
+    "name": "h2_ssl_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6234,14 +6234,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_graceful_server_shutdown_test", 
+    "name": "h2_ssl_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6249,14 +6249,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_invoke_large_request_test", 
+    "name": "h2_ssl_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6264,14 +6264,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_max_message_length_test", 
+    "name": "h2_ssl_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6279,14 +6279,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_no_op_test", 
+    "name": "h2_ssl_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6294,14 +6294,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_ping_pong_streaming_test", 
+    "name": "h2_ssl_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6309,14 +6309,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_registered_call_test", 
+    "name": "h2_ssl_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6324,14 +6324,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_ssl_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6339,14 +6339,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_metadata_and_payload_test", 
+    "name": "h2_ssl_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6354,14 +6354,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_payload_test", 
+    "name": "h2_ssl_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6369,14 +6369,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_ssl", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6384,14 +6384,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6399,14 +6399,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_with_large_metadata_test", 
+    "name": "h2_ssl+poll_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6414,14 +6414,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_with_payload_test", 
+    "name": "h2_ssl+poll_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6429,14 +6429,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_server_finishes_request_test", 
+    "name": "h2_ssl+poll_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6444,14 +6444,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_simple_delayed_request_test", 
+    "name": "h2_ssl+poll_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6459,14 +6459,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_simple_request_test", 
+    "name": "h2_ssl+poll_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6474,14 +6474,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_ssl+poll_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6489,14 +6489,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_bad_hostname_test", 
+    "name": "h2_ssl+poll_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6504,14 +6504,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_test", 
+    "name": "h2_ssl+poll_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6519,14 +6519,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_ssl+poll_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6534,14 +6534,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_invoke_test", 
+    "name": "h2_ssl+poll_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6549,14 +6549,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_before_invoke_test", 
+    "name": "h2_ssl+poll_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6564,14 +6564,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_in_a_vacuum_test", 
+    "name": "h2_ssl+poll_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6579,14 +6579,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_census_simple_request_test", 
+    "name": "h2_ssl+poll_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6594,14 +6594,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_channel_connectivity_test", 
+    "name": "h2_ssl+poll_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6609,14 +6609,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_default_host_test", 
+    "name": "h2_ssl+poll_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6624,14 +6624,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_disappearing_server_test", 
+    "name": "h2_ssl+poll_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6639,14 +6639,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_ssl+poll_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6654,14 +6654,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_ssl+poll_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6669,14 +6669,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_empty_batch_test", 
+    "name": "h2_ssl+poll_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6684,14 +6684,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_graceful_server_shutdown_test", 
+    "name": "h2_ssl+poll_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6699,14 +6699,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_test", 
+    "name": "h2_ssl+poll_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6714,14 +6714,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_max_concurrent_streams_test", 
+    "name": "h2_ssl+poll_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6729,14 +6729,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_max_message_length_test", 
+    "name": "h2_ssl+poll_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6744,14 +6744,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_no_op_test", 
+    "name": "h2_ssl+poll_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6759,14 +6759,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_ping_pong_streaming_test", 
+    "name": "h2_ssl+poll_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6774,14 +6774,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_registered_call_test", 
+    "name": "h2_ssl+poll_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6789,14 +6789,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_ssl+poll_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6804,14 +6804,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_metadata_and_payload_test", 
+    "name": "h2_ssl+poll_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6819,14 +6819,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_test", 
+    "name": "h2_ssl+poll_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6834,14 +6834,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl+poll_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6849,14 +6849,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl+poll_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6864,14 +6864,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_compressed_payload_test", 
+    "name": "h2_ssl+poll_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_ssl+poll", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6879,14 +6879,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_flags_test", 
+    "name": "h2_ssl+poll_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6894,14 +6894,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_large_metadata_test", 
+    "name": "h2_ssl_proxy_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6909,14 +6909,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_payload_test", 
+    "name": "h2_ssl_proxy_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6924,14 +6924,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_server_finishes_request_test", 
+    "name": "h2_ssl_proxy_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6939,14 +6939,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_simple_delayed_request_test", 
+    "name": "h2_ssl_proxy_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6954,14 +6954,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_simple_request_test", 
+    "name": "h2_ssl_proxy_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6969,14 +6969,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_ssl_proxy_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6984,14 +6984,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_bad_hostname_test", 
+    "name": "h2_ssl_proxy_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6999,14 +6999,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_test", 
+    "name": "h2_ssl_proxy_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7014,14 +7014,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_ssl_proxy_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7029,14 +7029,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_invoke_test", 
+    "name": "h2_ssl_proxy_default_host_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7044,14 +7044,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_before_invoke_test", 
+    "name": "h2_ssl_proxy_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7059,14 +7059,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_in_a_vacuum_test", 
+    "name": "h2_ssl_proxy_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7074,14 +7074,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_census_simple_request_test", 
+    "name": "h2_ssl_proxy_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7089,14 +7089,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_ssl_proxy_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7104,14 +7104,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_ssl_proxy_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7119,14 +7119,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_empty_batch_test", 
+    "name": "h2_ssl_proxy_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7134,14 +7134,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_graceful_server_shutdown_test", 
+    "name": "h2_ssl_proxy_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7149,14 +7149,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_invoke_large_request_test", 
+    "name": "h2_ssl_proxy_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7164,14 +7164,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_concurrent_streams_test", 
+    "name": "h2_ssl_proxy_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7179,14 +7179,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_message_length_test", 
+    "name": "h2_ssl_proxy_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7194,14 +7194,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_no_op_test", 
+    "name": "h2_ssl_proxy_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7209,14 +7209,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_ping_pong_streaming_test", 
+    "name": "h2_ssl_proxy_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7224,14 +7224,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_registered_call_test", 
+    "name": "h2_ssl_proxy_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7239,14 +7239,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_ssl_proxy_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7254,14 +7254,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_metadata_and_payload_test", 
+    "name": "h2_ssl_proxy_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7269,14 +7269,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_payload_test", 
+    "name": "h2_ssl_proxy_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7284,14 +7284,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl_proxy_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7299,14 +7299,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl_proxy_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_ssl_proxy", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7314,14 +7314,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_compressed_payload_test", 
+    "name": "h2_ssl_proxy_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7329,14 +7329,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_flags_test", 
+    "name": "h2_uds_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7344,14 +7344,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_large_metadata_test", 
+    "name": "h2_uds_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7359,14 +7359,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_payload_test", 
+    "name": "h2_uds_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7374,14 +7374,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_server_finishes_request_test", 
+    "name": "h2_uds_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7389,14 +7389,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_test", 
+    "name": "h2_uds_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7404,14 +7404,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_uds_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7419,14 +7419,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_bad_hostname_test", 
+    "name": "h2_uds_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7434,14 +7434,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_test", 
+    "name": "h2_uds_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7449,14 +7449,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_uds_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7464,14 +7464,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_test", 
+    "name": "h2_uds_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7479,14 +7479,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_test", 
+    "name": "h2_uds_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7494,14 +7494,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_test", 
+    "name": "h2_uds_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7509,14 +7509,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_census_simple_request_test", 
+    "name": "h2_uds_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7524,14 +7524,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_uds_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7539,14 +7539,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_uds_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7554,14 +7554,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_empty_batch_test", 
+    "name": "h2_uds_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7569,14 +7569,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_graceful_server_shutdown_test", 
+    "name": "h2_uds_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7584,14 +7584,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_test", 
+    "name": "h2_uds_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7599,14 +7599,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_test", 
+    "name": "h2_uds_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7614,13 +7614,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_message_length_test", 
+    "name": "h2_uds_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
+      "end2end_fixture_h2_uds", 
       "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
@@ -7629,14 +7629,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_no_op_test", 
+    "name": "h2_uds_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7644,14 +7644,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_test", 
+    "name": "h2_uds_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7659,14 +7659,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_registered_call_test", 
+    "name": "h2_uds_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7674,14 +7674,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_uds_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7689,14 +7689,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_test", 
+    "name": "h2_uds_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7704,14 +7704,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_test", 
+    "name": "h2_uds_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7719,14 +7719,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_uds_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7734,14 +7734,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_uds_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7749,14 +7749,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_compressed_payload_test", 
+    "name": "h2_uds_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7764,14 +7764,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_flags_test", 
+    "name": "h2_uds_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7779,14 +7779,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_large_metadata_test", 
+    "name": "h2_uds_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7794,14 +7794,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_payload_test", 
+    "name": "h2_uds_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7809,14 +7809,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_server_finishes_request_test", 
+    "name": "h2_uds+poll_bad_hostname_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7824,14 +7824,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_test", 
+    "name": "h2_uds+poll_binary_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_call_creds", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7839,14 +7839,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_uds+poll_call_creds_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7854,14 +7854,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_bad_hostname_test", 
+    "name": "h2_uds+poll_cancel_after_accept_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7869,14 +7869,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_test", 
+    "name": "h2_uds+poll_cancel_after_client_done_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7884,14 +7884,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_uds+poll_cancel_after_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7899,14 +7899,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_invoke_test", 
+    "name": "h2_uds+poll_cancel_before_invoke_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7914,14 +7914,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_before_invoke_test", 
+    "name": "h2_uds+poll_cancel_in_a_vacuum_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7929,14 +7929,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_in_a_vacuum_test", 
+    "name": "h2_uds+poll_census_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7944,14 +7944,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_census_simple_request_test", 
+    "name": "h2_uds+poll_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7959,14 +7959,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_uds+poll_compressed_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7974,13 +7974,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_uds+poll_disappearing_server_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
+      "end2end_fixture_h2_uds+poll", 
       "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
@@ -7989,13 +7989,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_empty_batch_test", 
+    "name": "h2_uds+poll_empty_batch_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
+      "end2end_fixture_h2_uds+poll", 
       "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
@@ -8004,14 +8004,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_graceful_server_shutdown_test", 
+    "name": "h2_uds+poll_graceful_server_shutdown_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8019,14 +8019,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_invoke_large_request_test", 
+    "name": "h2_uds+poll_high_initial_seqno_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8034,14 +8034,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_concurrent_streams_test", 
+    "name": "h2_uds+poll_invoke_large_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8049,14 +8049,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_message_length_test", 
+    "name": "h2_uds+poll_large_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8064,14 +8064,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_no_op_test", 
+    "name": "h2_uds+poll_max_concurrent_streams_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8079,14 +8079,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_ping_pong_streaming_test", 
+    "name": "h2_uds+poll_max_message_length_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8094,14 +8094,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_registered_call_test", 
+    "name": "h2_uds+poll_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8109,14 +8109,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_uds+poll_no_op_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8124,14 +8124,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_metadata_and_payload_test", 
+    "name": "h2_uds+poll_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8139,14 +8139,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_payload_test", 
+    "name": "h2_uds+poll_ping_pong_streaming_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_payload_and_call_creds", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8154,14 +8154,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_uds+poll_registered_call_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8169,14 +8169,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_uds+poll_request_with_flags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8184,14 +8184,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_compressed_payload_test", 
+    "name": "h2_uds+poll_request_with_payload_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8199,14 +8199,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_flags_test", 
+    "name": "h2_uds+poll_server_finishes_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8214,14 +8214,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_large_metadata_test", 
+    "name": "h2_uds+poll_shutdown_finishes_calls_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8229,14 +8229,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_payload_test", 
+    "name": "h2_uds+poll_shutdown_finishes_tags_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8244,13 +8244,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_server_finishes_request_test", 
+    "name": "h2_uds+poll_simple_delayed_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
+      "end2end_fixture_h2_uds+poll", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -8259,14 +8259,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_test", 
+    "name": "h2_uds+poll_simple_request_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8274,12 +8274,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_uds+poll_trailing_metadata_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
@@ -8288,12 +8288,26 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_bad_hostname_unsecure_test", 
+    "name": "h2_compress_bad_hostname_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_fixture_h2_compress", 
+      "end2end_test_binary_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_compress_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
@@ -8302,13 +8316,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_unsecure_test", 
+    "name": "h2_compress_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8316,12 +8330,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_compress_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -8330,12 +8344,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_invoke_unsecure_test", 
+    "name": "h2_compress_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -8344,12 +8358,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_before_invoke_unsecure_test", 
+    "name": "h2_compress_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
@@ -8358,12 +8372,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_compress_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -8372,12 +8386,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_census_simple_request_unsecure_test", 
+    "name": "h2_compress_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
@@ -8386,13 +8400,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_channel_connectivity_unsecure_test", 
+    "name": "h2_compress_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8400,13 +8414,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_default_host_unsecure_test", 
+    "name": "h2_compress_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8414,13 +8428,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_disappearing_server_unsecure_test", 
+    "name": "h2_compress_default_host_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8428,13 +8442,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_compress_disappearing_server_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8442,13 +8456,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_compress_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8456,13 +8470,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_empty_batch_unsecure_test", 
+    "name": "h2_compress_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8470,12 +8484,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_compress_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
+      "end2end_fixture_h2_compress", 
       "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
@@ -8484,13 +8498,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_invoke_large_request_unsecure_test", 
+    "name": "h2_compress_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8498,13 +8512,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_max_concurrent_streams_unsecure_test", 
+    "name": "h2_compress_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8512,13 +8526,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_max_message_length_unsecure_test", 
+    "name": "h2_compress_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8526,13 +8540,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_no_op_unsecure_test", 
+    "name": "h2_compress_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8540,13 +8554,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_ping_pong_streaming_unsecure_test", 
+    "name": "h2_compress_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8554,13 +8568,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_registered_call_unsecure_test", 
+    "name": "h2_compress_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8568,13 +8582,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_compress_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8582,13 +8596,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_compress_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8596,13 +8610,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_payload_unsecure_test", 
+    "name": "h2_compress_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8610,13 +8624,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_compress_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8624,13 +8638,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_compress_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8638,13 +8652,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_flags_unsecure_test", 
+    "name": "h2_compress_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8652,13 +8666,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_large_metadata_unsecure_test", 
+    "name": "h2_compress_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8666,13 +8680,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_payload_unsecure_test", 
+    "name": "h2_compress_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8680,13 +8694,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_server_finishes_request_unsecure_test", 
+    "name": "h2_compress_simple_delayed_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8694,13 +8708,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_delayed_request_unsecure_test", 
+    "name": "h2_compress_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_compress", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8708,13 +8722,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_unsecure_test", 
+    "name": "h2_compress_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8722,13 +8736,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_full_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8736,12 +8750,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_bad_hostname_unsecure_test", 
+    "name": "h2_full_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
@@ -8750,13 +8764,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_unsecure_test", 
+    "name": "h2_full_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8764,12 +8778,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_full_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -8778,12 +8792,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_invoke_unsecure_test", 
+    "name": "h2_full_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -8792,12 +8806,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_before_invoke_unsecure_test", 
+    "name": "h2_full_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
@@ -8806,12 +8820,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_full_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -8820,12 +8834,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_census_simple_request_unsecure_test", 
+    "name": "h2_full_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
@@ -8834,13 +8848,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_channel_connectivity_unsecure_test", 
+    "name": "h2_full_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8848,13 +8862,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_default_host_unsecure_test", 
+    "name": "h2_full_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8862,13 +8876,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_disappearing_server_unsecure_test", 
+    "name": "h2_full_default_host_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8876,13 +8890,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_full_disappearing_server_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8890,13 +8904,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_full_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8904,13 +8918,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_empty_batch_unsecure_test", 
+    "name": "h2_full_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8918,12 +8932,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_full_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
+      "end2end_fixture_h2_full", 
       "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
@@ -8932,13 +8946,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_invoke_large_request_unsecure_test", 
+    "name": "h2_full_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8946,13 +8960,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_concurrent_streams_unsecure_test", 
+    "name": "h2_full_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8960,13 +8974,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_message_length_unsecure_test", 
+    "name": "h2_full_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8974,13 +8988,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_no_op_unsecure_test", 
+    "name": "h2_full_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -8988,13 +9002,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_ping_pong_streaming_unsecure_test", 
+    "name": "h2_full_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9002,13 +9016,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_registered_call_unsecure_test", 
+    "name": "h2_full_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9016,13 +9030,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_full_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9030,13 +9044,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_full_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9044,13 +9058,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_payload_unsecure_test", 
+    "name": "h2_full_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9058,13 +9072,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_full_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9072,13 +9086,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_full_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9086,13 +9100,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_flags_unsecure_test", 
+    "name": "h2_full_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9100,13 +9114,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_large_metadata_unsecure_test", 
+    "name": "h2_full_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9114,13 +9128,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_payload_unsecure_test", 
+    "name": "h2_full_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9128,13 +9142,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_server_finishes_request_unsecure_test", 
+    "name": "h2_full_simple_delayed_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9142,13 +9156,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_delayed_request_unsecure_test", 
+    "name": "h2_full_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_full", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9156,13 +9170,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_unsecure_test", 
+    "name": "h2_full_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_compression", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9170,13 +9184,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_full+poll_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9184,12 +9198,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_bad_hostname_unsecure_test", 
+    "name": "h2_full+poll_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
@@ -9198,13 +9212,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_unsecure_test", 
+    "name": "h2_full+poll_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9212,12 +9226,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_full+poll_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -9226,12 +9240,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_invoke_unsecure_test", 
+    "name": "h2_full+poll_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
@@ -9240,12 +9254,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_before_invoke_unsecure_test", 
+    "name": "h2_full+poll_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
@@ -9254,12 +9268,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_full+poll_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -9268,12 +9282,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_census_simple_request_unsecure_test", 
+    "name": "h2_full+poll_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
@@ -9282,13 +9296,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_channel_connectivity_unsecure_test", 
+    "name": "h2_full+poll_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9296,13 +9310,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_disappearing_server_unsecure_test", 
+    "name": "h2_full+poll_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9310,13 +9324,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_full+poll_default_host_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9324,12 +9338,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_full+poll_disappearing_server_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
@@ -9338,12 +9352,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_empty_batch_unsecure_test", 
+    "name": "h2_full+poll_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
@@ -9352,13 +9366,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_full+poll_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9366,13 +9380,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_invoke_large_request_unsecure_test", 
+    "name": "h2_full+poll_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9380,13 +9394,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_concurrent_streams_unsecure_test", 
+    "name": "h2_full+poll_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9394,13 +9408,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_message_length_unsecure_test", 
+    "name": "h2_full+poll_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9408,13 +9422,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_no_op_unsecure_test", 
+    "name": "h2_full+poll_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9422,13 +9436,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_ping_pong_streaming_unsecure_test", 
+    "name": "h2_full+poll_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9436,13 +9450,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_registered_call_unsecure_test", 
+    "name": "h2_full+poll_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9450,13 +9464,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_full+poll_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9464,13 +9478,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_full+poll_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9478,13 +9492,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_unsecure_test", 
+    "name": "h2_full+poll_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9492,13 +9506,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_full+poll_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9506,13 +9520,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_full+poll_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9520,13 +9534,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_flags_unsecure_test", 
+    "name": "h2_full+poll_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9534,13 +9548,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_large_metadata_unsecure_test", 
+    "name": "h2_full+poll_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9548,13 +9562,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_payload_unsecure_test", 
+    "name": "h2_full+poll_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9562,12 +9576,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_server_finishes_request_unsecure_test", 
+    "name": "h2_full+poll_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
@@ -9576,12 +9590,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_delayed_request_unsecure_test", 
+    "name": "h2_full+poll_simple_delayed_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
+      "end2end_fixture_h2_full+poll", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -9590,13 +9604,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_unsecure_test", 
+    "name": "h2_full+poll_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_full+poll", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9604,12 +9618,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_full+poll_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
+      "end2end_fixture_h2_proxy", 
       "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
@@ -9618,27 +9632,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_bad_hostname_unsecure_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_after_accept", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_unsecure_test", 
+    "name": "h2_proxy_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9646,13 +9646,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_proxy_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9660,13 +9660,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_invoke_unsecure_test", 
+    "name": "h2_proxy_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9674,13 +9674,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_before_invoke_unsecure_test", 
+    "name": "h2_proxy_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9688,13 +9688,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_proxy_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9702,13 +9702,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_census_simple_request_unsecure_test", 
+    "name": "h2_proxy_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9716,13 +9716,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_channel_connectivity_unsecure_test", 
+    "name": "h2_proxy_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9730,13 +9730,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_disappearing_server_unsecure_test", 
+    "name": "h2_proxy_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9744,13 +9744,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_proxy_default_host_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9758,12 +9758,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_proxy_disappearing_server_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
+      "end2end_fixture_h2_proxy", 
       "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
@@ -9772,12 +9772,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_empty_batch_unsecure_test", 
+    "name": "h2_proxy_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
+      "end2end_fixture_h2_proxy", 
       "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
@@ -9786,13 +9786,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_proxy_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9800,13 +9800,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_invoke_large_request_unsecure_test", 
+    "name": "h2_proxy_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9814,13 +9814,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_concurrent_streams_unsecure_test", 
+    "name": "h2_proxy_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9828,13 +9828,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_message_length_unsecure_test", 
+    "name": "h2_proxy_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9842,13 +9842,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_no_op_unsecure_test", 
+    "name": "h2_proxy_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9856,13 +9856,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_ping_pong_streaming_unsecure_test", 
+    "name": "h2_proxy_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9870,13 +9870,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_registered_call_unsecure_test", 
+    "name": "h2_proxy_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9884,13 +9884,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_proxy_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9898,13 +9898,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_proxy_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9912,13 +9912,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_payload_unsecure_test", 
+    "name": "h2_proxy_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9926,13 +9926,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_proxy_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9940,13 +9940,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_proxy_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9954,13 +9954,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_flags_unsecure_test", 
+    "name": "h2_proxy_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9968,13 +9968,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_large_metadata_unsecure_test", 
+    "name": "h2_proxy_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9982,13 +9982,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_payload_unsecure_test", 
+    "name": "h2_proxy_simple_delayed_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9996,13 +9996,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_server_finishes_request_unsecure_test", 
+    "name": "h2_proxy_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_proxy", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10010,13 +10010,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_delayed_request_unsecure_test", 
+    "name": "h2_proxy_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10024,13 +10024,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_unsecure_test", 
+    "name": "h2_sockpair_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10038,13 +10038,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_sockpair_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10052,13 +10052,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_bad_hostname_unsecure_test", 
+    "name": "h2_sockpair_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10066,13 +10066,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_unsecure_test", 
+    "name": "h2_sockpair_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10080,13 +10080,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_sockpair_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10094,13 +10094,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_invoke_unsecure_test", 
+    "name": "h2_sockpair_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10108,13 +10108,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_before_invoke_unsecure_test", 
+    "name": "h2_sockpair_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10122,13 +10122,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_sockpair_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10136,13 +10136,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_census_simple_request_unsecure_test", 
+    "name": "h2_sockpair_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10150,13 +10150,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_channel_connectivity_unsecure_test", 
+    "name": "h2_sockpair_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10164,13 +10164,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_default_host_unsecure_test", 
+    "name": "h2_sockpair_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10178,13 +10178,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_disappearing_server_unsecure_test", 
+    "name": "h2_sockpair_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10192,13 +10192,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_sockpair_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10206,13 +10206,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_sockpair_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10220,13 +10220,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_empty_batch_unsecure_test", 
+    "name": "h2_sockpair_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10234,13 +10234,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_sockpair_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10248,13 +10248,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_invoke_large_request_unsecure_test", 
+    "name": "h2_sockpair_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10262,13 +10262,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_concurrent_streams_unsecure_test", 
+    "name": "h2_sockpair_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10276,13 +10276,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_message_length_unsecure_test", 
+    "name": "h2_sockpair_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10290,13 +10290,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_no_op_unsecure_test", 
+    "name": "h2_sockpair_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10304,13 +10304,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_ping_pong_streaming_unsecure_test", 
+    "name": "h2_sockpair_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10318,13 +10318,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_registered_call_unsecure_test", 
+    "name": "h2_sockpair_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10332,13 +10332,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10346,13 +10346,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10360,13 +10360,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_payload_unsecure_test", 
+    "name": "h2_sockpair_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10374,13 +10374,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10388,13 +10388,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_sockpair_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_sockpair", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10402,13 +10402,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_flags_unsecure_test", 
+    "name": "h2_sockpair_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10416,13 +10416,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_large_metadata_unsecure_test", 
+    "name": "h2_sockpair+trace_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10430,13 +10430,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10444,13 +10444,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_server_finishes_request_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10458,13 +10458,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_delayed_request_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10472,13 +10472,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_poll", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10486,13 +10486,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10500,13 +10500,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_bad_hostname_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10514,13 +10514,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_unsecure_test", 
+    "name": "h2_sockpair+trace_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10528,13 +10528,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_sockpair+trace_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10542,13 +10542,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_invoke_unsecure_test", 
+    "name": "h2_sockpair+trace_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10556,13 +10556,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_before_invoke_unsecure_test", 
+    "name": "h2_sockpair+trace_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10570,13 +10570,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_sockpair+trace_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10584,13 +10584,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_census_simple_request_unsecure_test", 
+    "name": "h2_sockpair+trace_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_default_host", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10598,13 +10598,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_default_host_unsecure_test", 
+    "name": "h2_sockpair+trace_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_disappearing_server", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10612,13 +10612,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_disappearing_server_unsecure_test", 
+    "name": "h2_sockpair+trace_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10626,13 +10626,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_sockpair+trace_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10640,13 +10640,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_sockpair+trace_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10654,13 +10654,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_empty_batch_unsecure_test", 
+    "name": "h2_sockpair+trace_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10668,13 +10668,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_sockpair+trace_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10682,13 +10682,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_invoke_large_request_unsecure_test", 
+    "name": "h2_sockpair+trace_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10696,13 +10696,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_max_message_length_unsecure_test", 
+    "name": "h2_sockpair+trace_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10710,13 +10710,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_no_op_unsecure_test", 
+    "name": "h2_sockpair+trace_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10724,13 +10724,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_ping_pong_streaming_unsecure_test", 
+    "name": "h2_sockpair+trace_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10738,13 +10738,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_registered_call_unsecure_test", 
+    "name": "h2_sockpair+trace_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10752,13 +10752,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10766,13 +10766,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10780,13 +10780,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair+trace", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10794,13 +10794,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10808,13 +10808,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_large_metadata_unsecure_test", 
+    "name": "h2_sockpair_1byte_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10822,13 +10822,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10836,13 +10836,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_server_finishes_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10850,13 +10850,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_delayed_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10864,13 +10864,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_fullstack_with_proxy", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10878,13 +10878,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10892,13 +10892,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_bad_hostname_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10906,13 +10906,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_unsecure_test", 
+    "name": "h2_sockpair_1byte_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10920,13 +10920,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_sockpair_1byte_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10934,13 +10934,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_invoke_unsecure_test", 
+    "name": "h2_sockpair_1byte_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10948,13 +10948,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_before_invoke_unsecure_test", 
+    "name": "h2_sockpair_1byte_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10962,13 +10962,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_sockpair_1byte_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10976,13 +10976,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_census_simple_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10990,13 +10990,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_sockpair_1byte_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11004,13 +11004,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_sockpair_1byte_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11018,13 +11018,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_empty_batch_unsecure_test", 
+    "name": "h2_sockpair_1byte_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11032,13 +11032,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_sockpair_1byte_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11046,13 +11046,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_invoke_large_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11060,13 +11060,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_concurrent_streams_unsecure_test", 
+    "name": "h2_sockpair_1byte_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11074,13 +11074,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_message_length_unsecure_test", 
+    "name": "h2_sockpair_1byte_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11088,13 +11088,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_no_op_unsecure_test", 
+    "name": "h2_sockpair_1byte_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11102,13 +11102,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_ping_pong_streaming_unsecure_test", 
+    "name": "h2_sockpair_1byte_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11116,13 +11116,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_registered_call_unsecure_test", 
+    "name": "h2_sockpair_1byte_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11130,13 +11130,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11144,13 +11144,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11158,13 +11158,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11172,13 +11172,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_sockpair_1byte", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11186,13 +11186,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11200,13 +11200,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_flags_unsecure_test", 
+    "name": "h2_uds_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11214,13 +11214,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_large_metadata_unsecure_test", 
+    "name": "h2_uds_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11228,13 +11228,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_payload_unsecure_test", 
+    "name": "h2_uds_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11242,13 +11242,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_server_finishes_request_unsecure_test", 
+    "name": "h2_uds_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11256,13 +11256,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_unsecure_test", 
+    "name": "h2_uds_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11270,13 +11270,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_uds_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11284,13 +11284,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_bad_hostname_unsecure_test", 
+    "name": "h2_uds_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11298,13 +11298,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_unsecure_test", 
+    "name": "h2_uds_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11312,13 +11312,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_uds_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11326,13 +11326,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_unsecure_test", 
+    "name": "h2_uds_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11340,13 +11340,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_unsecure_test", 
+    "name": "h2_uds_disappearing_server_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11354,13 +11354,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_uds_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11368,13 +11368,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_census_simple_request_unsecure_test", 
+    "name": "h2_uds_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11382,13 +11382,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_uds_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11396,13 +11396,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_uds_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11410,13 +11410,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_empty_batch_unsecure_test", 
+    "name": "h2_uds_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11424,13 +11424,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_uds_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_invoke_large_request", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11438,13 +11438,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_unsecure_test", 
+    "name": "h2_uds_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11452,13 +11452,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_unsecure_test", 
+    "name": "h2_uds_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11466,13 +11466,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_message_length_unsecure_test", 
+    "name": "h2_uds_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11480,12 +11480,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_no_op_unsecure_test", 
+    "name": "h2_uds_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
+      "end2end_fixture_h2_uds", 
       "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
@@ -11494,12 +11494,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_unsecure_test", 
+    "name": "h2_uds_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
+      "end2end_fixture_h2_uds", 
       "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
@@ -11508,13 +11508,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_registered_call_unsecure_test", 
+    "name": "h2_uds_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11522,13 +11522,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11536,13 +11536,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11550,13 +11550,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_unsecure_test", 
+    "name": "h2_uds_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11564,13 +11564,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11578,13 +11578,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_uds_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11592,13 +11592,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_flags_unsecure_test", 
+    "name": "h2_uds_simple_delayed_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11606,13 +11606,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_large_metadata_unsecure_test", 
+    "name": "h2_uds_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_uds", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11620,13 +11620,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_payload_unsecure_test", 
+    "name": "h2_uds_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11634,13 +11634,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_server_finishes_request_unsecure_test", 
+    "name": "h2_uds+poll_bad_hostname_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_simple_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11648,13 +11648,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_unsecure_test", 
+    "name": "h2_uds+poll_binary_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11662,13 +11662,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_uds+poll_cancel_after_accept_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_bad_hostname", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11676,13 +11676,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_bad_hostname_unsecure_test", 
+    "name": "h2_uds+poll_cancel_after_client_done_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11690,13 +11690,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_unsecure_test", 
+    "name": "h2_uds+poll_cancel_after_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_after_accept_and_writes_closed", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11704,13 +11704,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_uds+poll_cancel_before_invoke_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11718,13 +11718,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_invoke_unsecure_test", 
+    "name": "h2_uds+poll_cancel_in_a_vacuum_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_census_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11732,13 +11732,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_before_invoke_unsecure_test", 
+    "name": "h2_uds+poll_census_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11746,13 +11746,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_uds+poll_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_census_simple_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11760,13 +11760,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_census_simple_request_unsecure_test", 
+    "name": "h2_uds+poll_compressed_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11774,13 +11774,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_uds+poll_disappearing_server_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_early_server_shutdown_finishes_tags", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11788,13 +11788,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_uds+poll_empty_batch_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_empty_batch", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11802,13 +11802,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_empty_batch_unsecure_test", 
+    "name": "h2_uds+poll_graceful_server_shutdown_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11816,12 +11816,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_uds+poll_high_initial_seqno_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
+      "end2end_fixture_h2_uds+poll", 
       "end2end_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
@@ -11830,13 +11830,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_invoke_large_request_unsecure_test", 
+    "name": "h2_uds+poll_invoke_large_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11844,13 +11844,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_concurrent_streams_unsecure_test", 
+    "name": "h2_uds+poll_large_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_max_message_length", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11858,13 +11858,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_message_length_unsecure_test", 
+    "name": "h2_uds+poll_max_concurrent_streams_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_no_op", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11872,13 +11872,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_no_op_unsecure_test", 
+    "name": "h2_uds+poll_max_message_length_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11886,13 +11886,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_ping_pong_streaming_unsecure_test", 
+    "name": "h2_uds+poll_metadata_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_registered_call", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11900,13 +11900,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_registered_call_unsecure_test", 
+    "name": "h2_uds+poll_no_op_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_binary_metadata_and_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11914,13 +11914,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds+poll_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_metadata_and_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11928,13 +11928,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds+poll_ping_pong_streaming_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11942,13 +11942,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_payload_unsecure_test", 
+    "name": "h2_uds+poll_registered_call_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_response_with_trailing_metadata_and_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11956,13 +11956,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds+poll_request_with_flags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_compressed_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11970,13 +11970,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_uds+poll_request_with_payload_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_flags", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11984,13 +11984,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_flags_unsecure_test", 
+    "name": "h2_uds+poll_server_finishes_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_large_metadata", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11998,13 +11998,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_large_metadata_unsecure_test", 
+    "name": "h2_uds+poll_shutdown_finishes_calls_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_request_with_payload", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12012,13 +12012,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_payload_unsecure_test", 
+    "name": "h2_uds+poll_shutdown_finishes_tags_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_server_finishes_request", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12026,12 +12026,12 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_server_finishes_request_unsecure_test", 
+    "name": "h2_uds+poll_simple_delayed_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
+      "end2end_fixture_h2_uds+poll", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -12040,13 +12040,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_unsecure_test", 
+    "name": "h2_uds+poll_simple_request_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
-      "end2end_test_simple_request_with_high_initial_sequence_number", 
+      "end2end_fixture_h2_uds+poll", 
+      "end2end_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12054,7 +12054,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_uds+poll_trailing_metadata_nosec_test", 
     "src": []
   }, 
   {
@@ -13590,37 +13590,37 @@
   }, 
   {
     "deps": [
-      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fake_security", 
+    "name": "end2end_fixture_h2_compress", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fake_security.c"
+      "test/core/end2end/fixtures/h2_compress.c"
     ]
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fullstack", 
+    "name": "end2end_fixture_h2_fakesec", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fullstack.c"
+      "test/core/end2end/fixtures/h2_fakesec.c"
     ]
   }, 
   {
@@ -13634,10 +13634,10 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fullstack_compression", 
+    "name": "end2end_fixture_h2_full", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fullstack_compression.c"
+      "test/core/end2end/fixtures/h2_full.c"
     ]
   }, 
   {
@@ -13651,27 +13651,28 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fullstack_uds_posix", 
+    "name": "end2end_fixture_h2_full+poll", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c"
+      "test/core/end2end/fixtures/h2_full+poll.c"
     ]
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
+    "name": "end2end_fixture_h2_oauth2", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fullstack_uds_posix_with_poll.c"
+      "test/core/end2end/fixtures/h2_oauth2.c"
     ]
   }, 
   {
@@ -13685,10 +13686,10 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fullstack_with_poll", 
+    "name": "end2end_fixture_h2_proxy", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fullstack_with_poll.c"
+      "test/core/end2end/fixtures/h2_proxy.c"
     ]
   }, 
   {
@@ -13702,46 +13703,44 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_fullstack_with_proxy", 
+    "name": "end2end_fixture_h2_sockpair", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_fullstack_with_proxy.c"
+      "test/core/end2end/fixtures/h2_sockpair.c"
     ]
   }, 
   {
     "deps": [
-      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_simple_ssl_fullstack", 
+    "name": "end2end_fixture_h2_sockpair+trace", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c"
+      "test/core/end2end/fixtures/h2_sockpair+trace.c"
     ]
   }, 
   {
     "deps": [
-      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_simple_ssl_fullstack_with_poll", 
+    "name": "end2end_fixture_h2_sockpair_1byte", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c"
+      "test/core/end2end/fixtures/h2_sockpair_1byte.c"
     ]
   }, 
   {
@@ -13756,10 +13755,10 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_simple_ssl_fullstack_with_proxy", 
+    "name": "end2end_fixture_h2_ssl", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_proxy.c"
+      "test/core/end2end/fixtures/h2_ssl.c"
     ]
   }, 
   {
@@ -13774,27 +13773,28 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack", 
+    "name": "end2end_fixture_h2_ssl+poll", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c"
+      "test/core/end2end/fixtures/h2_ssl+poll.c"
     ]
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_socket_pair", 
+    "name": "end2end_fixture_h2_ssl_proxy", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_socket_pair.c"
+      "test/core/end2end/fixtures/h2_ssl_proxy.c"
     ]
   }, 
   {
@@ -13808,10 +13808,10 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_socket_pair_one_byte_at_a_time", 
+    "name": "end2end_fixture_h2_uds", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.c"
+      "test/core/end2end/fixtures/h2_uds.c"
     ]
   }, 
   {
@@ -13825,10 +13825,10 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_chttp2_socket_pair_with_grpc_trace", 
+    "name": "end2end_fixture_h2_uds+poll", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c"
+      "test/core/end2end/fixtures/h2_uds+poll.c"
     ]
   }, 
   {
@@ -13862,29 +13862,30 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_after_accept", 
+    "name": "end2end_test_binary_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_after_accept.c", 
+      "test/core/end2end/tests/binary_metadata.c", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_after_accept_and_writes_closed", 
+    "name": "end2end_test_call_creds", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_after_accept_and_writes_closed.c", 
+      "test/core/end2end/tests/call_creds.c", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
@@ -13900,10 +13901,10 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_after_invoke", 
+    "name": "end2end_test_cancel_after_accept", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_after_invoke.c", 
+      "test/core/end2end/tests/cancel_after_accept.c", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
@@ -13919,10 +13920,10 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_before_invoke", 
+    "name": "end2end_test_cancel_after_client_done", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_before_invoke.c", 
+      "test/core/end2end/tests/cancel_after_client_done.c", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
@@ -13938,10 +13939,10 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_in_a_vacuum", 
+    "name": "end2end_test_cancel_after_invoke", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_in_a_vacuum.c", 
+      "test/core/end2end/tests/cancel_after_invoke.c", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
@@ -13957,11 +13958,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_census_simple_request", 
+    "name": "end2end_test_cancel_before_invoke", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/census_simple_request.c"
+      "test/core/end2end/tests/cancel_before_invoke.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
   {
@@ -13976,11 +13977,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_channel_connectivity", 
+    "name": "end2end_test_cancel_in_a_vacuum", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
-      "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/channel_connectivity.c"
+      "test/core/end2end/tests/cancel_in_a_vacuum.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
     ]
   }, 
   {
@@ -13995,11 +13996,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_default_host", 
+    "name": "end2end_test_census_simple_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/default_host.c"
+      "test/core/end2end/tests/census_simple_request.c"
     ]
   }, 
   {
@@ -14014,11 +14015,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_disappearing_server", 
+    "name": "end2end_test_channel_connectivity", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/disappearing_server.c"
+      "test/core/end2end/tests/channel_connectivity.c"
     ]
   }, 
   {
@@ -14033,11 +14034,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_early_server_shutdown_finishes_inflight_calls", 
+    "name": "end2end_test_compressed_payload", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c"
+      "test/core/end2end/tests/compressed_payload.c"
     ]
   }, 
   {
@@ -14052,11 +14053,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_early_server_shutdown_finishes_tags", 
+    "name": "end2end_test_default_host", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/early_server_shutdown_finishes_tags.c"
+      "test/core/end2end/tests/default_host.c"
     ]
   }, 
   {
@@ -14071,11 +14072,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_empty_batch", 
+    "name": "end2end_test_disappearing_server", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/empty_batch.c"
+      "test/core/end2end/tests/disappearing_server.c"
     ]
   }, 
   {
@@ -14090,11 +14091,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_graceful_server_shutdown", 
+    "name": "end2end_test_empty_batch", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/graceful_server_shutdown.c"
+      "test/core/end2end/tests/empty_batch.c"
     ]
   }, 
   {
@@ -14109,11 +14110,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_invoke_large_request", 
+    "name": "end2end_test_graceful_server_shutdown", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/invoke_large_request.c"
+      "test/core/end2end/tests/graceful_server_shutdown.c"
     ]
   }, 
   {
@@ -14128,11 +14129,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_max_concurrent_streams", 
+    "name": "end2end_test_high_initial_seqno", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/max_concurrent_streams.c"
+      "test/core/end2end/tests/high_initial_seqno.c"
     ]
   }, 
   {
@@ -14147,11 +14148,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_max_message_length", 
+    "name": "end2end_test_invoke_large_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/max_message_length.c"
+      "test/core/end2end/tests/invoke_large_request.c"
     ]
   }, 
   {
@@ -14166,11 +14167,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_no_op", 
+    "name": "end2end_test_large_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/no_op.c"
+      "test/core/end2end/tests/large_metadata.c"
     ]
   }, 
   {
@@ -14185,11 +14186,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_ping_pong_streaming", 
+    "name": "end2end_test_max_concurrent_streams", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/ping_pong_streaming.c"
+      "test/core/end2end/tests/max_concurrent_streams.c"
     ]
   }, 
   {
@@ -14204,11 +14205,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_registered_call", 
+    "name": "end2end_test_max_message_length", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/registered_call.c"
+      "test/core/end2end/tests/max_message_length.c"
     ]
   }, 
   {
@@ -14223,11 +14224,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_response_with_binary_metadata_and_payload", 
+    "name": "end2end_test_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c"
+      "test/core/end2end/tests/metadata.c"
     ]
   }, 
   {
@@ -14242,11 +14243,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_response_with_metadata_and_payload", 
+    "name": "end2end_test_no_op", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_response_with_metadata_and_payload.c"
+      "test/core/end2end/tests/no_op.c"
     ]
   }, 
   {
@@ -14261,31 +14262,30 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_response_with_payload", 
+    "name": "end2end_test_payload", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_response_with_payload.c"
+      "test/core/end2end/tests/payload.c"
     ]
   }, 
   {
     "deps": [
-      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_response_with_payload_and_call_creds", 
+    "name": "end2end_test_ping_pong_streaming", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_response_with_payload_and_call_creds.c"
+      "test/core/end2end/tests/ping_pong_streaming.c"
     ]
   }, 
   {
@@ -14300,11 +14300,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_response_with_trailing_metadata_and_payload", 
+    "name": "end2end_test_registered_call", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c"
+      "test/core/end2end/tests/registered_call.c"
     ]
   }, 
   {
@@ -14319,11 +14319,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_with_compressed_payload", 
+    "name": "end2end_test_request_with_flags", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_with_compressed_payload.c"
+      "test/core/end2end/tests/request_with_flags.c"
     ]
   }, 
   {
@@ -14338,11 +14338,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_with_flags", 
+    "name": "end2end_test_request_with_payload", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_with_flags.c"
+      "test/core/end2end/tests/request_with_payload.c"
     ]
   }, 
   {
@@ -14357,11 +14357,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_with_large_metadata", 
+    "name": "end2end_test_server_finishes_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_with_large_metadata.c"
+      "test/core/end2end/tests/server_finishes_request.c"
     ]
   }, 
   {
@@ -14376,11 +14376,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_with_payload", 
+    "name": "end2end_test_shutdown_finishes_calls", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/request_with_payload.c"
+      "test/core/end2end/tests/shutdown_finishes_calls.c"
     ]
   }, 
   {
@@ -14395,11 +14395,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_server_finishes_request", 
+    "name": "end2end_test_shutdown_finishes_tags", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/server_finishes_request.c"
+      "test/core/end2end/tests/shutdown_finishes_tags.c"
     ]
   }, 
   {
@@ -14452,11 +14452,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_simple_request_with_high_initial_sequence_number", 
+    "name": "end2end_test_trailing_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
-      "test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c"
+      "test/core/end2end/tests/trailing_metadata.c"
     ]
   }, 
   {
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index f1c57190af..11fc4951df 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -1601,32 +1601,27 @@
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c++", 
     "name": "zookeeper_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_bad_hostname_test", 
+    "name": "h2_compress_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1637,13 +1632,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_after_accept_test", 
+    "name": "h2_compress_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1654,13 +1650,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_compress_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1671,13 +1668,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_after_invoke_test", 
+    "name": "h2_compress_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1688,13 +1686,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_before_invoke_test", 
+    "name": "h2_compress_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1705,13 +1704,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_cancel_in_a_vacuum_test", 
+    "name": "h2_compress_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1722,13 +1722,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_census_simple_request_test", 
+    "name": "h2_compress_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1739,13 +1740,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_channel_connectivity_test", 
+    "name": "h2_compress_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1756,13 +1758,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_default_host_test", 
+    "name": "h2_compress_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1773,13 +1776,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_disappearing_server_test", 
+    "name": "h2_compress_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1790,13 +1794,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_compress_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1807,13 +1812,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_compress_default_host_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1824,13 +1830,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_empty_batch_test", 
+    "name": "h2_compress_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1841,13 +1848,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_graceful_server_shutdown_test", 
+    "name": "h2_compress_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1858,13 +1866,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_invoke_large_request_test", 
+    "name": "h2_compress_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1875,13 +1884,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_max_concurrent_streams_test", 
+    "name": "h2_compress_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1892,13 +1902,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_max_message_length_test", 
+    "name": "h2_compress_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1909,13 +1920,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_no_op_test", 
+    "name": "h2_compress_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1926,13 +1938,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_ping_pong_streaming_test", 
+    "name": "h2_compress_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1943,13 +1956,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_registered_call_test", 
+    "name": "h2_compress_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1960,13 +1974,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_compress_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1977,13 +1992,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_metadata_and_payload_test", 
+    "name": "h2_compress_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1994,13 +2010,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_payload_test", 
+    "name": "h2_compress_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2011,13 +2028,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_compress_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2028,13 +2046,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_compress_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2045,13 +2064,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_compressed_payload_test", 
+    "name": "h2_compress_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2062,13 +2082,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_flags_test", 
+    "name": "h2_compress_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2079,13 +2100,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_large_metadata_test", 
+    "name": "h2_compress_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2096,13 +2118,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_request_with_payload_test", 
+    "name": "h2_compress_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2113,13 +2136,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_server_finishes_request_test", 
+    "name": "h2_compress_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2130,13 +2154,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_simple_delayed_request_test", 
+    "name": "h2_compress_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2147,13 +2172,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_simple_request_test", 
+    "name": "h2_compress_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2164,13 +2190,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fake_security_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_compress_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2181,14 +2208,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_bad_hostname_test", 
+    "name": "h2_fakesec_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2199,14 +2225,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_test", 
+    "name": "h2_fakesec_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2217,14 +2242,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_fakesec_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2235,14 +2259,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_invoke_test", 
+    "name": "h2_fakesec_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2253,14 +2276,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_before_invoke_test", 
+    "name": "h2_fakesec_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2271,14 +2293,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_in_a_vacuum_test", 
+    "name": "h2_fakesec_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2289,14 +2310,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_census_simple_request_test", 
+    "name": "h2_fakesec_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2307,14 +2327,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_channel_connectivity_test", 
+    "name": "h2_fakesec_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2325,14 +2344,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_default_host_test", 
+    "name": "h2_fakesec_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2343,14 +2361,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_disappearing_server_test", 
+    "name": "h2_fakesec_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2361,14 +2378,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_fakesec_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2379,14 +2395,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_fakesec_default_host_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2397,14 +2412,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_empty_batch_test", 
+    "name": "h2_fakesec_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2415,14 +2429,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_graceful_server_shutdown_test", 
+    "name": "h2_fakesec_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2433,14 +2446,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_invoke_large_request_test", 
+    "name": "h2_fakesec_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2451,14 +2463,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_max_concurrent_streams_test", 
+    "name": "h2_fakesec_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2469,14 +2480,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_max_message_length_test", 
+    "name": "h2_fakesec_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2487,14 +2497,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_no_op_test", 
+    "name": "h2_fakesec_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2505,14 +2514,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_ping_pong_streaming_test", 
+    "name": "h2_fakesec_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2523,14 +2531,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_registered_call_test", 
+    "name": "h2_fakesec_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2541,14 +2548,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_fakesec_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2559,14 +2565,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_metadata_and_payload_test", 
+    "name": "h2_fakesec_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2577,14 +2582,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_payload_test", 
+    "name": "h2_fakesec_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2595,14 +2599,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_fakesec_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2613,14 +2616,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_fakesec_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2631,14 +2633,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_compressed_payload_test", 
+    "name": "h2_fakesec_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2649,14 +2650,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_flags_test", 
+    "name": "h2_fakesec_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2667,14 +2667,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_large_metadata_test", 
+    "name": "h2_fakesec_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2685,14 +2684,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_payload_test", 
+    "name": "h2_fakesec_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2703,14 +2701,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_server_finishes_request_test", 
+    "name": "h2_fakesec_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2721,14 +2718,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_delayed_request_test", 
+    "name": "h2_fakesec_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2739,14 +2735,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_test", 
+    "name": "h2_fakesec_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2757,14 +2752,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_fakesec_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2782,7 +2776,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_bad_hostname_test", 
+    "name": "h2_full_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2800,7 +2794,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_test", 
+    "name": "h2_full_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2818,7 +2812,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_full_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2836,7 +2830,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_invoke_test", 
+    "name": "h2_full_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2854,7 +2848,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_before_invoke_test", 
+    "name": "h2_full_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2872,7 +2866,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_in_a_vacuum_test", 
+    "name": "h2_full_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2890,7 +2884,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_census_simple_request_test", 
+    "name": "h2_full_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2908,7 +2902,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_channel_connectivity_test", 
+    "name": "h2_full_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2926,7 +2920,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_default_host_test", 
+    "name": "h2_full_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2944,7 +2938,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_disappearing_server_test", 
+    "name": "h2_full_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2962,7 +2956,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_full_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2980,7 +2974,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_full_default_host_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2998,7 +2992,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_empty_batch_test", 
+    "name": "h2_full_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3016,7 +3010,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_graceful_server_shutdown_test", 
+    "name": "h2_full_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3034,7 +3028,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_invoke_large_request_test", 
+    "name": "h2_full_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3052,7 +3046,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_concurrent_streams_test", 
+    "name": "h2_full_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3070,7 +3064,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_message_length_test", 
+    "name": "h2_full_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3088,7 +3082,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_no_op_test", 
+    "name": "h2_full_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3106,7 +3100,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_ping_pong_streaming_test", 
+    "name": "h2_full_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3124,7 +3118,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_registered_call_test", 
+    "name": "h2_full_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3142,7 +3136,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_full_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3160,7 +3154,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_metadata_and_payload_test", 
+    "name": "h2_full_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3178,7 +3172,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_payload_test", 
+    "name": "h2_full_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3196,7 +3190,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_full_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3214,7 +3208,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_full_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3232,7 +3226,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_compressed_payload_test", 
+    "name": "h2_full_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3250,7 +3244,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_flags_test", 
+    "name": "h2_full_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3268,7 +3262,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_large_metadata_test", 
+    "name": "h2_full_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3286,7 +3280,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_payload_test", 
+    "name": "h2_full_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3304,7 +3298,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_server_finishes_request_test", 
+    "name": "h2_full_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3322,7 +3316,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_delayed_request_test", 
+    "name": "h2_full_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3340,7 +3334,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_test", 
+    "name": "h2_full_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3358,7 +3352,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_full_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3368,524 +3362,12 @@
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_bad_hostname_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_and_writes_closed_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_invoke_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_before_invoke_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_in_a_vacuum_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_channel_connectivity_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_disappearing_server_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_inflight_calls_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_tags_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_empty_batch_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_graceful_server_shutdown_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_invoke_large_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_concurrent_streams_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_message_length_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_no_op_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_ping_pong_streaming_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_registered_call_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_binary_metadata_and_payload_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_metadata_and_payload_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_and_call_creds_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_trailing_metadata_and_payload_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_compressed_payload_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_flags_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_large_metadata_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_payload_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_server_finishes_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_delayed_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_with_high_initial_sequence_number_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ]
-  }, 
-  {
-    "ci_platforms": [
       "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_bad_hostname_test", 
+    "name": "h2_full+poll_bad_hostname_test", 
     "platforms": [
       "linux"
     ]
@@ -3897,7 +3379,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_test", 
+    "name": "h2_full+poll_binary_metadata_test", 
     "platforms": [
       "linux"
     ]
@@ -3909,7 +3391,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_full+poll_call_creds_test", 
     "platforms": [
       "linux"
     ]
@@ -3921,7 +3403,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_invoke_test", 
+    "name": "h2_full+poll_cancel_after_accept_test", 
     "platforms": [
       "linux"
     ]
@@ -3933,7 +3415,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_before_invoke_test", 
+    "name": "h2_full+poll_cancel_after_client_done_test", 
     "platforms": [
       "linux"
     ]
@@ -3945,7 +3427,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_in_a_vacuum_test", 
+    "name": "h2_full+poll_cancel_after_invoke_test", 
     "platforms": [
       "linux"
     ]
@@ -3957,7 +3439,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_census_simple_request_test", 
+    "name": "h2_full+poll_cancel_before_invoke_test", 
     "platforms": [
       "linux"
     ]
@@ -3969,7 +3451,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_channel_connectivity_test", 
+    "name": "h2_full+poll_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux"
     ]
@@ -3981,7 +3463,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_disappearing_server_test", 
+    "name": "h2_full+poll_census_simple_request_test", 
     "platforms": [
       "linux"
     ]
@@ -3993,7 +3475,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_full+poll_channel_connectivity_test", 
     "platforms": [
       "linux"
     ]
@@ -4005,7 +3487,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_full+poll_compressed_payload_test", 
     "platforms": [
       "linux"
     ]
@@ -4017,7 +3499,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_empty_batch_test", 
+    "name": "h2_full+poll_default_host_test", 
     "platforms": [
       "linux"
     ]
@@ -4029,7 +3511,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_graceful_server_shutdown_test", 
+    "name": "h2_full+poll_disappearing_server_test", 
     "platforms": [
       "linux"
     ]
@@ -4041,7 +3523,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_invoke_large_request_test", 
+    "name": "h2_full+poll_empty_batch_test", 
     "platforms": [
       "linux"
     ]
@@ -4053,7 +3535,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_concurrent_streams_test", 
+    "name": "h2_full+poll_graceful_server_shutdown_test", 
     "platforms": [
       "linux"
     ]
@@ -4065,7 +3547,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_message_length_test", 
+    "name": "h2_full+poll_high_initial_seqno_test", 
     "platforms": [
       "linux"
     ]
@@ -4077,7 +3559,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_no_op_test", 
+    "name": "h2_full+poll_invoke_large_request_test", 
     "platforms": [
       "linux"
     ]
@@ -4089,7 +3571,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_ping_pong_streaming_test", 
+    "name": "h2_full+poll_large_metadata_test", 
     "platforms": [
       "linux"
     ]
@@ -4101,7 +3583,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_registered_call_test", 
+    "name": "h2_full+poll_max_concurrent_streams_test", 
     "platforms": [
       "linux"
     ]
@@ -4113,7 +3595,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_full+poll_max_message_length_test", 
     "platforms": [
       "linux"
     ]
@@ -4125,7 +3607,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_metadata_and_payload_test", 
+    "name": "h2_full+poll_metadata_test", 
     "platforms": [
       "linux"
     ]
@@ -4137,7 +3619,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_payload_test", 
+    "name": "h2_full+poll_no_op_test", 
     "platforms": [
       "linux"
     ]
@@ -4149,7 +3631,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_full+poll_payload_test", 
     "platforms": [
       "linux"
     ]
@@ -4161,7 +3643,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_full+poll_ping_pong_streaming_test", 
     "platforms": [
       "linux"
     ]
@@ -4173,7 +3655,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_compressed_payload_test", 
+    "name": "h2_full+poll_registered_call_test", 
     "platforms": [
       "linux"
     ]
@@ -4185,7 +3667,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_flags_test", 
+    "name": "h2_full+poll_request_with_flags_test", 
     "platforms": [
       "linux"
     ]
@@ -4197,7 +3679,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_large_metadata_test", 
+    "name": "h2_full+poll_request_with_payload_test", 
     "platforms": [
       "linux"
     ]
@@ -4209,7 +3691,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_payload_test", 
+    "name": "h2_full+poll_server_finishes_request_test", 
     "platforms": [
       "linux"
     ]
@@ -4221,7 +3703,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_server_finishes_request_test", 
+    "name": "h2_full+poll_shutdown_finishes_calls_test", 
     "platforms": [
       "linux"
     ]
@@ -4233,7 +3715,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_delayed_request_test", 
+    "name": "h2_full+poll_shutdown_finishes_tags_test", 
     "platforms": [
       "linux"
     ]
@@ -4245,7 +3727,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_test", 
+    "name": "h2_full+poll_simple_delayed_request_test", 
     "platforms": [
       "linux"
     ]
@@ -4257,7 +3739,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_full+poll_simple_request_test", 
     "platforms": [
       "linux"
     ]
@@ -4269,393 +3751,553 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_bad_hostname_test", 
+    "name": "h2_full+poll_trailing_metadata_test", 
     "platforms": [
       "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_test", 
+    "name": "h2_oauth2_bad_hostname_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_oauth2_binary_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_invoke_test", 
+    "name": "h2_oauth2_call_creds_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_before_invoke_test", 
+    "name": "h2_oauth2_cancel_after_accept_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_in_a_vacuum_test", 
+    "name": "h2_oauth2_cancel_after_client_done_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_census_simple_request_test", 
+    "name": "h2_oauth2_cancel_after_invoke_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_channel_connectivity_test", 
+    "name": "h2_oauth2_cancel_before_invoke_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_default_host_test", 
+    "name": "h2_oauth2_cancel_in_a_vacuum_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_disappearing_server_test", 
+    "name": "h2_oauth2_census_simple_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_oauth2_channel_connectivity_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_oauth2_compressed_payload_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_empty_batch_test", 
+    "name": "h2_oauth2_default_host_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_graceful_server_shutdown_test", 
+    "name": "h2_oauth2_disappearing_server_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_invoke_large_request_test", 
+    "name": "h2_oauth2_empty_batch_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_concurrent_streams_test", 
+    "name": "h2_oauth2_graceful_server_shutdown_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_message_length_test", 
+    "name": "h2_oauth2_high_initial_seqno_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_no_op_test", 
+    "name": "h2_oauth2_invoke_large_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_ping_pong_streaming_test", 
+    "name": "h2_oauth2_large_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_registered_call_test", 
+    "name": "h2_oauth2_max_concurrent_streams_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_oauth2_max_message_length_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_metadata_and_payload_test", 
+    "name": "h2_oauth2_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_payload_test", 
+    "name": "h2_oauth2_no_op_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_oauth2_payload_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_oauth2_ping_pong_streaming_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_compressed_payload_test", 
+    "name": "h2_oauth2_registered_call_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_flags_test", 
+    "name": "h2_oauth2_request_with_flags_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_large_metadata_test", 
+    "name": "h2_oauth2_request_with_payload_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_payload_test", 
+    "name": "h2_oauth2_server_finishes_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_server_finishes_request_test", 
+    "name": "h2_oauth2_shutdown_finishes_calls_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_delayed_request_test", 
+    "name": "h2_oauth2_shutdown_finishes_tags_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_test", 
+    "name": "h2_oauth2_simple_delayed_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_oauth2_simple_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
@@ -4667,7 +4309,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_bad_hostname_test", 
+    "name": "h2_oauth2_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4684,7 +4326,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_test", 
+    "name": "h2_proxy_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4701,7 +4343,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_proxy_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4718,7 +4360,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_invoke_test", 
+    "name": "h2_proxy_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4735,7 +4377,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_before_invoke_test", 
+    "name": "h2_proxy_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4752,7 +4394,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_in_a_vacuum_test", 
+    "name": "h2_proxy_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4769,7 +4411,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_census_simple_request_test", 
+    "name": "h2_proxy_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4786,7 +4428,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_default_host_test", 
+    "name": "h2_proxy_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4803,7 +4445,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_disappearing_server_test", 
+    "name": "h2_proxy_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4820,7 +4462,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_proxy_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4837,7 +4479,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_proxy_default_host_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4854,7 +4496,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_empty_batch_test", 
+    "name": "h2_proxy_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4871,7 +4513,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_graceful_server_shutdown_test", 
+    "name": "h2_proxy_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4888,7 +4530,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_invoke_large_request_test", 
+    "name": "h2_proxy_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4905,7 +4547,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_max_message_length_test", 
+    "name": "h2_proxy_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4922,7 +4564,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_no_op_test", 
+    "name": "h2_proxy_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4939,7 +4581,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_ping_pong_streaming_test", 
+    "name": "h2_proxy_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4956,7 +4598,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_registered_call_test", 
+    "name": "h2_proxy_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4973,7 +4615,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_proxy_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4990,7 +4632,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_metadata_and_payload_test", 
+    "name": "h2_proxy_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5007,7 +4649,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_payload_test", 
+    "name": "h2_proxy_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5024,7 +4666,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_proxy_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5041,7 +4683,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_proxy_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5058,7 +4700,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_large_metadata_test", 
+    "name": "h2_proxy_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5075,7 +4717,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_payload_test", 
+    "name": "h2_proxy_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5092,7 +4734,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_server_finishes_request_test", 
+    "name": "h2_proxy_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5109,7 +4751,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_delayed_request_test", 
+    "name": "h2_proxy_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5126,7 +4768,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_test", 
+    "name": "h2_proxy_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5143,7 +4785,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_proxy_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5154,14 +4796,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_bad_hostname_test", 
+    "name": "h2_proxy_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5172,14 +4813,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_after_accept_test", 
+    "name": "h2_sockpair_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5190,14 +4830,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_sockpair_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5208,14 +4847,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_after_invoke_test", 
+    "name": "h2_sockpair_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5226,14 +4864,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_before_invoke_test", 
+    "name": "h2_sockpair_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5244,14 +4881,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_cancel_in_a_vacuum_test", 
+    "name": "h2_sockpair_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5262,14 +4898,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_census_simple_request_test", 
+    "name": "h2_sockpair_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5280,14 +4915,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_channel_connectivity_test", 
+    "name": "h2_sockpair_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5298,14 +4932,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_default_host_test", 
+    "name": "h2_sockpair_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5316,14 +4949,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_disappearing_server_test", 
+    "name": "h2_sockpair_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5334,14 +4966,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_sockpair_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5352,14 +4983,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_sockpair_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5370,14 +5000,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_empty_batch_test", 
+    "name": "h2_sockpair_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5388,14 +5017,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_graceful_server_shutdown_test", 
+    "name": "h2_sockpair_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5406,14 +5034,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_invoke_large_request_test", 
+    "name": "h2_sockpair_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5424,14 +5051,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_max_concurrent_streams_test", 
+    "name": "h2_sockpair_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5442,14 +5068,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_max_message_length_test", 
+    "name": "h2_sockpair_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5460,14 +5085,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_no_op_test", 
+    "name": "h2_sockpair_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5478,14 +5102,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_ping_pong_streaming_test", 
+    "name": "h2_sockpair_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5496,14 +5119,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_registered_call_test", 
+    "name": "h2_sockpair_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5514,14 +5136,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_sockpair_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5532,14 +5153,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_metadata_and_payload_test", 
+    "name": "h2_sockpair_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5550,14 +5170,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_payload_test", 
+    "name": "h2_sockpair_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5568,14 +5187,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_sockpair_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5586,14 +5204,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_sockpair_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5604,14 +5221,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_compressed_payload_test", 
+    "name": "h2_sockpair_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5622,14 +5238,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_flags_test", 
+    "name": "h2_sockpair_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5640,14 +5255,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_large_metadata_test", 
+    "name": "h2_sockpair_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5658,14 +5272,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_with_payload_test", 
+    "name": "h2_sockpair_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5676,14 +5289,13 @@
   {
     "ci_platforms": [
       "linux", 
-      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_server_finishes_request_test", 
+    "name": "h2_sockpair_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5701,7 +5313,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_simple_delayed_request_test", 
+    "name": "h2_sockpair+trace_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5719,7 +5331,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_simple_request_test", 
+    "name": "h2_sockpair+trace_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5737,7 +5349,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_sockpair+trace_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -5747,398 +5359,589 @@
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_bad_hostname_test", 
+    "name": "h2_sockpair+trace_cancel_after_accept_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_after_accept_test", 
+    "name": "h2_sockpair+trace_cancel_after_client_done_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_sockpair+trace_cancel_after_invoke_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_after_invoke_test", 
+    "name": "h2_sockpair+trace_cancel_before_invoke_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_before_invoke_test", 
+    "name": "h2_sockpair+trace_cancel_in_a_vacuum_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_cancel_in_a_vacuum_test", 
+    "name": "h2_sockpair+trace_census_simple_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_census_simple_request_test", 
+    "name": "h2_sockpair+trace_compressed_payload_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_channel_connectivity_test", 
+    "name": "h2_sockpair+trace_empty_batch_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_default_host_test", 
+    "name": "h2_sockpair+trace_graceful_server_shutdown_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_disappearing_server_test", 
+    "name": "h2_sockpair+trace_high_initial_seqno_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_sockpair+trace_invoke_large_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_sockpair+trace_large_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_empty_batch_test", 
+    "name": "h2_sockpair+trace_max_concurrent_streams_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_graceful_server_shutdown_test", 
+    "name": "h2_sockpair+trace_max_message_length_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_invoke_large_request_test", 
+    "name": "h2_sockpair+trace_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_max_concurrent_streams_test", 
+    "name": "h2_sockpair+trace_no_op_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_max_message_length_test", 
+    "name": "h2_sockpair+trace_payload_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_no_op_test", 
+    "name": "h2_sockpair+trace_ping_pong_streaming_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_ping_pong_streaming_test", 
+    "name": "h2_sockpair+trace_registered_call_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_registered_call_test", 
+    "name": "h2_sockpair+trace_request_with_flags_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_sockpair+trace_request_with_payload_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_metadata_and_payload_test", 
+    "name": "h2_sockpair+trace_server_finishes_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_payload_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_calls_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_tags_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_sockpair+trace_simple_request_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_compressed_payload_test", 
+    "name": "h2_sockpair+trace_trailing_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_flags_test", 
+    "name": "h2_sockpair_1byte_bad_hostname_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_large_metadata_test", 
+    "name": "h2_sockpair_1byte_binary_metadata_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_payload_test", 
+    "name": "h2_sockpair_1byte_call_creds_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_server_finishes_request_test", 
+    "name": "h2_sockpair_1byte_cancel_after_accept_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_simple_delayed_request_test", 
+    "name": "h2_sockpair_1byte_cancel_after_client_done_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_simple_request_test", 
+    "name": "h2_sockpair_1byte_cancel_after_invoke_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_poll_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_sockpair_1byte_cancel_before_invoke_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
@@ -6150,7 +5953,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_bad_hostname_test", 
+    "name": "h2_sockpair_1byte_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6167,7 +5970,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_after_accept_test", 
+    "name": "h2_sockpair_1byte_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6184,7 +5987,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_sockpair_1byte_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6201,7 +6004,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_after_invoke_test", 
+    "name": "h2_sockpair_1byte_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6218,7 +6021,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_before_invoke_test", 
+    "name": "h2_sockpair_1byte_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6235,7 +6038,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_cancel_in_a_vacuum_test", 
+    "name": "h2_sockpair_1byte_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6252,7 +6055,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_census_simple_request_test", 
+    "name": "h2_sockpair_1byte_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6269,7 +6072,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_default_host_test", 
+    "name": "h2_sockpair_1byte_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6286,7 +6089,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_disappearing_server_test", 
+    "name": "h2_sockpair_1byte_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6303,7 +6106,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_sockpair_1byte_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6320,7 +6123,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_sockpair_1byte_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6337,7 +6140,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_empty_batch_test", 
+    "name": "h2_sockpair_1byte_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6354,7 +6157,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_graceful_server_shutdown_test", 
+    "name": "h2_sockpair_1byte_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6371,7 +6174,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_invoke_large_request_test", 
+    "name": "h2_sockpair_1byte_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6388,7 +6191,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_max_message_length_test", 
+    "name": "h2_sockpair_1byte_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6405,7 +6208,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_no_op_test", 
+    "name": "h2_sockpair_1byte_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6422,7 +6225,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_ping_pong_streaming_test", 
+    "name": "h2_sockpair_1byte_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6439,7 +6242,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_registered_call_test", 
+    "name": "h2_sockpair_1byte_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6456,7 +6259,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6473,7 +6276,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_metadata_and_payload_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6490,7 +6293,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_payload_test", 
+    "name": "h2_sockpair_1byte_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6507,7 +6310,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_sockpair_1byte_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6518,13 +6321,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6535,13 +6339,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_with_large_metadata_test", 
+    "name": "h2_ssl_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6552,13 +6357,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_request_with_payload_test", 
+    "name": "h2_ssl_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6569,13 +6375,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_server_finishes_request_test", 
+    "name": "h2_ssl_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6586,13 +6393,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_simple_delayed_request_test", 
+    "name": "h2_ssl_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6603,13 +6411,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_simple_request_test", 
+    "name": "h2_ssl_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6620,13 +6429,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_with_proxy_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_ssl_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6637,13 +6447,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_bad_hostname_test", 
+    "name": "h2_ssl_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6654,13 +6465,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_test", 
+    "name": "h2_ssl_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6671,13 +6483,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_ssl_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6688,13 +6501,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_invoke_test", 
+    "name": "h2_ssl_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6705,13 +6519,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_before_invoke_test", 
+    "name": "h2_ssl_default_host_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6722,13 +6537,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_cancel_in_a_vacuum_test", 
+    "name": "h2_ssl_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6739,13 +6555,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_census_simple_request_test", 
+    "name": "h2_ssl_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6756,13 +6573,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_channel_connectivity_test", 
+    "name": "h2_ssl_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6773,13 +6591,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_default_host_test", 
+    "name": "h2_ssl_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6790,13 +6609,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_disappearing_server_test", 
+    "name": "h2_ssl_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6807,13 +6627,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_ssl_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6824,13 +6645,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_ssl_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6841,13 +6663,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_empty_batch_test", 
+    "name": "h2_ssl_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6858,13 +6681,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_graceful_server_shutdown_test", 
+    "name": "h2_ssl_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6875,13 +6699,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_test", 
+    "name": "h2_ssl_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6892,13 +6717,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_max_concurrent_streams_test", 
+    "name": "h2_ssl_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6909,13 +6735,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_max_message_length_test", 
+    "name": "h2_ssl_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6926,13 +6753,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_no_op_test", 
+    "name": "h2_ssl_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6943,13 +6771,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_ping_pong_streaming_test", 
+    "name": "h2_ssl_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6960,13 +6789,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_registered_call_test", 
+    "name": "h2_ssl_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6977,13 +6807,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_ssl_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -6994,13 +6825,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_metadata_and_payload_test", 
+    "name": "h2_ssl_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7011,13 +6843,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_test", 
+    "name": "h2_ssl_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7028,13 +6861,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7045,13 +6879,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7062,13 +6897,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_compressed_payload_test", 
+    "name": "h2_ssl_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7078,563 +6914,398 @@
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_flags_test", 
+    "name": "h2_ssl+poll_bad_hostname_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_large_metadata_test", 
+    "name": "h2_ssl+poll_binary_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_payload_test", 
+    "name": "h2_ssl+poll_call_creds_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_server_finishes_request_test", 
+    "name": "h2_ssl+poll_cancel_after_accept_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_simple_delayed_request_test", 
+    "name": "h2_ssl+poll_cancel_after_client_done_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_simple_request_test", 
+    "name": "h2_ssl+poll_cancel_after_invoke_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_ssl+poll_cancel_before_invoke_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_bad_hostname_test", 
+    "name": "h2_ssl+poll_cancel_in_a_vacuum_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_test", 
+    "name": "h2_ssl+poll_census_simple_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_ssl+poll_channel_connectivity_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_invoke_test", 
+    "name": "h2_ssl+poll_compressed_payload_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_before_invoke_test", 
+    "name": "h2_ssl+poll_default_host_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_in_a_vacuum_test", 
+    "name": "h2_ssl+poll_disappearing_server_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_census_simple_request_test", 
+    "name": "h2_ssl+poll_empty_batch_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_ssl+poll_graceful_server_shutdown_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_ssl+poll_high_initial_seqno_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_empty_batch_test", 
+    "name": "h2_ssl+poll_invoke_large_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_graceful_server_shutdown_test", 
+    "name": "h2_ssl+poll_large_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_invoke_large_request_test", 
+    "name": "h2_ssl+poll_max_concurrent_streams_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_concurrent_streams_test", 
+    "name": "h2_ssl+poll_max_message_length_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_message_length_test", 
+    "name": "h2_ssl+poll_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_no_op_test", 
+    "name": "h2_ssl+poll_no_op_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_ping_pong_streaming_test", 
+    "name": "h2_ssl+poll_payload_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_registered_call_test", 
+    "name": "h2_ssl+poll_ping_pong_streaming_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_ssl+poll_registered_call_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_metadata_and_payload_test", 
+    "name": "h2_ssl+poll_request_with_flags_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_payload_test", 
+    "name": "h2_ssl+poll_request_with_payload_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl+poll_server_finishes_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl+poll_shutdown_finishes_calls_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_compressed_payload_test", 
+    "name": "h2_ssl+poll_shutdown_finishes_tags_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_flags_test", 
+    "name": "h2_ssl+poll_simple_delayed_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_large_metadata_test", 
+    "name": "h2_ssl+poll_simple_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_payload_test", 
+    "name": "h2_ssl+poll_trailing_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
@@ -7646,7 +7317,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_server_finishes_request_test", 
+    "name": "h2_ssl_proxy_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7663,7 +7334,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_test", 
+    "name": "h2_ssl_proxy_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7680,7 +7351,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_ssl_proxy_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7697,7 +7368,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_bad_hostname_test", 
+    "name": "h2_ssl_proxy_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7714,7 +7385,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_test", 
+    "name": "h2_ssl_proxy_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7731,7 +7402,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_ssl_proxy_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7748,7 +7419,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_test", 
+    "name": "h2_ssl_proxy_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7765,7 +7436,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_test", 
+    "name": "h2_ssl_proxy_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7782,7 +7453,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_test", 
+    "name": "h2_ssl_proxy_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7799,7 +7470,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_census_simple_request_test", 
+    "name": "h2_ssl_proxy_default_host_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7816,7 +7487,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_ssl_proxy_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7833,7 +7504,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_ssl_proxy_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7850,7 +7521,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_empty_batch_test", 
+    "name": "h2_ssl_proxy_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7867,7 +7538,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_graceful_server_shutdown_test", 
+    "name": "h2_ssl_proxy_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7884,7 +7555,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_test", 
+    "name": "h2_ssl_proxy_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7901,7 +7572,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_test", 
+    "name": "h2_ssl_proxy_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7918,7 +7589,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_message_length_test", 
+    "name": "h2_ssl_proxy_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7935,7 +7606,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_no_op_test", 
+    "name": "h2_ssl_proxy_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7952,7 +7623,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_test", 
+    "name": "h2_ssl_proxy_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7969,7 +7640,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_registered_call_test", 
+    "name": "h2_ssl_proxy_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7986,7 +7657,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_ssl_proxy_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8003,7 +7674,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_test", 
+    "name": "h2_ssl_proxy_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8020,7 +7691,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_test", 
+    "name": "h2_ssl_proxy_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8037,7 +7708,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_ssl_proxy_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8054,7 +7725,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_ssl_proxy_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8071,7 +7742,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_compressed_payload_test", 
+    "name": "h2_ssl_proxy_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8088,7 +7759,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_flags_test", 
+    "name": "h2_ssl_proxy_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8105,7 +7776,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_large_metadata_test", 
+    "name": "h2_ssl_proxy_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8122,7 +7793,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_payload_test", 
+    "name": "h2_ssl_proxy_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -8133,1132 +7804,897 @@
   {
     "ci_platforms": [
       "linux", 
-      "posix", 
-      "windows"
+      "mac", 
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_server_finishes_request_test", 
+    "name": "h2_uds_bad_hostname_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
-      "posix", 
-      "windows"
+      "mac", 
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_test", 
+    "name": "h2_uds_binary_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
-      "posix", 
-      "windows"
+      "mac", 
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_uds_call_creds_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_bad_hostname_test", 
+    "name": "h2_uds_cancel_after_accept_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_test", 
+    "name": "h2_uds_cancel_after_client_done_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_and_writes_closed_test", 
+    "name": "h2_uds_cancel_after_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_invoke_test", 
+    "name": "h2_uds_cancel_before_invoke_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_before_invoke_test", 
+    "name": "h2_uds_cancel_in_a_vacuum_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_in_a_vacuum_test", 
+    "name": "h2_uds_census_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_census_simple_request_test", 
+    "name": "h2_uds_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "h2_uds_compressed_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_tags_test", 
+    "name": "h2_uds_disappearing_server_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_empty_batch_test", 
+    "name": "h2_uds_empty_batch_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_graceful_server_shutdown_test", 
+    "name": "h2_uds_graceful_server_shutdown_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_invoke_large_request_test", 
+    "name": "h2_uds_high_initial_seqno_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_concurrent_streams_test", 
+    "name": "h2_uds_invoke_large_request_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_message_length_test", 
+    "name": "h2_uds_large_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_no_op_test", 
+    "name": "h2_uds_max_concurrent_streams_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_ping_pong_streaming_test", 
+    "name": "h2_uds_max_message_length_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_registered_call_test", 
+    "name": "h2_uds_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_binary_metadata_and_payload_test", 
+    "name": "h2_uds_no_op_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_metadata_and_payload_test", 
+    "name": "h2_uds_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_payload_test", 
+    "name": "h2_uds_ping_pong_streaming_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_payload_and_call_creds_test", 
+    "name": "h2_uds_registered_call_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "h2_uds_request_with_flags_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_compressed_payload_test", 
+    "name": "h2_uds_request_with_payload_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_flags_test", 
+    "name": "h2_uds_server_finishes_request_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_large_metadata_test", 
+    "name": "h2_uds_shutdown_finishes_calls_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_payload_test", 
+    "name": "h2_uds_shutdown_finishes_tags_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_server_finishes_request_test", 
+    "name": "h2_uds_simple_delayed_request_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_test", 
+    "name": "h2_uds_simple_request_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_with_high_initial_sequence_number_test", 
+    "name": "h2_uds_trailing_metadata_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_bad_hostname_unsecure_test", 
+    "name": "h2_uds+poll_bad_hostname_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_unsecure_test", 
+    "name": "h2_uds+poll_binary_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_uds+poll_call_creds_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_after_invoke_unsecure_test", 
+    "name": "h2_uds+poll_cancel_after_accept_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_before_invoke_unsecure_test", 
+    "name": "h2_uds+poll_cancel_after_client_done_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_uds+poll_cancel_after_invoke_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_census_simple_request_unsecure_test", 
+    "name": "h2_uds+poll_cancel_before_invoke_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_channel_connectivity_unsecure_test", 
+    "name": "h2_uds+poll_cancel_in_a_vacuum_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_default_host_unsecure_test", 
+    "name": "h2_uds+poll_census_simple_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_disappearing_server_unsecure_test", 
+    "name": "h2_uds+poll_channel_connectivity_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_uds+poll_compressed_payload_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_uds+poll_disappearing_server_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_empty_batch_unsecure_test", 
+    "name": "h2_uds+poll_empty_batch_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_uds+poll_graceful_server_shutdown_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_invoke_large_request_unsecure_test", 
+    "name": "h2_uds+poll_high_initial_seqno_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_max_concurrent_streams_unsecure_test", 
+    "name": "h2_uds+poll_invoke_large_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_max_message_length_unsecure_test", 
+    "name": "h2_uds+poll_large_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_no_op_unsecure_test", 
+    "name": "h2_uds+poll_max_concurrent_streams_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_ping_pong_streaming_unsecure_test", 
+    "name": "h2_uds+poll_max_message_length_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_registered_call_unsecure_test", 
+    "name": "h2_uds+poll_metadata_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds+poll_no_op_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds+poll_payload_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_payload_unsecure_test", 
+    "name": "h2_uds+poll_ping_pong_streaming_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds+poll_registered_call_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_uds+poll_request_with_flags_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_flags_unsecure_test", 
+    "name": "h2_uds+poll_request_with_payload_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_large_metadata_unsecure_test", 
+    "name": "h2_uds+poll_server_finishes_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_request_with_payload_unsecure_test", 
+    "name": "h2_uds+poll_shutdown_finishes_calls_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_server_finishes_request_unsecure_test", 
+    "name": "h2_uds+poll_shutdown_finishes_tags_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_delayed_request_unsecure_test", 
+    "name": "h2_uds+poll_simple_delayed_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_unsecure_test", 
+    "name": "h2_uds+poll_simple_request_test", 
     "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_trailing_metadata_test", 
+    "platforms": [
+      "linux"
     ]
   }, 
   {
@@ -9271,7 +8707,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_compress_bad_hostname_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9289,7 +8725,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_bad_hostname_unsecure_test", 
+    "name": "h2_compress_binary_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9307,7 +8743,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_unsecure_test", 
+    "name": "h2_compress_cancel_after_accept_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9325,7 +8761,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_compress_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9343,7 +8779,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_after_invoke_unsecure_test", 
+    "name": "h2_compress_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9361,7 +8797,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_before_invoke_unsecure_test", 
+    "name": "h2_compress_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9379,7 +8815,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_compress_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9397,7 +8833,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_census_simple_request_unsecure_test", 
+    "name": "h2_compress_census_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9415,7 +8851,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_channel_connectivity_unsecure_test", 
+    "name": "h2_compress_channel_connectivity_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9433,7 +8869,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_default_host_unsecure_test", 
+    "name": "h2_compress_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9451,7 +8887,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_disappearing_server_unsecure_test", 
+    "name": "h2_compress_default_host_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9469,7 +8905,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_compress_disappearing_server_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9487,7 +8923,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_compress_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9505,7 +8941,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_empty_batch_unsecure_test", 
+    "name": "h2_compress_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9523,7 +8959,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_compress_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9541,7 +8977,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_invoke_large_request_unsecure_test", 
+    "name": "h2_compress_invoke_large_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9559,7 +8995,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_concurrent_streams_unsecure_test", 
+    "name": "h2_compress_large_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9577,7 +9013,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_max_message_length_unsecure_test", 
+    "name": "h2_compress_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9595,7 +9031,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_no_op_unsecure_test", 
+    "name": "h2_compress_max_message_length_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9613,7 +9049,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_ping_pong_streaming_unsecure_test", 
+    "name": "h2_compress_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9631,7 +9067,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_registered_call_unsecure_test", 
+    "name": "h2_compress_no_op_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9649,7 +9085,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_compress_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9667,7 +9103,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_compress_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9685,7 +9121,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_payload_unsecure_test", 
+    "name": "h2_compress_registered_call_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9703,7 +9139,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_compress_request_with_flags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9721,7 +9157,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_compress_request_with_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9739,7 +9175,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_flags_unsecure_test", 
+    "name": "h2_compress_server_finishes_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9757,7 +9193,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_large_metadata_unsecure_test", 
+    "name": "h2_compress_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9775,7 +9211,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_request_with_payload_unsecure_test", 
+    "name": "h2_compress_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9793,7 +9229,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_server_finishes_request_unsecure_test", 
+    "name": "h2_compress_simple_delayed_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9811,7 +9247,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_delayed_request_unsecure_test", 
+    "name": "h2_compress_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9829,7 +9265,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_unsecure_test", 
+    "name": "h2_compress_trailing_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9847,7 +9283,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_compression_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_full_bad_hostname_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9859,496 +9295,558 @@
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_bad_hostname_unsecure_test", 
+    "name": "h2_full_binary_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_unsecure_test", 
+    "name": "h2_full_cancel_after_accept_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_full_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_after_invoke_unsecure_test", 
+    "name": "h2_full_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_before_invoke_unsecure_test", 
+    "name": "h2_full_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_full_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_census_simple_request_unsecure_test", 
+    "name": "h2_full_census_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_channel_connectivity_unsecure_test", 
+    "name": "h2_full_channel_connectivity_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_disappearing_server_unsecure_test", 
+    "name": "h2_full_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_full_default_host_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_full_disappearing_server_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_empty_batch_unsecure_test", 
+    "name": "h2_full_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_full_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_invoke_large_request_unsecure_test", 
+    "name": "h2_full_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_concurrent_streams_unsecure_test", 
+    "name": "h2_full_invoke_large_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_max_message_length_unsecure_test", 
+    "name": "h2_full_large_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_no_op_unsecure_test", 
+    "name": "h2_full_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_ping_pong_streaming_unsecure_test", 
+    "name": "h2_full_max_message_length_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_registered_call_unsecure_test", 
+    "name": "h2_full_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_full_no_op_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_full_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_unsecure_test", 
+    "name": "h2_full_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_full_registered_call_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_full_request_with_flags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_flags_unsecure_test", 
+    "name": "h2_full_request_with_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_large_metadata_unsecure_test", 
+    "name": "h2_full_server_finishes_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_request_with_payload_unsecure_test", 
+    "name": "h2_full_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_server_finishes_request_unsecure_test", 
+    "name": "h2_full_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_delayed_request_unsecure_test", 
+    "name": "h2_full_simple_delayed_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_unsecure_test", 
+    "name": "h2_full_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_full_trailing_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix"
+      "posix", 
+      "windows"
     ]
   }, 
   {
@@ -10358,7 +9856,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_bad_hostname_unsecure_test", 
+    "name": "h2_full+poll_bad_hostname_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10370,7 +9868,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_unsecure_test", 
+    "name": "h2_full+poll_binary_metadata_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10382,7 +9880,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_full+poll_cancel_after_accept_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10394,7 +9892,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_after_invoke_unsecure_test", 
+    "name": "h2_full+poll_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10406,7 +9904,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_before_invoke_unsecure_test", 
+    "name": "h2_full+poll_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10418,7 +9916,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_full+poll_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10430,7 +9928,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_census_simple_request_unsecure_test", 
+    "name": "h2_full+poll_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10442,7 +9940,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_channel_connectivity_unsecure_test", 
+    "name": "h2_full+poll_census_simple_request_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10454,7 +9952,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_disappearing_server_unsecure_test", 
+    "name": "h2_full+poll_channel_connectivity_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10466,7 +9964,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_full+poll_compressed_payload_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10478,7 +9976,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_full+poll_default_host_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10490,7 +9988,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_empty_batch_unsecure_test", 
+    "name": "h2_full+poll_disappearing_server_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10502,7 +10000,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_full+poll_empty_batch_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10514,7 +10012,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_invoke_large_request_unsecure_test", 
+    "name": "h2_full+poll_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10526,7 +10024,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_concurrent_streams_unsecure_test", 
+    "name": "h2_full+poll_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10538,7 +10036,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_max_message_length_unsecure_test", 
+    "name": "h2_full+poll_invoke_large_request_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10550,7 +10048,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_no_op_unsecure_test", 
+    "name": "h2_full+poll_large_metadata_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10562,7 +10060,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_ping_pong_streaming_unsecure_test", 
+    "name": "h2_full+poll_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10574,7 +10072,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_registered_call_unsecure_test", 
+    "name": "h2_full+poll_max_message_length_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10586,7 +10084,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_full+poll_metadata_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10598,7 +10096,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_full+poll_no_op_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10610,7 +10108,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_payload_unsecure_test", 
+    "name": "h2_full+poll_payload_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10622,7 +10120,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_full+poll_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10634,7 +10132,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_full+poll_registered_call_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10646,7 +10144,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_flags_unsecure_test", 
+    "name": "h2_full+poll_request_with_flags_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10658,7 +10156,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_large_metadata_unsecure_test", 
+    "name": "h2_full+poll_request_with_payload_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10670,7 +10168,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_request_with_payload_unsecure_test", 
+    "name": "h2_full+poll_server_finishes_request_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10682,7 +10180,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_server_finishes_request_unsecure_test", 
+    "name": "h2_full+poll_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10694,7 +10192,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_delayed_request_unsecure_test", 
+    "name": "h2_full+poll_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10706,7 +10204,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_unsecure_test", 
+    "name": "h2_full+poll_simple_delayed_request_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10718,7 +10216,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_full+poll_simple_request_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -10730,381 +10228,536 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_bad_hostname_unsecure_test", 
+    "name": "h2_full+poll_trailing_metadata_nosec_test", 
     "platforms": [
       "linux"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_unsecure_test", 
+    "name": "h2_proxy_bad_hostname_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_proxy_binary_metadata_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_after_invoke_unsecure_test", 
+    "name": "h2_proxy_cancel_after_accept_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_before_invoke_unsecure_test", 
+    "name": "h2_proxy_cancel_after_client_done_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_proxy_cancel_after_invoke_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_census_simple_request_unsecure_test", 
+    "name": "h2_proxy_cancel_before_invoke_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_channel_connectivity_unsecure_test", 
+    "name": "h2_proxy_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_default_host_unsecure_test", 
+    "name": "h2_proxy_census_simple_request_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_disappearing_server_unsecure_test", 
+    "name": "h2_proxy_default_host_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_proxy_disappearing_server_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_proxy_empty_batch_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_empty_batch_unsecure_test", 
+    "name": "h2_proxy_graceful_server_shutdown_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_proxy_high_initial_seqno_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_invoke_large_request_unsecure_test", 
+    "name": "h2_proxy_invoke_large_request_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_concurrent_streams_unsecure_test", 
+    "name": "h2_proxy_large_metadata_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_max_message_length_unsecure_test", 
+    "name": "h2_proxy_max_message_length_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_no_op_unsecure_test", 
+    "name": "h2_proxy_metadata_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_ping_pong_streaming_unsecure_test", 
+    "name": "h2_proxy_no_op_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_registered_call_unsecure_test", 
+    "name": "h2_proxy_payload_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_proxy_ping_pong_streaming_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_proxy_registered_call_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_payload_unsecure_test", 
+    "name": "h2_proxy_request_with_payload_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_proxy_server_finishes_request_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_proxy_shutdown_finishes_calls_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_flags_unsecure_test", 
+    "name": "h2_proxy_shutdown_finishes_tags_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_large_metadata_unsecure_test", 
+    "name": "h2_proxy_simple_delayed_request_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_request_with_payload_unsecure_test", 
+    "name": "h2_proxy_simple_request_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_server_finishes_request_unsecure_test", 
+    "name": "h2_proxy_trailing_metadata_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_delayed_request_unsecure_test", 
+    "name": "h2_sockpair_bad_hostname_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_unsecure_test", 
+    "name": "h2_sockpair_binary_metadata_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
     "ci_platforms": [
-      "linux"
+      "linux", 
+      "posix", 
+      "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_poll_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_sockpair_cancel_after_accept_nosec_test", 
     "platforms": [
-      "linux"
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
     ]
   }, 
   {
@@ -11116,7 +10769,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_bad_hostname_unsecure_test", 
+    "name": "h2_sockpair_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11133,7 +10786,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_unsecure_test", 
+    "name": "h2_sockpair_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11150,7 +10803,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_sockpair_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11167,7 +10820,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_after_invoke_unsecure_test", 
+    "name": "h2_sockpair_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11184,7 +10837,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_before_invoke_unsecure_test", 
+    "name": "h2_sockpair_census_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11201,7 +10854,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_sockpair_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11218,7 +10871,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_census_simple_request_unsecure_test", 
+    "name": "h2_sockpair_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11235,7 +10888,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_default_host_unsecure_test", 
+    "name": "h2_sockpair_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11252,7 +10905,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_disappearing_server_unsecure_test", 
+    "name": "h2_sockpair_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11269,7 +10922,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_sockpair_invoke_large_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11286,7 +10939,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_sockpair_large_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11303,7 +10956,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_empty_batch_unsecure_test", 
+    "name": "h2_sockpair_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11320,7 +10973,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_sockpair_max_message_length_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11337,7 +10990,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_invoke_large_request_unsecure_test", 
+    "name": "h2_sockpair_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11354,7 +11007,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_max_message_length_unsecure_test", 
+    "name": "h2_sockpair_no_op_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11371,7 +11024,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_no_op_unsecure_test", 
+    "name": "h2_sockpair_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11388,7 +11041,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_ping_pong_streaming_unsecure_test", 
+    "name": "h2_sockpair_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11405,7 +11058,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_registered_call_unsecure_test", 
+    "name": "h2_sockpair_registered_call_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11422,7 +11075,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_request_with_flags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11439,7 +11092,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_request_with_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11456,7 +11109,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_payload_unsecure_test", 
+    "name": "h2_sockpair_server_finishes_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11473,7 +11126,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11490,7 +11143,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_large_metadata_unsecure_test", 
+    "name": "h2_sockpair_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11507,7 +11160,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_request_with_payload_unsecure_test", 
+    "name": "h2_sockpair_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11524,7 +11177,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_server_finishes_request_unsecure_test", 
+    "name": "h2_sockpair_trailing_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11535,13 +11188,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_delayed_request_unsecure_test", 
+    "name": "h2_sockpair+trace_bad_hostname_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11552,13 +11206,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_unsecure_test", 
+    "name": "h2_sockpair+trace_binary_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11569,13 +11224,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_fullstack_with_proxy_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_after_accept_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11586,13 +11242,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_bad_hostname_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11603,13 +11260,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11620,13 +11278,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11637,13 +11296,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_after_invoke_unsecure_test", 
+    "name": "h2_sockpair+trace_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11654,13 +11314,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_before_invoke_unsecure_test", 
+    "name": "h2_sockpair+trace_census_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11671,13 +11332,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_sockpair+trace_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11688,13 +11350,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_census_simple_request_unsecure_test", 
+    "name": "h2_sockpair+trace_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11705,13 +11368,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_sockpair+trace_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11722,13 +11386,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_sockpair+trace_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11739,13 +11404,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_empty_batch_unsecure_test", 
+    "name": "h2_sockpair+trace_invoke_large_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11756,13 +11422,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_sockpair+trace_large_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11773,13 +11440,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_invoke_large_request_unsecure_test", 
+    "name": "h2_sockpair+trace_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11790,13 +11458,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_concurrent_streams_unsecure_test", 
+    "name": "h2_sockpair+trace_max_message_length_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11807,13 +11476,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_max_message_length_unsecure_test", 
+    "name": "h2_sockpair+trace_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11824,13 +11494,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_no_op_unsecure_test", 
+    "name": "h2_sockpair+trace_no_op_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11841,13 +11512,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_ping_pong_streaming_unsecure_test", 
+    "name": "h2_sockpair+trace_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11858,13 +11530,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_registered_call_unsecure_test", 
+    "name": "h2_sockpair+trace_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11875,13 +11548,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_registered_call_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11892,13 +11566,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_request_with_flags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11909,13 +11584,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_request_with_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11926,13 +11602,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_server_finishes_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11943,13 +11620,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11960,13 +11638,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_flags_unsecure_test", 
+    "name": "h2_sockpair+trace_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11977,13 +11656,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_large_metadata_unsecure_test", 
+    "name": "h2_sockpair+trace_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11994,13 +11674,14 @@
   {
     "ci_platforms": [
       "linux", 
+      "mac", 
       "posix", 
       "windows"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_request_with_payload_unsecure_test", 
+    "name": "h2_sockpair+trace_trailing_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12017,7 +11698,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_server_finishes_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_bad_hostname_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12034,7 +11715,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_binary_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12051,7 +11732,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_after_accept_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12068,7 +11749,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_bad_hostname_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12085,7 +11766,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12102,7 +11783,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12119,7 +11800,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_unsecure_test", 
+    "name": "h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12136,7 +11817,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_unsecure_test", 
+    "name": "h2_sockpair_1byte_census_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12153,7 +11834,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_sockpair_1byte_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12170,7 +11851,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_census_simple_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12187,7 +11868,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_sockpair_1byte_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12204,7 +11885,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_sockpair_1byte_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12221,7 +11902,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_empty_batch_unsecure_test", 
+    "name": "h2_sockpair_1byte_invoke_large_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12238,7 +11919,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_sockpair_1byte_large_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12255,7 +11936,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_unsecure_test", 
+    "name": "h2_sockpair_1byte_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12272,7 +11953,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_unsecure_test", 
+    "name": "h2_sockpair_1byte_max_message_length_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12289,7 +11970,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_max_message_length_unsecure_test", 
+    "name": "h2_sockpair_1byte_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12306,7 +11987,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_no_op_unsecure_test", 
+    "name": "h2_sockpair_1byte_no_op_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12323,7 +12004,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_unsecure_test", 
+    "name": "h2_sockpair_1byte_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12340,7 +12021,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_registered_call_unsecure_test", 
+    "name": "h2_sockpair_1byte_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12357,7 +12038,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_registered_call_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12374,7 +12055,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_request_with_flags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12391,7 +12072,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_request_with_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12408,7 +12089,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_server_finishes_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12425,7 +12106,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12442,7 +12123,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_flags_unsecure_test", 
+    "name": "h2_sockpair_1byte_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12459,7 +12140,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_large_metadata_unsecure_test", 
+    "name": "h2_sockpair_1byte_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12476,7 +12157,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_payload_unsecure_test", 
+    "name": "h2_sockpair_1byte_trailing_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -12487,556 +12168,869 @@
   {
     "ci_platforms": [
       "linux", 
-      "posix", 
-      "windows"
+      "mac", 
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_server_finishes_request_unsecure_test", 
+    "name": "h2_uds_bad_hostname_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
-      "posix", 
-      "windows"
+      "mac", 
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_unsecure_test", 
+    "name": "h2_uds_binary_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
-      "posix", 
-      "windows"
+      "mac", 
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_uds_cancel_after_accept_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_bad_hostname_unsecure_test", 
+    "name": "h2_uds_cancel_after_client_done_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_unsecure_test", 
+    "name": "h2_uds_cancel_after_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "h2_uds_cancel_before_invoke_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_after_invoke_unsecure_test", 
+    "name": "h2_uds_cancel_in_a_vacuum_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_before_invoke_unsecure_test", 
+    "name": "h2_uds_census_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_cancel_in_a_vacuum_unsecure_test", 
+    "name": "h2_uds_channel_connectivity_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_census_simple_request_unsecure_test", 
+    "name": "h2_uds_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "h2_uds_disappearing_server_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "h2_uds_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_empty_batch_unsecure_test", 
+    "name": "h2_uds_graceful_server_shutdown_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_graceful_server_shutdown_unsecure_test", 
+    "name": "h2_uds_high_initial_seqno_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_invoke_large_request_unsecure_test", 
+    "name": "h2_uds_invoke_large_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_concurrent_streams_unsecure_test", 
+    "name": "h2_uds_large_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_max_message_length_unsecure_test", 
+    "name": "h2_uds_max_concurrent_streams_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_no_op_unsecure_test", 
+    "name": "h2_uds_max_message_length_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_ping_pong_streaming_unsecure_test", 
+    "name": "h2_uds_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_registered_call_unsecure_test", 
+    "name": "h2_uds_no_op_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds_ping_pong_streaming_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_payload_unsecure_test", 
+    "name": "h2_uds_registered_call_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "h2_uds_request_with_flags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_compressed_payload_unsecure_test", 
+    "name": "h2_uds_request_with_payload_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_flags_unsecure_test", 
+    "name": "h2_uds_server_finishes_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_large_metadata_unsecure_test", 
+    "name": "h2_uds_shutdown_finishes_calls_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_request_with_payload_unsecure_test", 
+    "name": "h2_uds_shutdown_finishes_tags_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_server_finishes_request_unsecure_test", 
+    "name": "h2_uds_simple_delayed_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_unsecure_test", 
+    "name": "h2_uds_simple_request_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ]
   }, 
   {
     "ci_platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
     ], 
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "chttp2_socket_pair_with_grpc_trace_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "h2_uds_trailing_metadata_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
-      "posix", 
-      "windows"
+      "posix"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_bad_hostname_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_binary_metadata_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_cancel_after_accept_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_cancel_after_client_done_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_cancel_after_invoke_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_cancel_before_invoke_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_cancel_in_a_vacuum_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_census_simple_request_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_channel_connectivity_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_compressed_payload_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_disappearing_server_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_empty_batch_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_graceful_server_shutdown_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_high_initial_seqno_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_invoke_large_request_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_large_metadata_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_max_concurrent_streams_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_max_message_length_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_metadata_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_no_op_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_payload_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_ping_pong_streaming_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_registered_call_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_request_with_flags_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_request_with_payload_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_server_finishes_request_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_shutdown_finishes_calls_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_shutdown_finishes_tags_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_simple_delayed_request_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_simple_request_nosec_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_uds+poll_trailing_metadata_nosec_test", 
+    "platforms": [
+      "linux"
     ]
   }, 
   {