Merge remote-tracking branch 'upstream/master'

27 files changed, 5247 insertions, 1637 deletions

diff --git a/tools/codegen/core/gen_header_frame.py b/tools/codegen/core/gen_header_frame.py
new file mode 100755
index 0000000000..96e6c67fa6
--- /dev/null
+++ b/tools/codegen/core/gen_header_frame.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env python2.7
+
+# 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.
+
+"""Read from stdin a set of colon separated http headers:
+   :path: /foo/bar
+   content-type: application/grpc
+   Write a set of strings containing a hpack encoded http2 frame that
+   represents said headers."""
+
+import json
+import sys
+
+# parse input, fill in vals
+vals = []
+for line in sys.stdin:
+  line = line.strip()
+  if line == '': continue
+  if line[0] == '#': continue
+  key_tail, value = line[1:].split(':')
+  key = (line[0] + key_tail).strip()
+  value = value.strip()
+  vals.append((key, value))
+
+# generate frame payload binary data
+payload_bytes = [[]] # reserve space for header
+payload_len = 0
+for key, value in vals:
+  payload_line = []
+  payload_line.append(0x10)
+  assert(len(key) <= 126)
+  payload_line.append(len(key))
+  payload_line.extend(ord(c) for c in key)
+  assert(len(value) <= 126)
+  payload_line.append(len(value))
+  payload_line.extend(ord(c) for c in value)
+  payload_len += len(payload_line)
+  payload_bytes.append(payload_line)
+
+# fill in header
+payload_bytes[0].extend([
+    (payload_len >> 16) & 0xff,
+    (payload_len >> 8) & 0xff,
+    (payload_len) & 0xff,
+    # header frame
+    0x01,
+    # flags
+    0x04,
+    # stream id
+    0x00,
+    0x00,
+    0x00,
+    0x01
+])
+
+hex_bytes = [ord(c) for c in "abcdefABCDEF0123456789"]
+
+def esc_c(line):
+  out = "\""
+  last_was_hex = False
+  for c in line:
+    if 32 <= c < 127:
+      if c in hex_bytes and last_was_hex:
+        out += "\"\""
+      if c != ord('"'):
+        out += chr(c)
+      else:
+        out += "\\\""
+      last_was_hex = False
+    else:
+      out += "\\x%02x" % c
+      last_was_hex = True
+  return out + "\""
+
+# dump bytes
+for line in payload_bytes:
+  print esc_c(line)
+
diff --git a/tools/codegen/core/gen_legal_metadata_characters.c b/tools/codegen/core/gen_legal_metadata_characters.c
index 677fa5c155..c6658f46c6 100644
--- a/tools/codegen/core/gen_legal_metadata_characters.c
+++ b/tools/codegen/core/gen_legal_metadata_characters.c
@@ -72,7 +72,6 @@ int main(void) {
 
   clear();
   for (i = 32; i <= 126; i++) {
-    if (i == ',') continue;
     legal(i);
   }
   dump();
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index f07718515a..500d110ad0 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -774,6 +774,7 @@ include/grpc++/impl/proto_utils.h \
 include/grpc++/impl/rpc_method.h \
 include/grpc++/impl/rpc_service_method.h \
 include/grpc++/impl/serialization_traits.h \
+include/grpc++/impl/server_builder_option.h \
 include/grpc++/impl/service_type.h \
 include/grpc++/impl/sync.h \
 include/grpc++/impl/sync_cxx11.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 11aaa379ce..ba1dec0d38 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -774,6 +774,7 @@ include/grpc++/impl/proto_utils.h \
 include/grpc++/impl/rpc_method.h \
 include/grpc++/impl/rpc_service_method.h \
 include/grpc++/impl/serialization_traits.h \
+include/grpc++/impl/server_builder_option.h \
 include/grpc++/impl/service_type.h \
 include/grpc++/impl/sync.h \
 include/grpc++/impl/sync_cxx11.h \
@@ -809,14 +810,13 @@ src/cpp/common/create_auth_context.h \
 src/cpp/server/dynamic_thread_pool.h \
 src/cpp/server/fixed_size_thread_pool.h \
 src/cpp/server/thread_pool_interface.h \
-src/cpp/client/secure_channel_arguments.cc \
 src/cpp/client/secure_credentials.cc \
 src/cpp/common/auth_property_iterator.cc \
 src/cpp/common/secure_auth_context.cc \
+src/cpp/common/secure_channel_arguments.cc \
 src/cpp/common/secure_create_auth_context.cc \
 src/cpp/server/secure_server_credentials.cc \
 src/cpp/client/channel.cc \
-src/cpp/client/channel_arguments.cc \
 src/cpp/client/client_context.cc \
 src/cpp/client/create_channel.cc \
 src/cpp/client/create_channel_internal.cc \
@@ -824,6 +824,7 @@ src/cpp/client/credentials.cc \
 src/cpp/client/generic_stub.cc \
 src/cpp/client/insecure_credentials.cc \
 src/cpp/common/call.cc \
+src/cpp/common/channel_arguments.cc \
 src/cpp/common/completion_queue.cc \
 src/cpp/common/rpc_method.cc \
 src/cpp/proto/proto_utils.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 8dcd8cd42c..f84a35ce65 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -790,7 +790,6 @@ src/core/channel/connected_channel.h \
 src/core/channel/context.h \
 src/core/channel/http_client_filter.h \
 src/core/channel/http_server_filter.h \
-src/core/channel/noop_filter.h \
 src/core/channel/subchannel_call_holder.h \
 src/core/client_config/client_config.h \
 src/core/client_config/connector.h \
@@ -807,8 +806,6 @@ src/core/client_config/resolvers/dns_resolver.h \
 src/core/client_config/resolvers/sockaddr_resolver.h \
 src/core/client_config/subchannel.h \
 src/core/client_config/subchannel_factory.h \
-src/core/client_config/subchannel_factory_decorators/add_channel_arg.h \
-src/core/client_config/subchannel_factory_decorators/merge_channel_args.h \
 src/core/client_config/uri_parser.h \
 src/core/compression/algorithm_metadata.h \
 src/core/compression/message_compress.h \
@@ -930,7 +927,6 @@ src/core/channel/compress_filter.c \
 src/core/channel/connected_channel.c \
 src/core/channel/http_client_filter.c \
 src/core/channel/http_server_filter.c \
-src/core/channel/noop_filter.c \
 src/core/channel/subchannel_call_holder.c \
 src/core/client_config/client_config.c \
 src/core/client_config/connector.c \
@@ -948,8 +944,6 @@ src/core/client_config/resolvers/dns_resolver.c \
 src/core/client_config/resolvers/sockaddr_resolver.c \
 src/core/client_config/subchannel.c \
 src/core/client_config/subchannel_factory.c \
-src/core/client_config/subchannel_factory_decorators/add_channel_arg.c \
-src/core/client_config/subchannel_factory_decorators/merge_channel_args.c \
 src/core/client_config/uri_parser.c \
 src/core/compression/algorithm.c \
 src/core/compression/message_compress.c \
@@ -1010,6 +1004,7 @@ src/core/surface/call_log_batch.c \
 src/core/surface/channel.c \
 src/core/surface/channel_connectivity.c \
 src/core/surface/channel_create.c \
+src/core/surface/channel_ping.c \
 src/core/surface/completion_queue.c \
 src/core/surface/event_string.c \
 src/core/surface/init.c \
diff --git a/tools/http2_interop/http2interop.go b/tools/http2_interop/http2interop.go
index abd7d4cf7d..1276a71afc 100644
--- a/tools/http2_interop/http2interop.go
+++ b/tools/http2_interop/http2interop.go
@@ -330,6 +330,7 @@ func http2Connect(c net.Conn, sf *SettingsFrame) error {
 	if _, err := c.Write([]byte(Preface)); err != nil {
 		return err
 	}
+
 	if sf == nil {
 		sf = &SettingsFrame{}
 	}
diff --git a/tools/http2_interop/http2interop_test.go b/tools/http2_interop/http2interop_test.go
index b35d085569..fb314da196 100644
--- a/tools/http2_interop/http2interop_test.go
+++ b/tools/http2_interop/http2interop_test.go
@@ -3,6 +3,7 @@ package http2interop
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -67,7 +68,8 @@ func (ctx *HTTP2InteropCtx) Close() error {
 	return nil
 }
 
-func TestClientShortSettings(t *testing.T) {
+func TestSoonClientShortSettings(t *testing.T) {
+	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
 	}
@@ -78,7 +80,8 @@ func TestClientShortSettings(t *testing.T) {
 	}
 }
 
-func TestShortPreface(t *testing.T) {
+func TestSoonShortPreface(t *testing.T) {
+	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
 	}
@@ -89,7 +92,8 @@ func TestShortPreface(t *testing.T) {
 	}
 }
 
-func TestUnknownFrameType(t *testing.T) {
+func TestSoonUnknownFrameType(t *testing.T) {
+	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
 	}
@@ -99,7 +103,8 @@ func TestUnknownFrameType(t *testing.T) {
 	}
 }
 
-func TestClientPrefaceWithStreamId(t *testing.T) {
+func TestSoonClientPrefaceWithStreamId(t *testing.T) {
+	defer Report(t)
 	if *testCase != "framing" {
 		t.SkipNow()
 	}
@@ -108,7 +113,8 @@ func TestClientPrefaceWithStreamId(t *testing.T) {
 	matchError(t, err, "EOF")
 }
 
-func TestTLSApplicationProtocol(t *testing.T) {
+func TestSoonTLSApplicationProtocol(t *testing.T) {
+	defer Report(t)
 	if *testCase != "tls" {
 		t.SkipNow()
 	}
@@ -117,7 +123,8 @@ func TestTLSApplicationProtocol(t *testing.T) {
 	matchError(t, err, "EOF", "broken pipe")
 }
 
-func TestTLSMaxVersion(t *testing.T) {
+func TestSoonTLSMaxVersion(t *testing.T) {
+	defer Report(t)
 	if *testCase != "tls" {
 		t.SkipNow()
 	}
@@ -128,7 +135,8 @@ func TestTLSMaxVersion(t *testing.T) {
 	matchError(t, err, "EOF", "server selected unsupported protocol")
 }
 
-func TestTLSBadCipherSuites(t *testing.T) {
+func TestSoonTLSBadCipherSuites(t *testing.T) {
+	defer Report(t)
 	if *testCase != "tls" {
 		t.SkipNow()
 	}
@@ -151,5 +159,25 @@ func matchError(t *testing.T, err error, matches ...string) {
 
 func TestMain(m *testing.M) {
 	flag.Parse()
-	os.Exit(m.Run())
+	m.Run()
+	var fatal bool
+	var any bool
+	for _, ci := range allCaseInfos.Cases {
+		if ci.Skipped {
+			continue
+		}
+		any = true
+		if !ci.Passed && ci.Fatal {
+			fatal = true
+		}
+	}
+
+	if err := json.NewEncoder(os.Stderr).Encode(&allCaseInfos); err != nil {
+		fmt.Println("Failed to encode", err)
+	}
+	var code int
+	if !any || fatal {
+		code = 1
+	}
+	os.Exit(code)
 }
diff --git a/tools/http2_interop/s6.5.go b/tools/http2_interop/s6.5.go
new file mode 100644
index 0000000000..32468abe83
--- /dev/null
+++ b/tools/http2_interop/s6.5.go
@@ -0,0 +1,32 @@
+package http2interop
+
+import (
+	"time"
+)
+
+// Section 6.5 says the minimum SETTINGS_MAX_FRAME_SIZE is 16,384
+func testSmallMaxFrameSize(ctx *HTTP2InteropCtx) error {
+	conn, err := connect(ctx)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+	conn.SetDeadline(time.Now().Add(defaultTimeout))
+
+	sf := &SettingsFrame{
+		Params: []SettingsParameter{{
+			Identifier: SettingsMaxFrameSize,
+			Value:      1<<14 - 1, // 1 less than the smallest maximum
+		}},
+	}
+
+	if err := http2Connect(conn, sf); err != nil {
+		return err
+	}
+
+	if _, err := expectGoAwaySoon(conn); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/tools/http2_interop/s6.5_test.go b/tools/http2_interop/s6.5_test.go
new file mode 100644
index 0000000000..9dadd4e699
--- /dev/null
+++ b/tools/http2_interop/s6.5_test.go
@@ -0,0 +1,15 @@
+package http2interop
+
+import (
+	"testing"
+)
+
+func TestSoonSmallMaxFrameSize(t *testing.T) {
+	defer Report(t)
+	if *testCase != "framing" {
+		t.SkipNow()
+	}
+	ctx := InteropCtx(t)
+	err := testSmallMaxFrameSize(ctx)
+	matchError(t, err, "Got goaway frame")
+}
diff --git a/tools/http2_interop/settings.go b/tools/http2_interop/settings.go
index 5a2b1ada65..97914d960f 100644
--- a/tools/http2_interop/settings.go
+++ b/tools/http2_interop/settings.go
@@ -29,19 +29,19 @@ const (
 func (si SettingsIdentifier) String() string {
 	switch si {
 	case SettingsHeaderTableSize:
-		return "HEADER_TABLE_SIZE"
+		return "SETTINGS_HEADER_TABLE_SIZE"
 	case SettingsEnablePush:
-		return "ENABLE_PUSH"
+		return "SETTINGS_ENABLE_PUSH"
 	case SettingsMaxConcurrentStreams:
-		return "MAX_CONCURRENT_STREAMS"
+		return "SETTINGS_MAX_CONCURRENT_STREAMS"
 	case SettingsInitialWindowSize:
-		return "INITIAL_WINDOW_SIZE"
+		return "SETTINGS_INITIAL_WINDOW_SIZE"
 	case SettingsMaxFrameSize:
-		return "MAX_FRAME_SIZE"
+		return "SETTINGS_MAX_FRAME_SIZE"
 	case SettingsMaxHeaderListSize:
-		return "MAX_HEADER_LIST_SIZE"
+		return "SETTINGS_MAX_HEADER_LIST_SIZE"
 	default:
-		return fmt.Sprintf("UNKNOWN(%d)", uint16(si))
+		return fmt.Sprintf("SETTINGS_UNKNOWN(%d)", uint16(si))
 	}
 }
 
@@ -82,7 +82,7 @@ func (f *SettingsFrame) UnmarshalPayload(raw []byte) error {
 }
 
 func (f *SettingsFrame) MarshalPayload() ([]byte, error) {
-	raw := make([]byte, 0, len(f.Params)*6)
+	raw := make([]byte, len(f.Params)*6)
 	for i, p := range f.Params {
 		binary.BigEndian.PutUint16(raw[i*6:i*6+2], uint16(p.Identifier))
 		binary.BigEndian.PutUint32(raw[i*6+2:i*6+6], p.Value)
@@ -102,7 +102,6 @@ func (f *SettingsFrame) MarshalBinary() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	header = append(header, payload...)
 
 	return header, nil
diff --git a/tools/http2_interop/testsuite.go b/tools/http2_interop/testsuite.go
new file mode 100644
index 0000000000..51d36e217e
--- /dev/null
+++ b/tools/http2_interop/testsuite.go
@@ -0,0 +1,56 @@
+package http2interop
+
+import (
+	"path"
+	"runtime"
+	"strings"
+	"sync"
+	"testing"
+)
+
+// When a test is skipped or fails, runtime.Goexit() is called which destroys the callstack.
+// This means the name of the test case is lost, so we need to grab a copy of pc before.
+func Report(t testing.TB) {
+	// If the goroutine panics, Fatal()s, or Skip()s, the function name is at the 3rd callstack
+	// layer.  On success, its at 1st.  Since it's hard to check which happened, just try both.
+	pcs := make([]uintptr, 10)
+	total := runtime.Callers(1, pcs)
+	var name string
+	for _, pc := range pcs[:total] {
+		fn := runtime.FuncForPC(pc)
+		fullName := fn.Name()
+		if strings.HasPrefix(path.Ext(fullName), ".Test") {
+			// Skip the leading .
+			name = string([]byte(path.Ext(fullName))[1:])
+			break
+		}
+	}
+	if name == "" {
+		return
+	}
+
+	allCaseInfos.lock.Lock()
+	defer allCaseInfos.lock.Unlock()
+	allCaseInfos.Cases = append(allCaseInfos.Cases, &caseInfo{
+		Name:    name,
+		Passed:  !t.Failed() && !t.Skipped(),
+		Skipped: t.Skipped(),
+		Fatal:   t.Failed() && !strings.HasPrefix(name, "TestSoon"),
+	})
+}
+
+type caseInfo struct {
+	Name    string `json:"name"`
+	Passed  bool   `json:"passed"`
+	Skipped bool   `json:"skipped,omitempty"`
+	Fatal   bool   `json:"fatal,omitempty"`
+}
+
+type caseInfos struct {
+	lock  sync.Mutex
+	Cases []*caseInfo `json:"cases"`
+}
+
+var (
+	allCaseInfos = caseInfos{}
+)
diff --git a/tools/jenkins/grpc_interop_php/Dockerfile b/tools/jenkins/grpc_interop_php/Dockerfile
index 09da713691..492d20cdb5 100644
--- a/tools/jenkins/grpc_interop_php/Dockerfile
+++ b/tools/jenkins/grpc_interop_php/Dockerfile
@@ -100,5 +100,19 @@ RUN /bin/bash -l -c "rvm all do gem install ronn rake"
 RUN curl -sS https://getcomposer.org/installer | php
 RUN mv composer.phar /usr/local/bin/composer
 
+# Download the patched PHP protobuf so that PHP gRPC clients can be generated
+# from proto3 schemas.
+RUN git clone https://github.com/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php
+
+RUN /bin/bash -l -c "rvm use ruby-2.1 \
+  && cd /var/local/git/protobuf-php \
+  && rvm all do rake pear:package version=1.0 \
+  && pear install Protobuf-1.0.tgz"
+
+# As an attempt to work around #4212, try to prefetch Protobuf-PHP dependency
+# into composer cache to prevent "composer install" from cloning on each build.
+RUN git clone --mirror https://github.com/stanley-cheung/Protobuf-PHP.git \
+  /root/.composer/cache/vcs/git-github.com-stanley-cheung-Protobuf-PHP.git/
+
 # Define the default command.
 CMD ["bash"]
diff --git a/tools/jenkins/grpc_interop_php/build_interop.sh b/tools/jenkins/grpc_interop_php/build_interop.sh
index cd9d67804a..87262f1d62 100755
--- a/tools/jenkins/grpc_interop_php/build_interop.sh
+++ b/tools/jenkins/grpc_interop_php/build_interop.sh
@@ -29,7 +29,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Builds PHP interop server and client in a base image.
-set -e
+set -ex
 
 mkdir -p /var/local/git
 git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
@@ -45,18 +45,10 @@ make install-certs
 # gRPC core and protobuf need to be installed
 make install
 
-# Download the patched PHP protobuf so that PHP gRPC clients can be generated
-# from proto3 schemas.
-git clone https://github.com/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php
-
 (cd src/php/ext/grpc && phpize && ./configure && make)
 
 (cd third_party/protobuf && make install)
 
-(cd /var/local/git/protobuf-php \
-  && rvm all do rake pear:package version=1.0 \
-  && pear install Protobuf-1.0.tgz)
-
 (cd src/php && composer install)
 
 (cd src/php && protoc-gen-php -i tests/interop/ -o tests/interop/ tests/interop/test.proto)
diff --git a/tools/jenkins/grpc_interop_python/Dockerfile b/tools/jenkins/grpc_interop_python/Dockerfile
index 5850f5f321..6034cbf955 100644
--- a/tools/jenkins/grpc_interop_python/Dockerfile
+++ b/tools/jenkins/grpc_interop_python/Dockerfile
@@ -75,6 +75,7 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
 # Install Python requisites
 RUN /bin/bash -l -c "pip install --upgrade pip"
 RUN /bin/bash -l -c "pip install virtualenv"
+RUN /bin/bash -l -c "pip install tox"
 
 # Define the default command.
 CMD ["bash"]
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile
index 5b8c24c076..916e5e83fb 100644
--- a/tools/jenkins/grpc_jenkins_slave/Dockerfile
+++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile
@@ -131,7 +131,7 @@ RUN apt-get update && apt-get install -y \
 # Install Python packages from PyPI
 RUN pip install pip --upgrade
 RUN pip install virtualenv
-RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2
+RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
 
 # For sanity test
 RUN pip install simplejson mako
diff --git a/tools/jenkins/run_performance.sh b/tools/jenkins/run_performance.sh
new file mode 100755
index 0000000000..a60b1bbbd0
--- /dev/null
+++ b/tools/jenkins/run_performance.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# 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 script is invoked by Jenkins and runs performance smoke test.
+set -ex
+
+# Enter the gRPC repo root
+cd $(dirname $0)/../..
+
+config=opt
+
+make CONFIG=$config qps_worker qps_driver -j8
+
+bins/$config/qps_worker -driver_port 10000 &
+PID1=$!
+bins/$config/qps_worker -driver_port 10010 &
+PID2=$!
+
+export QPS_WORKERS="localhost:10000,localhost:10010"
+
+bins/$config/qps_driver $*
+
+kill -2 $PID1 $PID2
+wait
diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh
index 24cf6ba7c8..57080ce934 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -34,71 +34,16 @@ set -ex
 cd $(dirname $0)/../..
 
 ROOT=`pwd`
-PATH=$ROOT/bins/$CONFIG:$ROOT/bins/$CONFIG/protobuf:$PATH
 GRPCIO=$ROOT/src/python/grpcio
-GRPCIO_TEST=$ROOT/src/python/grpcio_test
-GRPCIO_HEALTH_CHECKING=$ROOT/src/python/grpcio_health_checking
-
-install_grpcio_deps() {
-  cd $GRPCIO
-  pip install -r requirements.txt
-}
-install_grpcio_test_deps() {
-  cd $GRPCIO_TEST
-  pip install -r requirements.txt
-}
-
-install_grpcio() {
-  CFLAGS="-I$ROOT/include -std=c89" LDFLAGS=-L$ROOT/libs/$CONFIG GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install $GRPCIO
-}
-install_grpcio_test() {
-  pip install $GRPCIO_TEST
-}
-install_grpcio_health_checking() {
-  pip install $GRPCIO_HEALTH_CHECKING
-}
-
-# Cleans the environment of previous installations
-clean_grpcio_all() {
-  (yes | pip uninstall grpcio) || true
-  (yes | pip uninstall grpcio_test) || true
-  (yes | pip uninstall grpcio_health_checking) || true
-}
-
-# Builds the testing environment.
-make_virtualenv() {
-  virtualenv_name="python"$1"_virtual_environment"
-  if [ ! -d $virtualenv_name ]
-  then
-    # Build the entire virtual environment
-    virtualenv -p `which "python"$1` $virtualenv_name
-    source $virtualenv_name/bin/activate
-
-    # Install grpcio
-    install_grpcio_deps
-    install_grpcio
-
-    # Install grpcio_test
-    install_grpcio_test_deps
-    install_grpcio_test
-
-    # Install grpcio_health_checking
-    install_grpcio_health_checking
-  else
-    source $virtualenv_name/bin/activate
-    # Uninstall and re-install the packages we care about. Don't use
-    # --force-reinstall or --ignore-installed to avoid propagating this
-    # unnecessarily to dependencies. Don't use --no-deps to avoid missing
-    # dependency upgrades.
-    clean_grpcio_all
-    install_grpcio || (
-      # Fall back to rebuilding the entire environment
-      rm -rf $virtualenv_name
-      make_virtualenv $1
-    )
-    install_grpcio_test
-    install_grpcio_health_checking
-  fi
-}
-
-make_virtualenv $1
+export LD_LIBRARY_PATH=$ROOT/libs/$CONFIG
+export DYLD_LIBRARY_PATH=$ROOT/libs/$CONFIG
+export PATH=$ROOT/bins/$CONFIG:$ROOT/bins/$CONFIG/protobuf:$PATH
+export CFLAGS="-I$ROOT/include -std=c89"
+export LDFLAGS="-L$ROOT/libs/$CONFIG"
+export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+export GRPC_PYTHON_ENABLE_CYTHON_TRACING=1
+
+cd $GRPCIO
+tox --notest
+
+$GRPCIO/.tox/py27/bin/python $GRPCIO/setup.py build
diff --git a/tools/run_tests/interop_html_report.template b/tools/run_tests/interop_html_report.template
new file mode 100644
index 0000000000..c01bdf7a77
--- /dev/null
+++ b/tools/run_tests/interop_html_report.template
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<html lang="en">
+<head><title>Interop Test Result</title></head>
+<body>
+
+<%def name="fill_one_test_result(shortname, resultset)">
+  % if shortname in resultset:
+    ## Because interop tests does not have runs_per_test flag, each test is 
+    ## run once. So there should only be one element for each result.
+    <% result = resultset[shortname][0] %>
+    % if result.state == 'PASSED':      
+        <td bgcolor="green">PASS</td>
+    % else:
+      <% 
+        tooltip = ''
+        if result.returncode > 0 or result.message:
+          if result.returncode > 0:
+            tooltip = 'returncode: %d ' % result.returncode
+          if result.message:
+            tooltip = '%smessage: %s' % (tooltip, result.message)  
+      %>     
+      % if result.state == 'FAILED':
+        <td bgcolor="red">
+        % if tooltip:  
+          <a href="#" data-toggle="tooltip" data-placement="auto" title="${tooltip | h}">FAIL</a></td>
+        % else:
+          FAIL</td>
+        % endif
+      % elif result.state == 'TIMEOUT':
+        <td bgcolor="yellow">
+        % if tooltip:
+          <a href="#" data-toggle="tooltip" data-placement="auto" title="${tooltip | h}">TIMEOUT</a></td> 
+        % else:
+          TIMEOUT</td>
+        % endif
+      % endif
+    % endif
+  % else:
+     <td bgcolor="magenta">Not implemented</td>
+  % endif
+</%def>
+
+<%def name="fill_one_http2_test_result(shortname, resultset)">
+    ## keep this mostly in sync with the template above
+  % if shortname in resultset:
+    ## Because interop tests does not have runs_per_test flag, each test is 
+    ## run once. So there should only be one element for each result.
+    <% result = resultset[shortname][0] %>
+    <td bgcolor="white">
+      <div style="width:95%; border: 1px solid black; position: relative; padding: 3px;">
+        <span style="position: absolute; left: 45%;">${int(result.http2results['percent'] * 100)}&#37;</span>
+        <div style="height: 20px; 
+          background-color: hsl(${result.http2results['percent'] * 120}, 100%, 50%); 
+          width: ${result.http2results['percent'] * 100}%;"
+          title="${result.http2results['failed_cases'] | h}"></div>
+      </div>
+    </td>
+  % else:
+     <td bgcolor="magenta">Not implemented</td>
+  % endif
+</%def>
+
+% if num_failures > 1:
+  <p><h2><font color="red">${num_failures} tests failed!</font></h2></p>
+% elif num_failures:
+  <p><h2><font color="red">${num_failures} test failed!</font></h2></p>
+% else:
+  <p><h2><font color="green">All tests passed!</font></h2></p>
+% endif
+
+% if cloud_to_prod:
+  ## Each column header is the client language.
+  <h2>Cloud to Prod</h2>
+  <table style="width:100%" border="1">
+  <tr bgcolor="#00BFFF">
+  <th>Client languages &#9658;<br/>Test Cases &#9660;</th>
+  % for client_lang in client_langs:
+    <th>${client_lang}</th>
+  % endfor
+  </tr>
+  % for test_case in test_cases + auth_test_cases:
+    <tr><td><b>${test_case}</b></td>
+    % for client_lang in client_langs:
+      <% 
+        if test_case in auth_test_cases:
+          shortname = 'cloud_to_prod_auth:%s:%s' % (client_lang, test_case)
+        else:
+          shortname = 'cloud_to_prod:%s:%s' % (client_lang, test_case)
+      %>
+      ${fill_one_test_result(shortname, resultset)}
+    % endfor
+    </tr> 
+  % endfor
+  </table>
+% endif
+
+% if http2_interop:
+  ## Each column header is the server language.
+  <h2>HTTP/2 Interop</h2> 
+  <table style="width:100%" border="1">
+  <tr bgcolor="#00BFFF">
+  <th>Servers &#9658;<br/>Test Cases &#9660;</th>
+  % for server_lang in server_langs:
+    <th>${server_lang}</th>
+  % endfor
+  % if cloud_to_prod:
+    <th>prod</th>
+  % endif
+  </tr>
+  % for test_case in http2_cases:
+    <tr><td><b>${test_case}</b></td>
+    ## Fill up the cells with test result.
+    % for server_lang in server_langs:
+      <% 
+        shortname = 'cloud_to_cloud:http2:%s_server:%s' % (
+            server_lang, test_case)
+      %>
+      ${fill_one_http2_test_result(shortname, resultset)}
+    % endfor
+    % if cloud_to_prod:
+      <% shortname = 'cloud_to_prod:http2:%s' % test_case %>
+      ${fill_one_http2_test_result(shortname, resultset)}
+    % endif
+    </tr>
+  % endfor
+  </table>
+% endif
+
+% if server_langs:
+  % for test_case in test_cases:
+    ## Each column header is the client language.
+    <h2>${test_case}</h2> 
+    <table style="width:100%" border="1">
+    <tr bgcolor="#00BFFF">
+    <th>Client languages &#9658;<br/>Server languages &#9660;</th>
+    % for client_lang in client_langs:
+      <th>${client_lang}</th>
+    % endfor
+    </tr>
+    ## Each row head is the server language.
+    % for server_lang in server_langs:
+      <tr>
+      <td><b>${server_lang}</b></td>
+      % for client_lang in client_langs:
+        <% 
+          shortname = 'cloud_to_cloud:%s:%s_server:%s' % (
+              client_lang, server_lang, test_case)
+        %>
+        ${fill_one_test_result(shortname, resultset)}
+      % endfor
+      </tr>
+    % endfor
+    </table>
+  % endfor
+% endif
+
+<script>
+  $(document).ready(function(){$('[data-toggle="tooltip"]').tooltip();});
+</script>
+</body>
+</html>
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index 5a26bff709..fdbddf82ee 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -178,6 +178,9 @@ class JobSpec(object):
 
   def __cmp__(self, other):
     return self.identity() == other.identity()
+    
+  def __repr__(self):
+    return 'JobSpec(shortname=%s, cmdline=%s)' % (self.shortname, self.cmdline)
 
 
 class JobResult(object):
@@ -314,9 +317,13 @@ class Jobset(object):
     self._hashes = {}
     self._add_env = add_env
     self.resultset = {}
-    
+    self._remaining = None
+
+  def set_remaining(self, remaining):
+    self._remaining = remaining
+
   def get_num_failures(self):
-    return self._failures  
+    return self._failures
 
   def start(self, spec):
     """Start a job. Return True on success, False on failure."""
@@ -369,8 +376,9 @@ class Jobset(object):
         self._running.remove(job)
       if dead: return
       if (not self._travis):
-        message('WAITING', '%d jobs running, %d complete, %d failed' % (
-            len(self._running), self._completed, self._failures))
+        rstr = '' if self._remaining is None else '%d queued, ' % self._remaining
+        message('WAITING', '%s%d jobs running, %d complete, %d failed' % (
+            rstr, len(self._running), self._completed, self._failures))
       if platform_string() == 'windows':
         time.sleep(0.1)
       else:
@@ -409,6 +417,17 @@ class NoCache(object):
     pass
 
 
+def tag_remaining(xs):
+  staging = []
+  for x in xs:
+    staging.append(x)
+    if len(staging) > 1000:
+      yield (staging.pop(0), None)
+  n = len(staging)
+  for i, x in enumerate(staging):
+    yield (x, n - i - 1)
+
+
 def run(cmdlines,
         check_cancelled=_never_cancelled,
         maxjobs=None,
@@ -422,8 +441,11 @@ def run(cmdlines,
               maxjobs if maxjobs is not None else _DEFAULT_MAX_JOBS,
               newline_on_success, travis, stop_on_failure, add_env,
               cache if cache is not None else NoCache())
-  for cmdline in cmdlines:
+  for cmdline, remaining in tag_remaining(cmdlines):
     if not js.start(cmdline):
       break
-  js.finish()  
+    if remaining is not None:
+      js.set_remaining(remaining)
+  js.finish()
   return js.get_num_failures(), js.resultset
+
diff --git a/tools/run_tests/report_utils.py b/tools/run_tests/report_utils.py
index adeb707a07..35f2069bee 100644
--- a/tools/run_tests/report_utils.py
+++ b/tools/run_tests/report_utils.py
@@ -32,6 +32,7 @@
 try:
   from mako.runtime import Context
   from mako.template import Template
+  from mako import exceptions
 except (ImportError):
   pass  # Mako not installed but it is ok. 
 import os
@@ -78,8 +79,7 @@ def render_interop_html_report(
   client_langs, server_langs, test_cases, auth_test_cases, http2_cases, 
   resultset, num_failures, cloud_to_prod, http2_interop):
   """Generate HTML report for interop tests."""
-  html_report_dir = 'reports'
-  template_file = os.path.join(html_report_dir, 'interop_html_report.template')
+  template_file = 'tools/run_tests/interop_html_report.template'
   try:
     mytemplate = Template(filename=template_file, format_exceptions=True)
   except NameError:
@@ -104,6 +104,15 @@ def render_interop_html_report(
           'num_failures': num_failures,
           'cloud_to_prod': cloud_to_prod,
           'http2_interop': http2_interop}
-  html_file_path = os.path.join(html_report_dir, 'index.html')
-  with open(html_file_path, 'w') as output_file:
-    mytemplate.render_context(Context(output_file, **args))
+
+  html_report_out_dir = 'reports' 
+  if not os.path.exists(html_report_out_dir):
+    os.mkdir(html_report_out_dir) 
+  html_file_path = os.path.join(html_report_out_dir, 'index.html')
+  try:
+    with open(html_file_path, 'w') as output_file:
+      mytemplate.render_context(Context(output_file, **args))
+  except:
+    print(exceptions.text_error_template().render())
+    raise
+
diff --git a/tools/run_tests/run_csharp.bat b/tools/run_tests/run_csharp.bat
index 0e33e5295a..0aa32ea596 100644
--- a/tools/run_tests/run_csharp.bat
+++ b/tools/run_tests/run_csharp.bat
@@ -18,6 +18,9 @@ if not "%CONFIG%" == "gcov" (
   packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -target:"packages\NUnit.Runners.2.6.4\tools\nunit-console-x86.exe" -targetdir:"." -targetargs:"/domain:None -labels Grpc.Core.Tests/bin/Debug/Grpc.Core.Tests.dll Grpc.IntegrationTesting/bin/Debug/Grpc.IntegrationTesting.dll Grpc.Examples.Tests/bin/Debug/Grpc.Examples.Tests.dll Grpc.HealthCheck.Tests/bin/Debug/Grpc.HealthCheck.Tests.dll" -filter:"+[Grpc.Core]*"  -register:user -output:coverage_results.xml || goto :error
 
   packages\ReportGenerator.2.3.2.0\tools\ReportGenerator.exe -reports:"coverage_results.xml" -targetdir:"..\..\reports\csharp_coverage" -reporttypes:"Html;TextSummary" || goto :error
+
+  @rem Generate the index.html file
+  echo ^<html^>^<head^>^</head^>^<body^>^<a href='csharp_coverage/index.htm'^>csharp coverage^</a^>^<br/^>^</body^>^</html^> >..\..\reports\index.html
 )
 
 endlocal
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 5435a1d02f..7a09feb70d 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -31,17 +31,24 @@
 """Run interop (cross-language) tests in parallel."""
 
 import argparse
+import atexit
 import dockerjob
 import itertools
 import jobset
+import json
 import multiprocessing
 import os
+import re
 import report_utils
+import subprocess
 import sys
 import tempfile
 import time
 import uuid
 
+# Docker doesn't clean up after itself, so we do it on exit.
+atexit.register(lambda: subprocess.call(['stty', 'echo']))
+
 ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
 os.chdir(ROOT)
 
@@ -52,6 +59,11 @@ _DEFAULT_SERVER_PORT=8080
 # supported by C core SslCredentials instead.
 _SSL_CERT_ENV = { 'SSL_CERT_FILE':'/usr/local/share/grpc/roots.pem' }
 
+_SKIP_COMPRESSION = ['large_compressed_unary',
+                     'server_compressed_streaming']
+
+_SKIP_ADVANCED = ['custom_metadata', 'status_code_and_message',
+                  'unimplemented_method']
 
 class CXXLanguage:
 
@@ -60,20 +72,23 @@ class CXXLanguage:
     self.server_cwd = None
     self.safename = 'cxx'
 
-  def client_args(self):
-    return ['bins/opt/interop_client']
+  def client_cmd(self, args):
+    return ['bins/opt/interop_client'] + args
 
   def cloud_to_prod_env(self):
     return {}
 
-  def server_args(self):
-    return ['bins/opt/interop_server', '--use_tls=true']
+  def server_cmd(self, args):
+    return ['bins/opt/interop_server', '--use_tls=true'] + args
 
   def global_env(self):
     return {}
 
   def unimplemented_test_cases(self):
-    return []
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
 
   def __str__(self):
     return 'c++'
@@ -86,20 +101,24 @@ class CSharpLanguage:
     self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug'
     self.safename = str(self)
 
-  def client_args(self):
-    return ['mono', 'Grpc.IntegrationTesting.Client.exe']
+  def client_cmd(self, args):
+    return ['mono', 'Grpc.IntegrationTesting.Client.exe'] + args
 
   def cloud_to_prod_env(self):
     return _SSL_CERT_ENV
 
-  def server_args(self):
-    return ['mono', 'Grpc.IntegrationTesting.Server.exe', '--use_tls=true']
+  def server_cmd(self, args):
+    return ['mono', 'Grpc.IntegrationTesting.Server.exe', '--use_tls=true'] + args
 
   def global_env(self):
     return {}
 
   def unimplemented_test_cases(self):
-    return []
+    # TODO: status_code_and_message doesn't work against node_server
+    return _SKIP_COMPRESSION + ['status_code_and_message']
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_COMPRESSION
 
   def __str__(self):
     return 'csharp'
@@ -112,20 +131,23 @@ class JavaLanguage:
     self.server_cwd = '../grpc-java'
     self.safename = str(self)
 
-  def client_args(self):
-    return ['./run-test-client.sh']
+  def client_cmd(self, args):
+    return ['./run-test-client.sh'] + args
 
   def cloud_to_prod_env(self):
     return {}
 
-  def server_args(self):
-    return ['./run-test-server.sh', '--use_tls=true']
+  def server_cmd(self, args):
+    return ['./run-test-server.sh', '--use_tls=true'] + args
 
   def global_env(self):
     return {}
 
   def unimplemented_test_cases(self):
-    return []
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
 
   def __str__(self):
     return 'java'
@@ -139,20 +161,23 @@ class GoLanguage:
     self.server_cwd = '/go/src/google.golang.org/grpc/interop/server'
     self.safename = str(self)
 
-  def client_args(self):
-    return ['go', 'run', 'client.go']
+  def client_cmd(self, args):
+    return ['go', 'run', 'client.go'] + args
 
   def cloud_to_prod_env(self):
     return {}
 
-  def server_args(self):
-    return ['go', 'run', 'server.go', '--use_tls=true']
+  def server_cmd(self, args):
+    return ['go', 'run', 'server.go', '--use_tls=true'] + args
 
   def global_env(self):
     return {}
 
   def unimplemented_test_cases(self):
-    return []
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
 
   def __str__(self):
     return 'go'
@@ -168,8 +193,8 @@ class Http2Client:
     self.client_cwd = None
     self.safename = str(self)
 
-  def client_args(self):
-    return ['tools/http2_interop/http2_interop.test', '-test.v']
+  def client_cmd(self, args):
+    return ['tools/http2_interop/http2_interop.test', '-test.v'] + args
 
   def cloud_to_prod_env(self):
     return {}
@@ -180,6 +205,9 @@ class Http2Client:
   def unimplemented_test_cases(self):
     return _TEST_CASES
 
+  def unimplemented_test_cases_server(self):
+    return []
+
   def __str__(self):
     return 'http2'
 
@@ -190,20 +218,23 @@ class NodeLanguage:
     self.server_cwd = None
     self.safename = str(self)
 
-  def client_args(self):
-    return ['node', 'src/node/interop/interop_client.js']
+  def client_cmd(self, args):
+    return ['node', 'src/node/interop/interop_client.js'] + args
 
   def cloud_to_prod_env(self):
     return _SSL_CERT_ENV
 
-  def server_args(self):
-    return ['node', 'src/node/interop/interop_server.js', '--use_tls=true']
+  def server_cmd(self, args):
+    return ['node', 'src/node/interop/interop_server.js', '--use_tls=true'] + args
 
   def global_env(self):
     return {}
 
   def unimplemented_test_cases(self):
-    return []
+    return _SKIP_COMPRESSION
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_COMPRESSION
 
   def __str__(self):
     return 'node'
@@ -215,8 +246,8 @@ class PHPLanguage:
     self.client_cwd = None
     self.safename = str(self)
 
-  def client_args(self):
-    return ['src/php/bin/interop_client.sh']
+  def client_cmd(self, args):
+    return ['src/php/bin/interop_client.sh'] + args
 
   def cloud_to_prod_env(self):
     return _SSL_CERT_ENV
@@ -225,6 +256,9 @@ class PHPLanguage:
     return {}
 
   def unimplemented_test_cases(self):
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
+
+  def unimplemented_test_cases_server(self):
     return []
 
   def __str__(self):
@@ -238,20 +272,23 @@ class RubyLanguage:
     self.server_cwd = None
     self.safename = str(self)
 
-  def client_args(self):
-    return ['ruby', 'src/ruby/bin/interop/interop_client.rb']
+  def client_cmd(self, args):
+    return ['ruby', 'src/ruby/bin/interop/interop_client.rb'] + args
 
   def cloud_to_prod_env(self):
     return _SSL_CERT_ENV
 
-  def server_args(self):
-    return ['ruby', 'src/ruby/bin/interop/interop_server.rb', '--use_tls=true']
+  def server_cmd(self, args):
+    return ['ruby', 'src/ruby/bin/interop/interop_server.rb', '--use_tls=true'] + args
 
   def global_env(self):
     return {}
 
   def unimplemented_test_cases(self):
-    return []
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
 
   def __str__(self):
     return 'ruby'
@@ -264,20 +301,36 @@ class PythonLanguage:
     self.server_cwd = None
     self.safename = str(self)
 
-  def client_args(self):
-    return ['python2.7_virtual_environment/bin/python', '-m', 'grpc_interop.client']
+  def client_cmd(self, args):
+    return [
+        'src/python/grpcio/.tox/py27/bin/python',
+        'src/python/grpcio/setup.py',
+        'run_interop',
+        '--client',
+        '--args=\'{}\''.format(' '.join(args))
+    ]
 
   def cloud_to_prod_env(self):
     return _SSL_CERT_ENV
 
-  def server_args(self):
-    return ['python2.7_virtual_environment/bin/python', '-m', 'grpc_interop.server', '--use_tls=true']
+  def server_cmd(self, args):
+    return [
+        'src/python/grpcio/.tox/py27/bin/python',
+        'src/python/grpcio/setup.py',
+        'run_interop',
+        '--server',
+        '--args=\'{}\''.format(' '.join(args) + ' --use_tls=true')
+    ]
 
   def global_env(self):
-    return {'LD_LIBRARY_PATH': 'libs/opt'}
+    return {'LD_LIBRARY_PATH': '{}/libs/opt'.format(DOCKER_WORKDIR_ROOT)}
 
   def unimplemented_test_cases(self):
-    return ['jwt_token_creds', 'per_rpc_creds']
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION + ['jwt_token_creds',
+                                                 'per_rpc_creds']
+
+  def unimplemented_test_cases_server(self):
+    return _SKIP_ADVANCED + _SKIP_COMPRESSION
 
   def __str__(self):
     return 'python'
@@ -300,13 +353,17 @@ _SERVERS = ['c++', 'node', 'csharp', 'java', 'go', 'ruby', 'python']
 _TEST_CASES = ['large_unary', 'empty_unary', 'ping_pong',
                'empty_stream', 'client_streaming', 'server_streaming',
                'cancel_after_begin', 'cancel_after_first_response',
-               'timeout_on_sleeping_server']
+               'timeout_on_sleeping_server', 'custom_metadata',
+               'status_code_and_message', 'unimplemented_method',
+               'large_compressed_unary', 'server_compressed_streaming']
 
 _AUTH_TEST_CASES = ['compute_engine_creds', 'jwt_token_creds',
                     'oauth2_auth_token', 'per_rpc_creds']
 
 _HTTP2_TEST_CASES = ["tls", "framing"]
 
+DOCKER_WORKDIR_ROOT = '/var/local/git/grpc'
+
 def docker_run_cmdline(cmdline, image, docker_args=[], cwd=None, environ=None):
   """Wraps given cmdline array to create 'docker run' cmdline from it."""
   docker_cmdline = ['docker', 'run', '-i', '--rm=true']
@@ -317,7 +374,7 @@ def docker_run_cmdline(cmdline, image, docker_args=[], cwd=None, environ=None):
       docker_cmdline += ['-e', '%s=%s' % (k,v)]
 
   # set working directory
-  workdir = '/var/local/git/grpc'
+  workdir = DOCKER_WORKDIR_ROOT
   if cwd:
     workdir = os.path.join(workdir, cwd)
   docker_cmdline += ['-w', workdir]
@@ -334,12 +391,12 @@ def bash_login_cmdline(cmdline):
   return ['bash', '-l', '-c', ' '.join(cmdline)]
 
 
-def add_auth_options(language, test_case, cmdline, env):
+def auth_options(language, test_case):
   """Returns (cmdline, env) tuple with cloud_to_prod_auth test options."""
 
   language = str(language)
-  cmdline = list(cmdline)
-  env = env.copy()
+  cmdargs = []
+  env = {}
 
   # TODO(jtattermusch): this file path only works inside docker
   key_filepath = '/root/service_account/stubbyCloudTestingTest-ee3fce360ac5.json'
@@ -351,19 +408,19 @@ def add_auth_options(language, test_case, cmdline, env):
     if language in ['csharp', 'node', 'php', 'python', 'ruby']:
       env['GOOGLE_APPLICATION_CREDENTIALS'] = key_filepath
     else:
-      cmdline += [key_file_arg]
+      cmdargs += [key_file_arg]
 
   if test_case in ['per_rpc_creds', 'oauth2_auth_token']:
-    cmdline += [oauth_scope_arg]
+    cmdargs += [oauth_scope_arg]
 
   if test_case == 'oauth2_auth_token' and language == 'c++':
     # C++ oauth2 test uses GCE creds and thus needs to know the default account
-    cmdline += [default_account_arg]
+    cmdargs += [default_account_arg]
 
   if test_case == 'compute_engine_creds':
-    cmdline += [oauth_scope_arg, default_account_arg]
+    cmdargs += [oauth_scope_arg, default_account_arg]
 
-  return (cmdline, env)
+  return (cmdargs, env)
 
 
 def _job_kill_handler(job):
@@ -378,18 +435,20 @@ def _job_kill_handler(job):
 
 def cloud_to_prod_jobspec(language, test_case, docker_image=None, auth=False):
   """Creates jobspec for cloud-to-prod interop test"""
-  cmdline = language.client_args() + [
+  container_name = None
+  cmdargs = [
       '--server_host_override=grpc-test.sandbox.google.com',
       '--server_host=grpc-test.sandbox.google.com',
       '--server_port=443',
       '--use_tls=true',
       '--test_case=%s' % test_case]
-  cwd = language.client_cwd
   environ = dict(language.cloud_to_prod_env(), **language.global_env())
-  container_name = None
   if auth:
-    cmdline, environ = add_auth_options(language, test_case, cmdline, environ)
-  cmdline = bash_login_cmdline(cmdline)
+    auth_cmdargs, auth_env = auth_options(language, test_case)
+    cmdargs += auth_cmdargs
+    environ.update(auth_env)
+  cmdline = bash_login_cmdline(language.client_cmd(cmdargs))
+  cwd = language.client_cwd
 
   if docker_image:
     container_name = dockerjob.random_name('interop_client_%s' % language.safename)
@@ -419,13 +478,13 @@ def cloud_to_prod_jobspec(language, test_case, docker_image=None, auth=False):
 def cloud_to_cloud_jobspec(language, test_case, server_name, server_host,
                            server_port, docker_image=None):
   """Creates jobspec for cloud-to-cloud interop test"""
-  cmdline = bash_login_cmdline(language.client_args() +
-                               ['--server_host_override=foo.test.google.fr',
-                                '--use_tls=true',
-                                '--use_test_ca=true',
-                                '--test_case=%s' % test_case,
-                                '--server_host=%s' % server_host,
-                                '--server_port=%s' % server_port])
+  cmdline = bash_login_cmdline(language.client_cmd([
+      '--server_host_override=foo.test.google.fr',
+      '--use_tls=true',
+      '--use_test_ca=true',
+      '--test_case=%s' % test_case,
+      '--server_host=%s' % server_host,
+      '--server_port=%s' % server_port]))
   cwd = language.client_cwd
   environ = language.global_env()
   if docker_image:
@@ -455,8 +514,8 @@ def cloud_to_cloud_jobspec(language, test_case, server_name, server_host,
 def server_jobspec(language, docker_image):
   """Create jobspec for running a server"""
   container_name = dockerjob.random_name('interop_server_%s' % language.safename)
-  cmdline = bash_login_cmdline(language.server_args() +
-                               ['--port=%s' % _DEFAULT_SERVER_PORT])
+  cmdline = bash_login_cmdline(
+      language.server_cmd(['--port=%s' % _DEFAULT_SERVER_PORT]))
   environ = language.global_env()
   docker_cmdline = docker_run_cmdline(cmdline,
                                       image=docker_image,
@@ -497,6 +556,33 @@ def build_interop_image_jobspec(language, tag=None):
   return build_job
 
 
+def aggregate_http2_results(stdout):
+  match = re.search(r'\{"cases[^\]]*\]\}', stdout)
+  if not match:
+    return None
+    
+  results = json.loads(match.group(0))
+  skipped = 0
+  passed = 0
+  failed = 0
+  failed_cases = []
+  for case in results['cases']:
+    if case.get('skipped', False):
+      skipped += 1
+    else:
+      if case.get('passed', False):
+        passed += 1
+      else:
+        failed += 1
+        failed_cases.append(case.get('name', "NONAME"))
+  return {
+    'passed': passed,
+    'failed': failed,
+    'skipped': skipped,
+    'failed_cases': ', '.join(failed_cases),
+    'percent': 1.0 * passed / (passed + failed)
+  }
+
 argp = argparse.ArgumentParser(description='Run interop tests.')
 argp.add_argument('-l', '--language',
                   choices=['all'] + sorted(_LANGUAGES),
@@ -547,7 +633,7 @@ argp.add_argument('--http2_interop',
                   action='store_const',
                   const=True,
                   help='Enable HTTP/2 interop tests')
-                  
+
 args = argp.parse_args()
 
 servers = set(s for s in itertools.chain.from_iterable(_SERVERS
@@ -571,7 +657,7 @@ languages = set(_LANGUAGES[l]
                 for l in itertools.chain.from_iterable(
                       _LANGUAGES.iterkeys() if x == 'all' else [x]
                       for x in args.language))
-                      
+
 http2Interop = Http2Client() if args.http2_interop else None
 
 docker_images={}
@@ -593,10 +679,10 @@ if args.use_docker:
     num_failures, _ = jobset.run(
         build_jobs, newline_on_success=True, maxjobs=args.jobs)
     if num_failures == 0:
-      jobset.message('SUCCESS', 'All docker images built successfully.', 
+      jobset.message('SUCCESS', 'All docker images built successfully.',
                      do_newline=True)
     else:
-      jobset.message('FAILED', 'Failed to build interop docker images.', 
+      jobset.message('FAILED', 'Failed to build interop docker images.',
                      do_newline=True)
       for image in docker_images.itervalues():
         dockerjob.remove_image(image, skip_nonexistent=True)
@@ -619,18 +705,17 @@ try:
     for language in languages:
       for test_case in _TEST_CASES:
         if not test_case in language.unimplemented_test_cases():
-          test_job = cloud_to_prod_jobspec(language, test_case,
-                                           docker_image=docker_images.get(str(language)))
-          jobs.append(test_job)
-          
-    # TODO(carl-mastrangelo): Currently prod TLS terminators aren't spec compliant. Reenable
-    # this once a better solution is in place.
-    if args.http2_interop and False:
+          if not test_case in _SKIP_ADVANCED + _SKIP_COMPRESSION:
+            test_job = cloud_to_prod_jobspec(language, test_case,
+                                             docker_image=docker_images.get(str(language)))
+            jobs.append(test_job)
+
+    if args.http2_interop:
       for test_case in _HTTP2_TEST_CASES:
         test_job = cloud_to_prod_jobspec(http2Interop, test_case,
                                          docker_image=docker_images.get(str(http2Interop)))
         jobs.append(test_job)
-     
+
 
   if args.cloud_to_prod_auth:
     for language in languages:
@@ -648,17 +733,22 @@ try:
 
   for server_name, server_address in server_addresses.iteritems():
     (server_host, server_port) = server_address
+    server_language = _LANGUAGES.get(server_name, None)
+    skip_server = []  # test cases unimplemented by server
+    if server_language:
+      skip_server = server_language.unimplemented_test_cases_server()
     for language in languages:
       for test_case in _TEST_CASES:
         if not test_case in language.unimplemented_test_cases():
-          test_job = cloud_to_cloud_jobspec(language,
-                                            test_case,
-                                            server_name,
-                                            server_host,
-                                            server_port,
-                                            docker_image=docker_images.get(str(language)))
-          jobs.append(test_job)
-          
+          if not test_case in skip_server:
+            test_job = cloud_to_cloud_jobspec(language,
+                                              test_case,
+                                              server_name,
+                                              server_host,
+                                              server_port,
+                                              docker_image=docker_images.get(str(language)))
+            jobs.append(test_job)
+
     if args.http2_interop:
       for test_case in _HTTP2_TEST_CASES:
         if server_name == "go":
@@ -678,7 +768,7 @@ try:
       dockerjob.remove_image(image, skip_nonexistent=True)
     sys.exit(1)
 
-  num_failures, resultset = jobset.run(jobs, newline_on_success=True, 
+  num_failures, resultset = jobset.run(jobs, newline_on_success=True,
                                        maxjobs=args.jobs)
   if num_failures:
     jobset.message('FAILED', 'Some tests failed', do_newline=True)
@@ -686,7 +776,11 @@ try:
     jobset.message('SUCCESS', 'All tests passed', do_newline=True)
 
   report_utils.render_junit_xml_report(resultset, 'report.xml')
-  
+
+  for name, job in resultset.iteritems():
+    if "http2" in name:
+      job[0].http2results = aggregate_http2_results(job[0].message)
+
   report_utils.render_interop_html_report(
       set([str(l) for l in languages]), servers, _TEST_CASES, _AUTH_TEST_CASES, 
       _HTTP2_TEST_CASES, resultset, num_failures,
diff --git a/tools/run_tests/run_lcov.sh b/tools/run_tests/run_lcov.sh
index a28ec138bb..ec97ebf0a5 100755
--- a/tools/run_tests/run_lcov.sh
+++ b/tools/run_tests/run_lcov.sh
@@ -33,9 +33,10 @@ set -ex
 out=$(readlink -f ${1:-coverage})
 
 root=$(readlink -f $(dirname $0)/../..)
+shift
 tmp=$(mktemp)
 cd $root
-tools/run_tests/run_tests.py -c gcov -l c c++ || true
+tools/run_tests/run_tests.py -c gcov -l c c++ $@ || true
 lcov --capture --directory . --output-file $tmp
 genhtml $tmp --output-directory $out
 rm $tmp
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index 848775e9b1..042b40485d 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -34,10 +34,18 @@ set -ex
 cd $(dirname $0)/../..
 
 ROOT=`pwd`
-GRPCIO_TEST=$ROOT/src/python/grpcio_test
+GRPCIO=$ROOT/src/python/grpcio
 export LD_LIBRARY_PATH=$ROOT/libs/$CONFIG
 export DYLD_LIBRARY_PATH=$ROOT/libs/$CONFIG
 export PATH=$ROOT/bins/$CONFIG:$ROOT/bins/$CONFIG/protobuf:$PATH
-source "python"$PYVER"_virtual_environment"/bin/activate
+export CFLAGS="-I$ROOT/include -std=c89"
+export LDFLAGS="-L$ROOT/libs/$CONFIG"
+export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+export GRPC_PYTHON_ENABLE_CYTHON_TRACING=1
 
-"python"$PYVER $GRPCIO_TEST/setup.py test -a "-n8 --cov=grpc --junitxml=./report.xml --timeout=300 -v --boxed --timeout_method=thread"
+cd $GRPCIO
+tox
+
+mkdir -p $ROOT/reports
+rm -rf $ROOT/reports/python-coverage
+(mv -T $GRPCIO/htmlcov $ROOT/reports/python-coverage) || true
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 4c85f202f4..006f4bcdf1 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -152,7 +152,10 @@ class CLanguage(object):
       else:
         binary = 'bins/%s/%s' % (config.build_config, target['name'])
       if os.path.isfile(binary):
-        out.append(config.job_spec([binary], [binary]))
+        out.append(config.job_spec([binary], [binary],
+                                   environ={'GRPC_DEFAULT_SSL_ROOTS_FILE_PATH':
+                                            os.path.abspath(os.path.dirname(
+                                                sys.argv[0]) + '/../../src/core/tsi/test_creds/ca.pem')}))
       elif args.regex == '.*' or platform_string() == 'windows':
         print '\nWARNING: binary not found, skipping', binary
     return sorted(out)
@@ -192,6 +195,7 @@ class CLanguage(object):
   def __str__(self):
     return self.make_target
 
+
 class NodeLanguage(object):
 
   def test_specs(self, config, args):
@@ -508,6 +512,43 @@ _WINDOWS_CONFIG = {
     }
 
 
+def _windows_arch_option(arch):
+  """Returns msbuild cmdline option for selected architecture."""
+  if arch == 'default' or arch == 'windows_x86':
+    return '/p:Platform=Win32'
+  elif arch == 'windows_x64':
+    return '/p:Platform=x64'
+  else:
+    print 'Architecture %s not supported on current platform.' % arch
+    sys.exit(1)
+
+    
+def _windows_build_bat(compiler):
+  """Returns name of build.bat for selected compiler."""
+  if compiler == 'default' or compiler == 'vs2013':
+    return 'vsprojects\\build_vs2013.bat'
+  elif compiler == 'vs2015':
+    return 'vsprojects\\build_vs2015.bat'
+  elif compiler == 'vs2010':
+    return 'vsprojects\\build_vs2010.bat'
+  else:
+    print 'Compiler %s not supported.' % compiler
+    sys.exit(1)
+    
+    
+def _windows_toolset_option(compiler):
+  """Returns msbuild PlatformToolset for selected compiler."""
+  if compiler == 'default' or compiler == 'vs2013':
+    return '/p:PlatformToolset=v120'
+  elif compiler == 'vs2015':
+    return '/p:PlatformToolset=v140'
+  elif compiler == 'vs2010':
+    return '/p:PlatformToolset=v100'
+  else:
+    print 'Compiler %s not supported.' % compiler
+    sys.exit(1)
+   
+
 def runs_per_test_type(arg_str):
     """Auxilary function to parse the "runs_per_test" flag.
 
@@ -572,6 +613,19 @@ argp.add_argument('--allow_flakes',
                   action='store_const',
                   const=True,
                   help='Allow flaky tests to show as passing (re-runs failed tests up to five times)')
+argp.add_argument('--arch',
+                  choices=['default', 'windows_x86', 'windows_x64'],
+                  default='default',
+                  help='Selects architecture to target. For some platforms "default" is the only supported choice.')
+argp.add_argument('--compiler',
+                  choices=['default', 'vs2010', 'vs2013', 'vs2015'],
+                  default='default',
+                  help='Selects compiler to use. For some platforms "default" is the only supported choice.')
+argp.add_argument('--build_only',
+                  default=False,
+                  action='store_const',
+                  const=True,
+                  help='Perform all the build steps but dont run any tests.')
 argp.add_argument('-a', '--antagonists', default=0, type=int)
 argp.add_argument('-x', '--xml_report', default=None, type=str,
         help='Generates a JUnit-compatible XML report')
@@ -633,6 +687,14 @@ if len(build_configs) > 1:
       print language, 'does not support multiple build configurations'
       sys.exit(1)
 
+if platform_string() != 'windows':
+  if args.arch != 'default':
+    print 'Architecture %s not supported on current platform.' % args.arch
+    sys.exit(1)
+  if args.compiler != 'default':
+    print 'Compiler %s not supported on current platform.' % args.compiler
+    sys.exit(1)
+
 if platform_string() == 'windows':
   def make_jobspec(cfg, targets, makefile='Makefile'):
     extra_args = []
@@ -643,9 +705,11 @@ if platform_string() == 'windows':
     # disable PDB generation: it's broken, and we don't need it during CI
     extra_args.extend(['/p:Jenkins=true'])
     return [
-      jobset.JobSpec(['vsprojects\\build.bat',
+      jobset.JobSpec([_windows_build_bat(args.compiler),
                       'vsprojects\\%s.sln' % target,
-                      '/p:Configuration=%s' % _WINDOWS_CONFIG[cfg]] +
+                      '/p:Configuration=%s' % _WINDOWS_CONFIG[cfg],
+                      _windows_toolset_option(args.compiler),
+                      _windows_arch_option(args.arch)] +
                       extra_args,
                       shell=True, timeout_seconds=90*60)
       for target in targets]
@@ -840,7 +904,7 @@ def _calculate_num_runs_failures(list_of_results):
 
 
 def _build_and_run(
-    check_cancelled, newline_on_success, cache, xml_report=None):
+    check_cancelled, newline_on_success, cache, xml_report=None, build_only=False):
   """Do one pass of building & running tests."""
   # build latest sequentially
   num_failures, _ = jobset.run(
@@ -848,6 +912,9 @@ def _build_and_run(
       newline_on_success=newline_on_success, travis=args.travis)
   if num_failures:
     return 1
+    
+  if build_only:
+    return 0
 
   # start antagonists
   antagonists = [subprocess.Popen(['tools/run_tests/antagonist.py'])
@@ -925,7 +992,8 @@ if forever:
     previous_success = success
     success = _build_and_run(check_cancelled=have_files_changed,
                              newline_on_success=False,
-                             cache=test_cache) == 0
+                             cache=test_cache,
+                             build_only=args.build_only) == 0
     if not previous_success and success:
       jobset.message('SUCCESS',
                      'All tests are now passing properly',
@@ -937,7 +1005,8 @@ else:
   result = _build_and_run(check_cancelled=lambda: False,
                           newline_on_success=args.newline_on_success,
                           cache=test_cache,
-                          xml_report=args.xml_report)
+                          xml_report=args.xml_report,
+                          build_only=args.build_only)
   if result == 0:
     jobset.message('SUCCESS', 'All tests passed', do_newline=True)
   else:
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 4ecffbe3ec..3a8bb8d54f 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -4,6 +4,18 @@
   {
     "deps": [
       "gpr", 
+      "gpr_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "alloc_test", 
+    "src": [
+      "test/core/support/alloc_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
       "gpr_test_util", 
       "grpc", 
       "grpc_test_util"
@@ -38,6 +50,20 @@
     ], 
     "headers": [], 
     "language": "c", 
+    "name": "channel_create_test", 
+    "src": [
+      "test/core/surface/channel_create_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
     "name": "chttp2_hpack_encoder_test", 
     "src": [
       "test/core/transport/chttp2/hpack_encoder_test.c"
@@ -80,6 +106,20 @@
     ], 
     "headers": [], 
     "language": "c", 
+    "name": "chttp2_varint_test", 
+    "src": [
+      "test/core/transport/chttp2/varint_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
     "name": "compression_test", 
     "src": [
       "test/core/compression/compression_test.c"
@@ -557,6 +597,20 @@
     ], 
     "headers": [], 
     "language": "c", 
+    "name": "grpc_invalid_channel_args_test", 
+    "src": [
+      "test/core/surface/invalid_channel_args_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
     "name": "grpc_json_token_test", 
     "src": [
       "test/core/security/json_token_test.c"
@@ -691,6 +745,48 @@
   {
     "deps": [
       "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "httpscli_test", 
+    "src": [
+      "test/core/httpcli/httpscli_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "init_test", 
+    "src": [
+      "test/core/surface/init_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "invalid_call_argument_test", 
+    "src": [
+      "test/core/end2end/invalid_call_argument_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
       "grpc"
     ], 
     "headers": [], 
@@ -793,9 +889,21 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "multi_init_test", 
+    "name": "multiple_server_queues_test", 
+    "src": [
+      "test/core/end2end/multiple_server_queues_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "murmur_hash_test", 
     "src": [
-      "test/core/surface/multi_init_test.c"
+      "test/core/support/murmur_hash_test.c"
     ]
   }, 
   {
@@ -807,21 +915,23 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "multiple_server_queues_test", 
+    "name": "no_server_test", 
     "src": [
-      "test/core/end2end/multiple_server_queues_test.c"
+      "test/core/end2end/no_server_test.c"
     ]
   }, 
   {
     "deps": [
       "gpr", 
-      "gpr_test_util"
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "murmur_hash_test", 
+    "name": "resolve_address_test", 
     "src": [
-      "test/core/support/murmur_hash_test.c"
+      "test/core/iomgr/resolve_address_test.c"
     ]
   }, 
   {
@@ -833,9 +943,9 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "no_server_test", 
+    "name": "secure_channel_create_test", 
     "src": [
-      "test/core/end2end/no_server_test.c"
+      "test/core/surface/secure_channel_create_test.c"
     ]
   }, 
   {
@@ -847,9 +957,9 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "resolve_address_test", 
+    "name": "secure_endpoint_test", 
     "src": [
-      "test/core/iomgr/resolve_address_test.c"
+      "test/core/security/secure_endpoint_test.c"
     ]
   }, 
   {
@@ -861,9 +971,9 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "secure_endpoint_test", 
+    "name": "server_chttp2_test", 
     "src": [
-      "test/core/security/secure_endpoint_test.c"
+      "test/core/surface/server_chttp2_test.c"
     ]
   }, 
   {
@@ -890,6 +1000,20 @@
     ], 
     "headers": [], 
     "language": "c", 
+    "name": "sockaddr_resolver_test", 
+    "src": [
+      "test/core/client_config/resolvers/sockaddr_resolver_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
     "name": "sockaddr_utils_test", 
     "src": [
       "test/core/iomgr/sockaddr_utils_test.c"
@@ -1016,6 +1140,20 @@
     ], 
     "headers": [], 
     "language": "c", 
+    "name": "transport_connectivity_state_test", 
+    "src": [
+      "test/core/transport/connectivity_state_test.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
     "name": "transport_metadata_test", 
     "src": [
       "test/core/transport/metadata_test.c"
@@ -1153,7 +1291,7 @@
     "language": "c++", 
     "name": "channel_arguments_test", 
     "src": [
-      "test/cpp/client/channel_arguments_test.cc"
+      "test/cpp/common/channel_arguments_test.cc"
     ]
   }, 
   {
@@ -1823,6 +1961,546 @@
   {
     "deps": [
       "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_bad_hostname", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_bad_hostname_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_binary_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_binary_metadata_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_call_creds", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_call_creds_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_cancel_after_accept", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_after_accept_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_cancel_after_client_done", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_after_client_done_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_cancel_after_invoke", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_after_invoke_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_cancel_before_invoke", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_before_invoke_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_cancel_in_a_vacuum", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_in_a_vacuum_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_cancel_with_status", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_with_status_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_channel_connectivity", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_channel_connectivity_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_channel_ping", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_channel_ping_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_compressed_payload", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_compressed_payload_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_default_host", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_default_host_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_disappearing_server", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_disappearing_server_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_empty_batch", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_empty_batch_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_graceful_server_shutdown", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_graceful_server_shutdown_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_high_initial_seqno", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_high_initial_seqno_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_hpack_size", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_hpack_size_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_invoke_large_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_invoke_large_request_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_large_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_large_metadata_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_max_concurrent_streams", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_max_concurrent_streams_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_max_message_length", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_max_message_length_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_metadata_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_negative_deadline", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_negative_deadline_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_no_op", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_no_op_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_payload", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_payload_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_ping_pong_streaming", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_ping_pong_streaming_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_registered_call", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_registered_call_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_request_with_flags", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_request_with_flags_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_request_with_payload", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_request_with_payload_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_server_finishes_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_server_finishes_request_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_shutdown_finishes_calls", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_calls_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_shutdown_finishes_tags", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_tags_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_simple_delayed_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_simple_delayed_request_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_simple_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_simple_request_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "end2end_fixture_h2_census", 
+      "end2end_test_trailing_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_trailing_metadata_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
       "end2end_fixture_h2_compress", 
       "end2end_test_bad_hostname", 
       "gpr", 
@@ -1959,7 +2637,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_compress", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1967,14 +2645,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_compress_census_simple_request_test", 
+    "name": "h2_compress_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_compress", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -1982,7 +2660,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_compress_channel_connectivity_test", 
+    "name": "h2_compress_channel_ping_test", 
     "src": []
   }, 
   {
@@ -2499,7 +3177,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_fakesec", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2507,14 +3185,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_fakesec_census_simple_request_test", 
+    "name": "h2_fakesec_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_fakesec", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -2522,7 +3200,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_fakesec_channel_connectivity_test", 
+    "name": "h2_fakesec_channel_ping_test", 
     "src": []
   }, 
   {
@@ -3039,7 +3717,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_full", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3047,14 +3725,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full_census_simple_request_test", 
+    "name": "h2_full_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_full", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3062,7 +3740,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full_channel_connectivity_test", 
+    "name": "h2_full_channel_ping_test", 
     "src": []
   }, 
   {
@@ -3579,7 +4257,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_full+poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3587,14 +4265,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full+poll_census_simple_request_test", 
+    "name": "h2_full+poll_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_full+poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -3602,7 +4280,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full+poll_channel_connectivity_test", 
+    "name": "h2_full+poll_channel_ping_test", 
     "src": []
   }, 
   {
@@ -4119,7 +4797,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_oauth2", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4127,14 +4805,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_oauth2_census_simple_request_test", 
+    "name": "h2_oauth2_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_oauth2", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -4142,7 +4820,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_oauth2_channel_connectivity_test", 
+    "name": "h2_oauth2_channel_ping_test", 
     "src": []
   }, 
   {
@@ -4659,21 +5337,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_proxy", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_proxy_census_simple_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_proxy", 
       "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
@@ -5124,21 +5787,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_sockpair", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_census_simple_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_sockpair", 
       "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
@@ -5604,21 +6252,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair+trace_census_simple_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_sockpair+trace", 
       "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
@@ -6069,21 +6702,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_1byte_census_simple_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_sockpair_1byte", 
       "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
@@ -6549,7 +7167,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_ssl", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6557,14 +7175,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_ssl_census_simple_request_test", 
+    "name": "h2_ssl_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_ssl", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -6572,7 +7190,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_ssl_channel_connectivity_test", 
+    "name": "h2_ssl_channel_ping_test", 
     "src": []
   }, 
   {
@@ -7089,7 +7707,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_ssl+poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7097,14 +7715,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_ssl+poll_census_simple_request_test", 
+    "name": "h2_ssl+poll_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_ssl+poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -7112,7 +7730,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_ssl+poll_channel_connectivity_test", 
+    "name": "h2_ssl+poll_channel_ping_test", 
     "src": []
   }, 
   {
@@ -7629,21 +8247,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_ssl_proxy", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_ssl_proxy_census_simple_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_ssl_proxy", 
       "end2end_test_default_host", 
       "gpr", 
       "gpr_test_util", 
@@ -8094,36 +8697,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uchannel", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_census_simple_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_channel_connectivity", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_channel_connectivity_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_uchannel", 
       "end2end_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
@@ -8139,36 +8712,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uchannel", 
-      "end2end_test_default_host", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_default_host_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_disappearing_server", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_disappearing_server_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_uchannel", 
       "end2end_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
@@ -8454,21 +8997,6 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uchannel", 
-      "end2end_test_simple_delayed_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_simple_delayed_request_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_h2_uchannel", 
       "end2end_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
@@ -8634,7 +9162,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uds", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8642,14 +9170,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds_census_simple_request_test", 
+    "name": "h2_uds_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uds", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -8657,7 +9185,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds_channel_connectivity_test", 
+    "name": "h2_uds_channel_ping_test", 
     "src": []
   }, 
   {
@@ -9159,7 +9687,7 @@
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uds+poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -9167,14 +9695,14 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds+poll_census_simple_request_test", 
+    "name": "h2_uds+poll_channel_connectivity_test", 
     "src": []
   }, 
   {
     "deps": [
       "end2end_certs", 
       "end2end_fixture_h2_uds+poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc", 
@@ -9182,7 +9710,7 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds+poll_channel_connectivity_test", 
+    "name": "h2_uds+poll_channel_ping_test", 
     "src": []
   }, 
   {
@@ -9547,8 +10075,498 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_bad_hostname", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_bad_hostname_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_binary_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_binary_metadata_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_cancel_after_accept", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_after_accept_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_cancel_after_client_done", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_after_client_done_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_cancel_after_invoke", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_after_invoke_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_cancel_before_invoke", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_before_invoke_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_in_a_vacuum_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_cancel_with_status", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_cancel_with_status_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_channel_connectivity", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_channel_connectivity_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_channel_ping", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_channel_ping_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_compressed_payload", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_compressed_payload_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_default_host", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_default_host_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_disappearing_server", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_disappearing_server_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_empty_batch", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_empty_batch_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_graceful_server_shutdown", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_graceful_server_shutdown_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_high_initial_seqno", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_high_initial_seqno_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_hpack_size", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_hpack_size_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_invoke_large_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_invoke_large_request_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_large_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_large_metadata_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_max_concurrent_streams", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_max_concurrent_streams_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_max_message_length", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_max_message_length_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_metadata_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_negative_deadline", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_negative_deadline_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_no_op", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_no_op_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_payload", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_payload_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_ping_pong_streaming", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_ping_pong_streaming_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_registered_call", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_registered_call_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_request_with_flags", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_request_with_flags_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_request_with_payload", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_request_with_payload_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_server_finishes_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_server_finishes_request_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_calls_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_tags_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_simple_delayed_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_simple_delayed_request_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_simple_request", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_simple_request_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_census", 
+      "end2end_nosec_test_trailing_metadata", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "h2_census_trailing_metadata_nosec_test", 
+    "src": []
+  }, 
+  {
+    "deps": [
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9561,8 +10579,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9575,8 +10593,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9589,8 +10607,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9603,8 +10621,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9617,8 +10635,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9631,8 +10649,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9645,8 +10663,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9659,8 +10677,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_census_simple_request", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9668,13 +10686,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_compress_census_simple_request_nosec_test", 
+    "name": "h2_compress_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_channel_connectivity", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9682,13 +10700,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_compress_channel_connectivity_nosec_test", 
+    "name": "h2_compress_channel_ping_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9701,8 +10719,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_default_host", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9715,8 +10733,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_disappearing_server", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9729,8 +10747,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9743,8 +10761,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9757,8 +10775,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9771,8 +10789,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9785,8 +10803,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9799,8 +10817,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9813,8 +10831,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9827,8 +10845,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9841,8 +10859,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9855,8 +10873,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9869,8 +10887,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9883,8 +10901,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9897,8 +10915,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9911,8 +10929,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9925,8 +10943,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9939,8 +10957,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9953,8 +10971,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9967,8 +10985,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9981,8 +10999,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -9995,8 +11013,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10009,8 +11027,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10023,8 +11041,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_compress", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_compress", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10037,8 +11055,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10051,8 +11069,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10065,8 +11083,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10079,8 +11097,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10093,8 +11111,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10107,8 +11125,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10121,8 +11139,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10135,8 +11153,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10149,8 +11167,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_census_simple_request", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10158,13 +11176,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full_census_simple_request_nosec_test", 
+    "name": "h2_full_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_channel_connectivity", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10172,13 +11190,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full_channel_connectivity_nosec_test", 
+    "name": "h2_full_channel_ping_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10191,8 +11209,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_default_host", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10205,8 +11223,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_disappearing_server", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10219,8 +11237,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10233,8 +11251,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10247,8 +11265,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10261,8 +11279,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10275,8 +11293,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10289,8 +11307,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10303,8 +11321,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10317,8 +11335,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10331,8 +11349,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10345,8 +11363,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10359,8 +11377,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10373,8 +11391,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10387,8 +11405,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10401,8 +11419,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10415,8 +11433,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10429,8 +11447,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10443,8 +11461,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10457,8 +11475,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10471,8 +11489,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10485,8 +11503,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10499,8 +11517,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10513,8 +11531,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_full", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10527,8 +11545,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10541,8 +11559,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10555,8 +11573,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10569,8 +11587,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10583,8 +11601,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10597,8 +11615,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10611,8 +11629,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10625,8 +11643,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10639,8 +11657,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10648,13 +11666,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full+poll_census_simple_request_nosec_test", 
+    "name": "h2_full+poll_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10662,13 +11680,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_full+poll_channel_connectivity_nosec_test", 
+    "name": "h2_full+poll_channel_ping_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10681,8 +11699,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_default_host", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10695,8 +11713,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10709,8 +11727,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10723,8 +11741,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10737,8 +11755,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10751,8 +11769,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10765,8 +11783,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10779,8 +11797,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10793,8 +11811,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10807,8 +11825,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10821,8 +11839,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10835,8 +11853,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10849,8 +11867,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10863,8 +11881,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10877,8 +11895,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10891,8 +11909,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10905,8 +11923,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10919,8 +11937,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10933,8 +11951,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10947,8 +11965,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10961,8 +11979,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10975,8 +11993,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -10989,8 +12007,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11003,8 +12021,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_full+poll", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_full+poll", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11017,8 +12035,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11031,8 +12049,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11045,8 +12063,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11059,8 +12077,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11073,8 +12091,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11087,8 +12105,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11101,8 +12119,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11115,8 +12133,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11129,22 +12147,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_proxy_census_simple_request_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_default_host", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_default_host", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11157,8 +12161,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_disappearing_server", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11171,8 +12175,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11185,8 +12189,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11199,8 +12203,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11213,8 +12217,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11227,8 +12231,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11241,8 +12245,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11255,8 +12259,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11269,8 +12273,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11283,8 +12287,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11297,8 +12301,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11311,8 +12315,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11325,8 +12329,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11339,8 +12343,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11353,8 +12357,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11367,8 +12371,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11381,8 +12385,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11395,8 +12399,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11409,8 +12413,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11423,8 +12427,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_proxy", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_proxy", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11437,8 +12441,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11451,8 +12455,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11465,8 +12469,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11479,8 +12483,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11493,8 +12497,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11507,8 +12511,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11521,8 +12525,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11535,8 +12539,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11549,22 +12553,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_census_simple_request_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11577,8 +12567,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11591,8 +12581,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11605,8 +12595,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11619,8 +12609,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11633,8 +12623,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11647,8 +12637,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11661,8 +12651,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11675,8 +12665,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11689,8 +12679,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11703,8 +12693,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11717,8 +12707,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11731,8 +12721,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11745,8 +12735,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11759,8 +12749,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11773,8 +12763,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11787,8 +12777,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11801,8 +12791,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11815,8 +12805,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11829,8 +12819,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11843,8 +12833,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11857,8 +12847,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_sockpair", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11871,8 +12861,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11885,8 +12875,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11899,8 +12889,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11913,8 +12903,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11927,8 +12917,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11941,8 +12931,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11955,8 +12945,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11969,8 +12959,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -11983,22 +12973,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair+trace_census_simple_request_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12011,8 +12987,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12025,8 +13001,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12039,8 +13015,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12053,8 +13029,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12067,8 +13043,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12081,8 +13057,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12095,8 +13071,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12109,8 +13085,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12123,8 +13099,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12137,8 +13113,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12151,8 +13127,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12165,8 +13141,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12179,8 +13155,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12193,8 +13169,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12207,8 +13183,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12221,8 +13197,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12235,8 +13211,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12249,8 +13225,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12263,8 +13239,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12277,8 +13253,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair+trace", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_sockpair+trace", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12291,8 +13267,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12305,8 +13281,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12319,8 +13295,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12333,8 +13309,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12347,8 +13323,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12361,8 +13337,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12375,8 +13351,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12389,8 +13365,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12403,22 +13379,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_sockpair_1byte_census_simple_request_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12431,8 +13393,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12445,8 +13407,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12459,8 +13421,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12473,8 +13435,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12487,8 +13449,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12501,8 +13463,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12515,8 +13477,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12529,8 +13491,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12543,8 +13505,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12557,8 +13519,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12571,8 +13533,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12585,8 +13547,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12599,8 +13561,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12613,8 +13575,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12627,8 +13589,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12641,8 +13603,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12655,8 +13617,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12669,8 +13631,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12683,8 +13645,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12697,8 +13659,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12711,8 +13673,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_sockpair_1byte", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_sockpair_1byte", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12725,8 +13687,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12739,8 +13701,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12753,8 +13715,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12767,8 +13729,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12781,8 +13743,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12795,8 +13757,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12809,8 +13771,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12823,8 +13785,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12837,36 +13799,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_census_simple_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_census_simple_request_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_channel_connectivity", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_channel_connectivity_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12879,36 +13813,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_default_host", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_default_host_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_disappearing_server", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_disappearing_server_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12921,8 +13827,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12935,8 +13841,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12949,8 +13855,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12963,8 +13869,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12977,8 +13883,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -12991,8 +13897,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13005,8 +13911,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13019,8 +13925,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13033,8 +13939,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13047,8 +13953,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13061,8 +13967,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13075,8 +13981,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13089,8 +13995,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13103,8 +14009,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13117,8 +14023,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13131,8 +14037,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13145,8 +14051,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13159,8 +14065,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13173,22 +14079,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_simple_delayed_request", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "h2_uchannel_simple_delayed_request_nosec_test", 
-    "src": []
-  }, 
-  {
-    "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13201,8 +14093,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uchannel", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_uchannel", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13215,8 +14107,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13229,8 +14121,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13243,8 +14135,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13257,8 +14149,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13271,8 +14163,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13285,8 +14177,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13299,8 +14191,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13313,8 +14205,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13327,8 +14219,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_census_simple_request", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13336,13 +14228,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds_census_simple_request_nosec_test", 
+    "name": "h2_uds_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_channel_connectivity", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13350,13 +14242,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds_channel_connectivity_nosec_test", 
+    "name": "h2_uds_channel_ping_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13369,8 +14261,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_disappearing_server", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13383,8 +14275,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13397,8 +14289,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13411,8 +14303,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13425,8 +14317,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13439,8 +14331,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13453,8 +14345,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13467,8 +14359,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13481,8 +14373,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13495,8 +14387,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13509,8 +14401,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13523,8 +14415,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13537,8 +14429,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13551,8 +14443,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13565,8 +14457,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13579,8 +14471,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13593,8 +14485,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13607,8 +14499,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13621,8 +14513,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13635,8 +14527,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13649,8 +14541,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13663,8 +14555,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13677,8 +14569,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_uds", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13691,8 +14583,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_bad_hostname", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_bad_hostname", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13705,8 +14597,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_binary_metadata", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_binary_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13719,8 +14611,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_cancel_after_accept", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_cancel_after_accept", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13733,8 +14625,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_cancel_after_client_done", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_cancel_after_client_done", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13747,8 +14639,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_cancel_after_invoke", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_cancel_after_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13761,8 +14653,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_cancel_before_invoke", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_cancel_before_invoke", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13775,8 +14667,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_cancel_in_a_vacuum", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_cancel_in_a_vacuum", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13789,8 +14681,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_cancel_with_status", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_cancel_with_status", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13803,8 +14695,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_census_simple_request", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_channel_connectivity", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13812,13 +14704,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds+poll_census_simple_request_nosec_test", 
+    "name": "h2_uds+poll_channel_connectivity_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_channel_connectivity", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_channel_ping", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13826,13 +14718,13 @@
     ], 
     "headers": [], 
     "language": "c", 
-    "name": "h2_uds+poll_channel_connectivity_nosec_test", 
+    "name": "h2_uds+poll_channel_ping_nosec_test", 
     "src": []
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_compressed_payload", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_compressed_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13845,8 +14737,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_disappearing_server", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_disappearing_server", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13859,8 +14751,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_empty_batch", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_empty_batch", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13873,8 +14765,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_graceful_server_shutdown", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_graceful_server_shutdown", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13887,8 +14779,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_high_initial_seqno", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_high_initial_seqno", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13901,8 +14793,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_hpack_size", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_hpack_size", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13915,8 +14807,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_invoke_large_request", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_invoke_large_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13929,8 +14821,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_large_metadata", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_large_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13943,8 +14835,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_max_concurrent_streams", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_max_concurrent_streams", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13957,8 +14849,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_max_message_length", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_max_message_length", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13971,8 +14863,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_metadata", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13985,8 +14877,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_negative_deadline", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_negative_deadline", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -13999,8 +14891,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_no_op", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_no_op", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14013,8 +14905,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_payload", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14027,8 +14919,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_ping_pong_streaming", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_ping_pong_streaming", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14041,8 +14933,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_registered_call", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_registered_call", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14055,8 +14947,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_request_with_flags", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_request_with_flags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14069,8 +14961,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_request_with_payload", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_request_with_payload", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14083,8 +14975,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_server_finishes_request", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_server_finishes_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14097,8 +14989,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_shutdown_finishes_calls", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_shutdown_finishes_calls", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14111,8 +15003,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_shutdown_finishes_tags", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_shutdown_finishes_tags", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14125,8 +15017,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_simple_delayed_request", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_simple_delayed_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14139,8 +15031,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_simple_request", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_simple_request", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14153,8 +15045,8 @@
   }, 
   {
     "deps": [
-      "end2end_fixture_h2_uds+poll", 
-      "end2end_test_trailing_metadata", 
+      "end2end_nosec_fixture_h2_uds+poll", 
+      "end2end_nosec_test_trailing_metadata", 
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -14190,12 +15082,57 @@
     ], 
     "headers": [], 
     "language": "c", 
+    "name": "headers_bad_client_test", 
+    "src": [
+      "test/core/bad_client/tests/headers.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "bad_client_test", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
     "name": "initial_settings_frame_bad_client_test", 
     "src": [
       "test/core/bad_client/tests/initial_settings_frame.c"
     ]
   }, 
   {
+    "deps": [
+      "bad_client_test", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "simple_request_bad_client_test", 
+    "src": [
+      "test/core/bad_client/tests/simple_request.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "bad_client_test", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [], 
+    "language": "c", 
+    "name": "unknown_frame_bad_client_test", 
+    "src": [
+      "test/core/bad_client/tests/unknown_frame.c"
+    ]
+  }, 
+  {
     "deps": [], 
     "headers": [
       "include/grpc/support/alloc.h", 
@@ -14360,7 +15297,6 @@
       "src/core/channel/context.h", 
       "src/core/channel/http_client_filter.h", 
       "src/core/channel/http_server_filter.h", 
-      "src/core/channel/noop_filter.h", 
       "src/core/channel/subchannel_call_holder.h", 
       "src/core/client_config/client_config.h", 
       "src/core/client_config/connector.h", 
@@ -14377,8 +15313,6 @@
       "src/core/client_config/resolvers/sockaddr_resolver.h", 
       "src/core/client_config/subchannel.h", 
       "src/core/client_config/subchannel_factory.h", 
-      "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h", 
-      "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h", 
       "src/core/client_config/uri_parser.h", 
       "src/core/compression/algorithm_metadata.h", 
       "src/core/compression/message_compress.h", 
@@ -14517,8 +15451,6 @@
       "src/core/channel/http_client_filter.h", 
       "src/core/channel/http_server_filter.c", 
       "src/core/channel/http_server_filter.h", 
-      "src/core/channel/noop_filter.c", 
-      "src/core/channel/noop_filter.h", 
       "src/core/channel/subchannel_call_holder.c", 
       "src/core/channel/subchannel_call_holder.h", 
       "src/core/client_config/client_config.c", 
@@ -14552,10 +15484,6 @@
       "src/core/client_config/subchannel.h", 
       "src/core/client_config/subchannel_factory.c", 
       "src/core/client_config/subchannel_factory.h", 
-      "src/core/client_config/subchannel_factory_decorators/add_channel_arg.c", 
-      "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h", 
-      "src/core/client_config/subchannel_factory_decorators/merge_channel_args.c", 
-      "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h", 
       "src/core/client_config/uri_parser.c", 
       "src/core/client_config/uri_parser.h", 
       "src/core/compression/algorithm.c", 
@@ -14695,6 +15623,7 @@
       "src/core/surface/channel.h", 
       "src/core/surface/channel_connectivity.c", 
       "src/core/surface/channel_create.c", 
+      "src/core/surface/channel_ping.c", 
       "src/core/surface/completion_queue.c", 
       "src/core/surface/completion_queue.h", 
       "src/core/surface/event_string.c", 
@@ -14823,13 +15752,12 @@
     "deps": [
       "gpr", 
       "gpr_test_util", 
-      "grpc"
+      "grpc_unsecure"
     ], 
     "headers": [
       "test/core/end2end/cq_verifier.h", 
       "test/core/end2end/fixtures/proxy.h", 
       "test/core/iomgr/endpoint_tests.h", 
-      "test/core/security/oauth2_utils.h", 
       "test/core/util/grpc_profiler.h", 
       "test/core/util/parse_hexstring.h", 
       "test/core/util/port.h", 
@@ -14844,8 +15772,6 @@
       "test/core/end2end/fixtures/proxy.h", 
       "test/core/iomgr/endpoint_tests.c", 
       "test/core/iomgr/endpoint_tests.h", 
-      "test/core/security/oauth2_utils.c", 
-      "test/core/security/oauth2_utils.h", 
       "test/core/util/grpc_profiler.c", 
       "test/core/util/grpc_profiler.h", 
       "test/core/util/parse_hexstring.c", 
@@ -14881,7 +15807,6 @@
       "src/core/channel/context.h", 
       "src/core/channel/http_client_filter.h", 
       "src/core/channel/http_server_filter.h", 
-      "src/core/channel/noop_filter.h", 
       "src/core/channel/subchannel_call_holder.h", 
       "src/core/client_config/client_config.h", 
       "src/core/client_config/connector.h", 
@@ -14898,8 +15823,6 @@
       "src/core/client_config/resolvers/sockaddr_resolver.h", 
       "src/core/client_config/subchannel.h", 
       "src/core/client_config/subchannel_factory.h", 
-      "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h", 
-      "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h", 
       "src/core/client_config/uri_parser.h", 
       "src/core/compression/algorithm_metadata.h", 
       "src/core/compression/message_compress.h", 
@@ -15024,8 +15947,6 @@
       "src/core/channel/http_client_filter.h", 
       "src/core/channel/http_server_filter.c", 
       "src/core/channel/http_server_filter.h", 
-      "src/core/channel/noop_filter.c", 
-      "src/core/channel/noop_filter.h", 
       "src/core/channel/subchannel_call_holder.c", 
       "src/core/channel/subchannel_call_holder.h", 
       "src/core/client_config/client_config.c", 
@@ -15059,10 +15980,6 @@
       "src/core/client_config/subchannel.h", 
       "src/core/client_config/subchannel_factory.c", 
       "src/core/client_config/subchannel_factory.h", 
-      "src/core/client_config/subchannel_factory_decorators/add_channel_arg.c", 
-      "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h", 
-      "src/core/client_config/subchannel_factory_decorators/merge_channel_args.c", 
-      "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h", 
       "src/core/client_config/uri_parser.c", 
       "src/core/client_config/uri_parser.h", 
       "src/core/compression/algorithm.c", 
@@ -15177,6 +16094,7 @@
       "src/core/surface/channel.h", 
       "src/core/surface/channel_connectivity.c", 
       "src/core/surface/channel_create.c", 
+      "src/core/surface/channel_ping.c", 
       "src/core/surface/completion_queue.c", 
       "src/core/surface/completion_queue.h", 
       "src/core/surface/event_string.c", 
@@ -15322,6 +16240,7 @@
       "include/grpc++/impl/rpc_method.h", 
       "include/grpc++/impl/rpc_service_method.h", 
       "include/grpc++/impl/serialization_traits.h", 
+      "include/grpc++/impl/server_builder_option.h", 
       "include/grpc++/impl/service_type.h", 
       "include/grpc++/impl/sync.h", 
       "include/grpc++/impl/sync_cxx11.h", 
@@ -15375,6 +16294,7 @@
       "include/grpc++/impl/rpc_method.h", 
       "include/grpc++/impl/rpc_service_method.h", 
       "include/grpc++/impl/serialization_traits.h", 
+      "include/grpc++/impl/server_builder_option.h", 
       "include/grpc++/impl/service_type.h", 
       "include/grpc++/impl/sync.h", 
       "include/grpc++/impl/sync_cxx11.h", 
@@ -15403,7 +16323,6 @@
       "include/grpc++/support/sync_stream.h", 
       "include/grpc++/support/time.h", 
       "src/cpp/client/channel.cc", 
-      "src/cpp/client/channel_arguments.cc", 
       "src/cpp/client/client_context.cc", 
       "src/cpp/client/create_channel.cc", 
       "src/cpp/client/create_channel_internal.cc", 
@@ -15411,16 +16330,17 @@
       "src/cpp/client/credentials.cc", 
       "src/cpp/client/generic_stub.cc", 
       "src/cpp/client/insecure_credentials.cc", 
-      "src/cpp/client/secure_channel_arguments.cc", 
       "src/cpp/client/secure_credentials.cc", 
       "src/cpp/client/secure_credentials.h", 
       "src/cpp/common/auth_property_iterator.cc", 
       "src/cpp/common/call.cc", 
+      "src/cpp/common/channel_arguments.cc", 
       "src/cpp/common/completion_queue.cc", 
       "src/cpp/common/create_auth_context.h", 
       "src/cpp/common/rpc_method.cc", 
       "src/cpp/common/secure_auth_context.cc", 
       "src/cpp/common/secure_auth_context.h", 
+      "src/cpp/common/secure_channel_arguments.cc", 
       "src/cpp/common/secure_create_auth_context.cc", 
       "src/cpp/proto/proto_utils.cc", 
       "src/cpp/server/async_generic_service.cc", 
@@ -15506,6 +16426,7 @@
       "include/grpc++/impl/rpc_method.h", 
       "include/grpc++/impl/rpc_service_method.h", 
       "include/grpc++/impl/serialization_traits.h", 
+      "include/grpc++/impl/server_builder_option.h", 
       "include/grpc++/impl/service_type.h", 
       "include/grpc++/impl/sync.h", 
       "include/grpc++/impl/sync_cxx11.h", 
@@ -15556,6 +16477,7 @@
       "include/grpc++/impl/rpc_method.h", 
       "include/grpc++/impl/rpc_service_method.h", 
       "include/grpc++/impl/serialization_traits.h", 
+      "include/grpc++/impl/server_builder_option.h", 
       "include/grpc++/impl/service_type.h", 
       "include/grpc++/impl/sync.h", 
       "include/grpc++/impl/sync_cxx11.h", 
@@ -15584,7 +16506,6 @@
       "include/grpc++/support/sync_stream.h", 
       "include/grpc++/support/time.h", 
       "src/cpp/client/channel.cc", 
-      "src/cpp/client/channel_arguments.cc", 
       "src/cpp/client/client_context.cc", 
       "src/cpp/client/create_channel.cc", 
       "src/cpp/client/create_channel_internal.cc", 
@@ -15593,6 +16514,7 @@
       "src/cpp/client/generic_stub.cc", 
       "src/cpp/client/insecure_credentials.cc", 
       "src/cpp/common/call.cc", 
+      "src/cpp/common/channel_arguments.cc", 
       "src/cpp/common/completion_queue.cc", 
       "src/cpp/common/create_auth_context.h", 
       "src/cpp/common/insecure_create_auth_context.cc", 
@@ -15822,10 +16744,29 @@
   }, 
   {
     "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_h2_census", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_census.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -15857,10 +16798,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -15874,10 +16816,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -15909,10 +16852,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -15926,10 +16870,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -15943,10 +16888,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -15960,10 +16906,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h"
@@ -16031,6 +16978,60 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_fixture_h2_uchannel", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_uchannel.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_fixture_h2_uds", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_uds.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_fixture_h2_uds+poll", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_uds+poll.c"
+    ]
+  }, 
+  {
+    "deps": [
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -16040,7 +17041,143 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_h2_uchannel", 
+    "name": "end2end_nosec_fixture_h2_census", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_census.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_compress", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_compress.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_full", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_full.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_full+poll", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_full+poll.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_proxy", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_proxy.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_sockpair", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_sockpair.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_sockpair+trace", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_sockpair+trace.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_sockpair_1byte", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/fixtures/h2_sockpair_1byte.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
+      "grpc_test_util_unsecure", 
+      "grpc_unsecure"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_nosec_fixture_h2_uchannel", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/fixtures/h2_uchannel.c"
@@ -16057,7 +17194,7 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_h2_uds", 
+    "name": "end2end_nosec_fixture_h2_uds", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/fixtures/h2_uds.c"
@@ -16074,7 +17211,7 @@
       "test/core/end2end/end2end_tests.h"
     ], 
     "language": "c", 
-    "name": "end2end_fixture_h2_uds+poll", 
+    "name": "end2end_nosec_fixture_h2_uds+poll", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/fixtures/h2_uds+poll.c"
@@ -16082,10 +17219,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h", 
@@ -16101,10 +17239,11 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
       "gpr", 
       "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
+      "grpc", 
+      "grpc_test_util"
     ], 
     "headers": [
       "test/core/end2end/end2end_tests.h", 
@@ -16140,6 +17279,666 @@
   }, 
   {
     "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "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", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_after_accept.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "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_client_done", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_after_client_done.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "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_invoke", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_after_invoke.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "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_before_invoke", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_before_invoke.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "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_in_a_vacuum", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_in_a_vacuum.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "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_with_status", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/cancel_with_status.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_channel_connectivity", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/channel_connectivity.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_channel_ping", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/channel_ping.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_compressed_payload", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/compressed_payload.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_default_host", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/default_host.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_disappearing_server", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/disappearing_server.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_empty_batch", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/empty_batch.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/graceful_server_shutdown.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/high_initial_seqno.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_hpack_size", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/hpack_size.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/invoke_large_request.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_large_metadata", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/large_metadata.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/max_concurrent_streams.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/max_message_length.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_metadata", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/metadata.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_negative_deadline", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/negative_deadline.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_no_op", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/no_op.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_payload", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/payload.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/ping_pong_streaming.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_registered_call", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/registered_call.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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_flags.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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_payload.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/server_finishes_request.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/shutdown_finishes_calls.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "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/shutdown_finishes_tags.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_simple_delayed_request", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/simple_delayed_request.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_simple_request", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/simple_request.c"
+    ]
+  }, 
+  {
+    "deps": [
+      "end2end_certs", 
+      "gpr", 
+      "gpr_test_util", 
+      "grpc", 
+      "grpc_test_util"
+    ], 
+    "headers": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ], 
+    "language": "c", 
+    "name": "end2end_test_trailing_metadata", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/cancel_test_helpers.h", 
+      "test/core/end2end/tests/trailing_metadata.c"
+    ]
+  }, 
+  {
+    "deps": [
       "gpr", 
       "gpr_test_util", 
       "grpc_test_util_unsecure", 
@@ -16150,7 +17949,45 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_after_accept", 
+    "name": "end2end_nosec_test_bad_hostname", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/bad_hostname.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_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_nosec_test_binary_metadata", 
+    "src": [
+      "test/core/end2end/end2end_tests.h", 
+      "test/core/end2end/tests/binary_metadata.c", 
+      "test/core/end2end/tests/cancel_test_helpers.h"
+    ]
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_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_nosec_test_cancel_after_accept", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_after_accept.c", 
@@ -16169,7 +18006,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_after_client_done", 
+    "name": "end2end_nosec_test_cancel_after_client_done", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_after_client_done.c", 
@@ -16188,7 +18025,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_after_invoke", 
+    "name": "end2end_nosec_test_cancel_after_invoke", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_after_invoke.c", 
@@ -16207,7 +18044,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_before_invoke", 
+    "name": "end2end_nosec_test_cancel_before_invoke", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_before_invoke.c", 
@@ -16226,7 +18063,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_in_a_vacuum", 
+    "name": "end2end_nosec_test_cancel_in_a_vacuum", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_in_a_vacuum.c", 
@@ -16245,7 +18082,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_cancel_with_status", 
+    "name": "end2end_nosec_test_cancel_with_status", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16264,11 +18101,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_census_simple_request", 
+    "name": "end2end_nosec_test_channel_connectivity", 
     "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/channel_connectivity.c"
     ]
   }, 
   {
@@ -16283,11 +18120,11 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_channel_connectivity", 
+    "name": "end2end_nosec_test_channel_ping", 
     "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/channel_ping.c"
     ]
   }, 
   {
@@ -16302,7 +18139,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_compressed_payload", 
+    "name": "end2end_nosec_test_compressed_payload", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16321,7 +18158,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_default_host", 
+    "name": "end2end_nosec_test_default_host", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16340,7 +18177,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_disappearing_server", 
+    "name": "end2end_nosec_test_disappearing_server", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16359,7 +18196,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_empty_batch", 
+    "name": "end2end_nosec_test_empty_batch", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16378,7 +18215,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_graceful_server_shutdown", 
+    "name": "end2end_nosec_test_graceful_server_shutdown", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16397,7 +18234,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_high_initial_seqno", 
+    "name": "end2end_nosec_test_high_initial_seqno", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16416,7 +18253,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_hpack_size", 
+    "name": "end2end_nosec_test_hpack_size", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16435,7 +18272,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_invoke_large_request", 
+    "name": "end2end_nosec_test_invoke_large_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16454,7 +18291,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_large_metadata", 
+    "name": "end2end_nosec_test_large_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16473,7 +18310,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_max_concurrent_streams", 
+    "name": "end2end_nosec_test_max_concurrent_streams", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16492,7 +18329,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_max_message_length", 
+    "name": "end2end_nosec_test_max_message_length", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16511,7 +18348,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_metadata", 
+    "name": "end2end_nosec_test_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16530,7 +18367,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_negative_deadline", 
+    "name": "end2end_nosec_test_negative_deadline", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16549,7 +18386,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_no_op", 
+    "name": "end2end_nosec_test_no_op", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16568,7 +18405,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_payload", 
+    "name": "end2end_nosec_test_payload", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16587,7 +18424,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_ping_pong_streaming", 
+    "name": "end2end_nosec_test_ping_pong_streaming", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16606,7 +18443,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_registered_call", 
+    "name": "end2end_nosec_test_registered_call", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16625,7 +18462,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_with_flags", 
+    "name": "end2end_nosec_test_request_with_flags", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16644,7 +18481,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_request_with_payload", 
+    "name": "end2end_nosec_test_request_with_payload", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16663,7 +18500,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_server_finishes_request", 
+    "name": "end2end_nosec_test_server_finishes_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16682,7 +18519,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_shutdown_finishes_calls", 
+    "name": "end2end_nosec_test_shutdown_finishes_calls", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16701,7 +18538,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_shutdown_finishes_tags", 
+    "name": "end2end_nosec_test_shutdown_finishes_tags", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16720,7 +18557,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_simple_delayed_request", 
+    "name": "end2end_nosec_test_simple_delayed_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16739,7 +18576,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_simple_request", 
+    "name": "end2end_nosec_test_simple_request", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
@@ -16758,7 +18595,7 @@
       "test/core/end2end/tests/cancel_test_helpers.h"
     ], 
     "language": "c", 
-    "name": "end2end_test_trailing_metadata", 
+    "name": "end2end_nosec_test_trailing_metadata", 
     "src": [
       "test/core/end2end/end2end_tests.h", 
       "test/core/end2end/tests/cancel_test_helpers.h", 
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 179b078263..bf12a2397b 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -11,6 +11,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "alloc_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "alpn_test", 
     "platforms": [
       "linux", 
@@ -47,6 +65,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "channel_create_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "chttp2_hpack_encoder_test", 
     "platforms": [
       "linux", 
@@ -101,6 +137,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "chttp2_varint_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "compression_test", 
     "platforms": [
       "linux", 
@@ -643,6 +697,24 @@
     "ci_platforms": [
       "linux", 
       "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "grpc_invalid_channel_args_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
       "posix"
     ], 
     "exclude_configs": [], 
@@ -781,6 +853,54 @@
   }, 
   {
     "ci_platforms": [
+      "linux"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "httpscli_test", 
+    "platforms": [
+      "linux"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "init_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "invalid_call_argument_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
       "linux", 
       "mac", 
       "posix", 
@@ -879,7 +999,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "multi_init_test", 
+    "name": "multiple_server_queues_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -897,7 +1017,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "multiple_server_queues_test", 
+    "name": "murmur_hash_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -915,7 +1035,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "murmur_hash_test", 
+    "name": "no_server_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -933,7 +1053,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "no_server_test", 
+    "name": "resolve_address_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -951,7 +1071,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "resolve_address_test", 
+    "name": "secure_channel_create_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -987,6 +1107,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "server_chttp2_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "set_initial_connect_string_test", 
     "platforms": [
       "linux", 
@@ -1005,6 +1143,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "sockaddr_resolver_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "sockaddr_utils_test", 
     "platforms": [
       "linux", 
@@ -1161,6 +1317,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "transport_connectivity_state_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "transport_metadata_test", 
     "platforms": [
       "linux", 
@@ -1695,6 +1869,654 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "h2_census_bad_hostname_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_binary_metadata_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_call_creds_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_after_accept_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_after_client_done_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_after_invoke_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_before_invoke_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_in_a_vacuum_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_with_status_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_channel_connectivity_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_channel_ping_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_compressed_payload_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_default_host_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_disappearing_server_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_empty_batch_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_graceful_server_shutdown_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_high_initial_seqno_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_hpack_size_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_invoke_large_request_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_large_metadata_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_max_concurrent_streams_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_max_message_length_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_metadata_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_negative_deadline_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_no_op_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_payload_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_ping_pong_streaming_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_registered_call_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_request_with_flags_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_request_with_payload_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_server_finishes_request_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_calls_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_tags_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_simple_delayed_request_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_simple_request_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_trailing_metadata_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "h2_compress_bad_hostname_test", 
     "platforms": [
       "linux", 
@@ -1857,7 +2679,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_compress_census_simple_request_test", 
+    "name": "h2_compress_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -1875,7 +2697,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_compress_channel_connectivity_test", 
+    "name": "h2_compress_channel_ping_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2495,7 +3317,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_fakesec_census_simple_request_test", 
+    "name": "h2_fakesec_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -2512,7 +3334,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_fakesec_channel_connectivity_test", 
+    "name": "h2_fakesec_channel_ping_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3117,7 +3939,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full_census_simple_request_test", 
+    "name": "h2_full_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3135,7 +3957,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full_channel_connectivity_test", 
+    "name": "h2_full_channel_ping_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -3708,7 +4530,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full+poll_census_simple_request_test", 
+    "name": "h2_full+poll_channel_connectivity_test", 
     "platforms": [
       "linux"
     ]
@@ -3720,7 +4542,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full+poll_channel_connectivity_test", 
+    "name": "h2_full+poll_channel_ping_test", 
     "platforms": [
       "linux"
     ]
@@ -4187,7 +5009,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_oauth2_census_simple_request_test", 
+    "name": "h2_oauth2_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4204,7 +5026,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_oauth2_channel_connectivity_test", 
+    "name": "h2_oauth2_channel_ping_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -4799,23 +5621,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_proxy_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_proxy_default_host_test", 
     "platforms": [
       "linux", 
@@ -5326,23 +6131,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_sockpair_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_sockpair_compressed_payload_test", 
     "platforms": [
       "linux", 
@@ -5880,24 +6668,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_sockpair+trace_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_sockpair+trace_compressed_payload_test", 
     "platforms": [
       "linux", 
@@ -6428,23 +7198,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_sockpair_1byte_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_sockpair_1byte_compressed_payload_test", 
     "platforms": [
       "linux", 
@@ -6982,7 +7735,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_ssl_census_simple_request_test", 
+    "name": "h2_ssl_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7000,7 +7753,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_ssl_channel_connectivity_test", 
+    "name": "h2_ssl_channel_ping_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -7573,7 +8326,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_ssl+poll_census_simple_request_test", 
+    "name": "h2_ssl+poll_channel_connectivity_test", 
     "platforms": [
       "linux"
     ]
@@ -7585,7 +8338,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_ssl+poll_channel_connectivity_test", 
+    "name": "h2_ssl+poll_channel_ping_test", 
     "platforms": [
       "linux"
     ]
@@ -8052,23 +8805,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_ssl_proxy_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_ssl_proxy_default_host_test", 
     "platforms": [
       "linux", 
@@ -8589,42 +9325,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uchannel_census_simple_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_uchannel_channel_connectivity_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_uchannel_compressed_payload_test", 
     "platforms": [
       "linux", 
@@ -8643,42 +9343,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uchannel_default_host_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_uchannel_disappearing_server_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_uchannel_empty_batch_test", 
     "platforms": [
       "linux", 
@@ -9021,24 +9685,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uchannel_simple_delayed_request_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_uchannel_simple_request_test", 
     "platforms": [
       "linux", 
@@ -9218,7 +9864,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds_census_simple_request_test", 
+    "name": "h2_uds_channel_connectivity_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9234,7 +9880,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds_channel_connectivity_test", 
+    "name": "h2_uds_channel_ping_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -9740,7 +10386,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds+poll_census_simple_request_test", 
+    "name": "h2_uds+poll_channel_connectivity_test", 
     "platforms": [
       "linux"
     ]
@@ -9752,7 +10398,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds+poll_channel_connectivity_test", 
+    "name": "h2_uds+poll_channel_ping_test", 
     "platforms": [
       "linux"
     ]
@@ -10055,6 +10701,636 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "h2_census_bad_hostname_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_binary_metadata_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_after_accept_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_after_client_done_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_after_invoke_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_before_invoke_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_in_a_vacuum_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_cancel_with_status_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_channel_connectivity_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_channel_ping_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_compressed_payload_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_default_host_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_disappearing_server_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_empty_batch_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_graceful_server_shutdown_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_high_initial_seqno_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_hpack_size_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_invoke_large_request_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_large_metadata_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_max_concurrent_streams_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_max_message_length_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_metadata_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_negative_deadline_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_no_op_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_payload_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_ping_pong_streaming_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_registered_call_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_request_with_flags_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_request_with_payload_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_server_finishes_request_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_calls_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_shutdown_finishes_tags_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_simple_delayed_request_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_simple_request_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "h2_census_trailing_metadata_nosec_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "h2_compress_bad_hostname_nosec_test", 
     "platforms": [
       "linux", 
@@ -10199,7 +11475,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_compress_census_simple_request_nosec_test", 
+    "name": "h2_compress_channel_connectivity_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -10217,7 +11493,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_compress_channel_connectivity_nosec_test", 
+    "name": "h2_compress_channel_ping_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -10829,7 +12105,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full_census_simple_request_nosec_test", 
+    "name": "h2_full_channel_connectivity_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -10847,7 +12123,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full_channel_connectivity_nosec_test", 
+    "name": "h2_full_channel_ping_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -11408,7 +12684,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full+poll_census_simple_request_nosec_test", 
+    "name": "h2_full+poll_channel_connectivity_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -11420,7 +12696,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_full+poll_channel_connectivity_nosec_test", 
+    "name": "h2_full+poll_channel_ping_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -11870,23 +13146,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_proxy_census_simple_request_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_proxy_default_host_nosec_test", 
     "platforms": [
       "linux", 
@@ -12380,23 +13639,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_sockpair_census_simple_request_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_sockpair_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
@@ -12916,24 +14158,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_sockpair+trace_census_simple_request_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_sockpair+trace_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
@@ -13447,23 +14671,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_sockpair_1byte_census_simple_request_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_sockpair_1byte_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
@@ -13983,42 +15190,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uchannel_census_simple_request_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_uchannel_channel_connectivity_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_uchannel_compressed_payload_nosec_test", 
     "platforms": [
       "linux", 
@@ -14037,42 +15208,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uchannel_default_host_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
-    "name": "h2_uchannel_disappearing_server_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_uchannel_empty_batch_nosec_test", 
     "platforms": [
       "linux", 
@@ -14415,24 +15550,6 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uchannel_simple_delayed_request_nosec_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c", 
     "name": "h2_uchannel_simple_request_nosec_test", 
     "platforms": [
       "linux", 
@@ -14596,7 +15713,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds_census_simple_request_nosec_test", 
+    "name": "h2_uds_channel_connectivity_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -14612,7 +15729,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds_channel_connectivity_nosec_test", 
+    "name": "h2_uds_channel_ping_nosec_test", 
     "platforms": [
       "linux", 
       "mac", 
@@ -15106,7 +16223,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds+poll_census_simple_request_nosec_test", 
+    "name": "h2_uds+poll_channel_connectivity_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -15118,7 +16235,7 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
-    "name": "h2_uds+poll_channel_connectivity_nosec_test", 
+    "name": "h2_uds+poll_channel_ping_nosec_test", 
     "platforms": [
       "linux"
     ]
@@ -15439,6 +16556,24 @@
     "exclude_configs": [], 
     "flaky": false, 
     "language": "c", 
+    "name": "headers_bad_client_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
     "name": "initial_settings_frame_bad_client_test", 
     "platforms": [
       "linux", 
@@ -15446,5 +16581,41 @@
       "posix", 
       "windows"
     ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "simple_request_bad_client_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "language": "c", 
+    "name": "unknown_frame_bad_client_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
   }
 ]