diff --git a/.gitmodules b/.gitmodules
index 2d0c00976077ffb3149fe456a938a280ed198961..4d35fdece312852cdfd1359b2b73b6cdb3a72071 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,7 +8,7 @@
 [submodule "third_party/protobuf"]
 	path = third_party/protobuf
 	url = https://github.com/google/protobuf.git
-	branch = v3.0.0-beta-1
+	branch = v3.0.0-alpha-4.1
 [submodule "third_party/gflags"]
 	path = third_party/gflags
 	url = https://github.com/gflags/gflags.git
diff --git a/Makefile b/Makefile
index 3e154eb305513bbb23965b4fff013ffe4700254c..d44f81c8609326a0104c2fc8f04db3e35e123c2e 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,11 @@ SYSTEM = MINGW32
 endif
 
 
+MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 ifndef BUILDDIR
-BUILDDIR = .
+BUILDDIR_ABSOLUTE = $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
+else
+BUILDDIR_ABSOLUTE = $(abspath $(BUILDDIR))
 endif
 
 HAS_GCC = $(shell which gcc > /dev/null 2> /dev/null && echo true || echo false)
@@ -76,10 +79,10 @@ endif
 endif
 
 
-BINDIR = $(BUILDDIR)/bins
-OBJDIR = $(BUILDDIR)/objs
-LIBDIR = $(BUILDDIR)/libs
-GENDIR = $(BUILDDIR)/gens
+BINDIR = $(BUILDDIR_ABSOLUTE)/bins
+OBJDIR = $(BUILDDIR_ABSOLUTE)/objs
+LIBDIR = $(BUILDDIR_ABSOLUTE)/libs
+GENDIR = $(BUILDDIR_ABSOLUTE)/gens
 
 # Configurations
 
@@ -4195,13 +4198,13 @@ $(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(LIBGRPC_OBJS)
 	$(Q) mkdir -p `dirname $@`
 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
 	$(Q) $(AR) rcs $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS)
-	$(Q) rm -rf tmp-merge-grpc
-	$(Q) mkdir tmp-merge-grpc
-	$(Q) ( cd tmp-merge-grpc ; $(AR) x ../$(LIBDIR)/$(CONFIG)/libgrpc.a )
-	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge-grpc ; ar x ../$${l} ) ; done
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a tmp-merge-grpc/__.SYMDEF*
-	$(Q) ar rcs $(LIBDIR)/$(CONFIG)/libgrpc.a tmp-merge-grpc/*
-	$(Q) rm -rf tmp-merge-grpc
+	$(Q) rm -rf $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc
+	$(Q) mkdir $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc
+	$(Q) ( cd $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc ; $(AR) x $(LIBDIR)/$(CONFIG)/libgrpc.a )
+	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc ; ar x $${l} ) ; done
+	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc/__.SYMDEF*
+	$(Q) ar rcs $(LIBDIR)/$(CONFIG)/libgrpc.a $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc/*
+	$(Q) rm -rf $(BUILDDIR_ABSOLUTE)/tmp-merge-grpc
 ifeq ($(SYSTEM),Darwin)
 	$(Q) ranlib $(LIBDIR)/$(CONFIG)/libgrpc.a
 endif
diff --git a/examples/csharp/route_guide/RouteGuide/RouteGuide.cs b/examples/csharp/route_guide/RouteGuide/RouteGuide.cs
index 9bc6f307d261cf380a734cf2a170a4182b66fae8..deb97e1b2d75cb5280420f969b93fb3adae84631 100644
--- a/examples/csharp/route_guide/RouteGuide/RouteGuide.cs
+++ b/examples/csharp/route_guide/RouteGuide/RouteGuide.cs
@@ -7,7 +7,7 @@ using pb = global::Google.Protobuf;
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Examples {
+namespace Routeguide {
 
   namespace Proto {
 
@@ -23,29 +23,29 @@ namespace Examples {
       static RouteGuide() {
         byte[] descriptorData = global::System.Convert.FromBase64String(
             string.Concat(
-              "ChFyb3V0ZV9ndWlkZS5wcm90bxIIZXhhbXBsZXMiLAoFUG9pbnQSEAoIbGF0", 
-              "aXR1ZGUYASABKAUSEQoJbG9uZ2l0dWRlGAIgASgFIkUKCVJlY3RhbmdsZRIb", 
-              "CgJsbxgBIAEoCzIPLmV4YW1wbGVzLlBvaW50EhsKAmhpGAIgASgLMg8uZXhh", 
-              "bXBsZXMuUG9pbnQiOgoHRmVhdHVyZRIMCgRuYW1lGAEgASgJEiEKCGxvY2F0", 
-              "aW9uGAIgASgLMg8uZXhhbXBsZXMuUG9pbnQiPwoJUm91dGVOb3RlEiEKCGxv", 
-              "Y2F0aW9uGAEgASgLMg8uZXhhbXBsZXMuUG9pbnQSDwoHbWVzc2FnZRgCIAEo", 
-              "CSJiCgxSb3V0ZVN1bW1hcnkSEwoLcG9pbnRfY291bnQYASABKAUSFQoNZmVh", 
-              "dHVyZV9jb3VudBgCIAEoBRIQCghkaXN0YW5jZRgDIAEoBRIUCgxlbGFwc2Vk", 
-              "X3RpbWUYBCABKAUy9QEKClJvdXRlR3VpZGUSMgoKR2V0RmVhdHVyZRIPLmV4", 
-              "YW1wbGVzLlBvaW50GhEuZXhhbXBsZXMuRmVhdHVyZSIAEjoKDExpc3RGZWF0", 
-              "dXJlcxITLmV4YW1wbGVzLlJlY3RhbmdsZRoRLmV4YW1wbGVzLkZlYXR1cmUi", 
-              "ADABEjoKC1JlY29yZFJvdXRlEg8uZXhhbXBsZXMuUG9pbnQaFi5leGFtcGxl", 
-              "cy5Sb3V0ZVN1bW1hcnkiACgBEjsKCVJvdXRlQ2hhdBITLmV4YW1wbGVzLlJv", 
-              "dXRlTm90ZRoTLmV4YW1wbGVzLlJvdXRlTm90ZSIAKAEwAUIPCgdleC5ncnBj", 
-              "ogIDUlRHYgZwcm90bzM="));
+              "ChFyb3V0ZV9ndWlkZS5wcm90bxIKcm91dGVndWlkZSIsCgVQb2ludBIQCghs", 
+              "YXRpdHVkZRgBIAEoBRIRCglsb25naXR1ZGUYAiABKAUiSQoJUmVjdGFuZ2xl", 
+              "Eh0KAmxvGAEgASgLMhEucm91dGVndWlkZS5Qb2ludBIdCgJoaRgCIAEoCzIR", 
+              "LnJvdXRlZ3VpZGUuUG9pbnQiPAoHRmVhdHVyZRIMCgRuYW1lGAEgASgJEiMK", 
+              "CGxvY2F0aW9uGAIgASgLMhEucm91dGVndWlkZS5Qb2ludCJBCglSb3V0ZU5v", 
+              "dGUSIwoIbG9jYXRpb24YASABKAsyES5yb3V0ZWd1aWRlLlBvaW50Eg8KB21l", 
+              "c3NhZ2UYAiABKAkiYgoMUm91dGVTdW1tYXJ5EhMKC3BvaW50X2NvdW50GAEg", 
+              "ASgFEhUKDWZlYXR1cmVfY291bnQYAiABKAUSEAoIZGlzdGFuY2UYAyABKAUS", 
+              "FAoMZWxhcHNlZF90aW1lGAQgASgFMoUCCgpSb3V0ZUd1aWRlEjYKCkdldEZl", 
+              "YXR1cmUSES5yb3V0ZWd1aWRlLlBvaW50GhMucm91dGVndWlkZS5GZWF0dXJl", 
+              "IgASPgoMTGlzdEZlYXR1cmVzEhUucm91dGVndWlkZS5SZWN0YW5nbGUaEy5y", 
+              "b3V0ZWd1aWRlLkZlYXR1cmUiADABEj4KC1JlY29yZFJvdXRlEhEucm91dGVn", 
+              "dWlkZS5Qb2ludBoYLnJvdXRlZ3VpZGUuUm91dGVTdW1tYXJ5IgAoARI/CglS", 
+              "b3V0ZUNoYXQSFS5yb3V0ZWd1aWRlLlJvdXRlTm90ZRoVLnJvdXRlZ3VpZGUu", 
+              "Um91dGVOb3RlIgAoATABQg8KB2V4LmdycGOiAgNSVEdiBnByb3RvMw=="));
         descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
             new pbr::FileDescriptor[] { },
             new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
-              new pbr::GeneratedCodeInfo(typeof(global::Examples.Point), new[]{ "Latitude", "Longitude" }, null, null, null),
-              new pbr::GeneratedCodeInfo(typeof(global::Examples.Rectangle), new[]{ "Lo", "Hi" }, null, null, null),
-              new pbr::GeneratedCodeInfo(typeof(global::Examples.Feature), new[]{ "Name", "Location" }, null, null, null),
-              new pbr::GeneratedCodeInfo(typeof(global::Examples.RouteNote), new[]{ "Location", "Message" }, null, null, null),
-              new pbr::GeneratedCodeInfo(typeof(global::Examples.RouteSummary), new[]{ "PointCount", "FeatureCount", "Distance", "ElapsedTime" }, null, null, null)
+              new pbr::GeneratedCodeInfo(typeof(global::Routeguide.Point), new[]{ "Latitude", "Longitude" }, null, null, null),
+              new pbr::GeneratedCodeInfo(typeof(global::Routeguide.Rectangle), new[]{ "Lo", "Hi" }, null, null, null),
+              new pbr::GeneratedCodeInfo(typeof(global::Routeguide.Feature), new[]{ "Name", "Location" }, null, null, null),
+              new pbr::GeneratedCodeInfo(typeof(global::Routeguide.RouteNote), new[]{ "Location", "Message" }, null, null, null),
+              new pbr::GeneratedCodeInfo(typeof(global::Routeguide.RouteSummary), new[]{ "PointCount", "FeatureCount", "Distance", "ElapsedTime" }, null, null, null)
             }));
       }
       #endregion
@@ -59,7 +59,7 @@ namespace Examples {
     public static pb::MessageParser<Point> Parser { get { return _parser; } }
 
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Examples.Proto.RouteGuide.Descriptor.MessageTypes[0]; }
+      get { return global::Routeguide.Proto.RouteGuide.Descriptor.MessageTypes[0]; }
     }
 
     pbr::MessageDescriptor pb::IMessage.Descriptor {
@@ -187,7 +187,7 @@ namespace Examples {
     public static pb::MessageParser<Rectangle> Parser { get { return _parser; } }
 
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Examples.Proto.RouteGuide.Descriptor.MessageTypes[1]; }
+      get { return global::Routeguide.Proto.RouteGuide.Descriptor.MessageTypes[1]; }
     }
 
     pbr::MessageDescriptor pb::IMessage.Descriptor {
@@ -210,8 +210,8 @@ namespace Examples {
     }
 
     public const int LoFieldNumber = 1;
-    private global::Examples.Point lo_;
-    public global::Examples.Point Lo {
+    private global::Routeguide.Point lo_;
+    public global::Routeguide.Point Lo {
       get { return lo_; }
       set {
         lo_ = value;
@@ -219,8 +219,8 @@ namespace Examples {
     }
 
     public const int HiFieldNumber = 2;
-    private global::Examples.Point hi_;
-    public global::Examples.Point Hi {
+    private global::Routeguide.Point hi_;
+    public global::Routeguide.Point Hi {
       get { return hi_; }
       set {
         hi_ = value;
@@ -282,13 +282,13 @@ namespace Examples {
       }
       if (other.lo_ != null) {
         if (lo_ == null) {
-          lo_ = new global::Examples.Point();
+          lo_ = new global::Routeguide.Point();
         }
         Lo.MergeFrom(other.Lo);
       }
       if (other.hi_ != null) {
         if (hi_ == null) {
-          hi_ = new global::Examples.Point();
+          hi_ = new global::Routeguide.Point();
         }
         Hi.MergeFrom(other.Hi);
       }
@@ -303,14 +303,14 @@ namespace Examples {
             break;
           case 10: {
             if (lo_ == null) {
-              lo_ = new global::Examples.Point();
+              lo_ = new global::Routeguide.Point();
             }
             input.ReadMessage(lo_);
             break;
           }
           case 18: {
             if (hi_ == null) {
-              hi_ = new global::Examples.Point();
+              hi_ = new global::Routeguide.Point();
             }
             input.ReadMessage(hi_);
             break;
@@ -327,7 +327,7 @@ namespace Examples {
     public static pb::MessageParser<Feature> Parser { get { return _parser; } }
 
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Examples.Proto.RouteGuide.Descriptor.MessageTypes[2]; }
+      get { return global::Routeguide.Proto.RouteGuide.Descriptor.MessageTypes[2]; }
     }
 
     pbr::MessageDescriptor pb::IMessage.Descriptor {
@@ -359,8 +359,8 @@ namespace Examples {
     }
 
     public const int LocationFieldNumber = 2;
-    private global::Examples.Point location_;
-    public global::Examples.Point Location {
+    private global::Routeguide.Point location_;
+    public global::Routeguide.Point Location {
       get { return location_; }
       set {
         location_ = value;
@@ -425,7 +425,7 @@ namespace Examples {
       }
       if (other.location_ != null) {
         if (location_ == null) {
-          location_ = new global::Examples.Point();
+          location_ = new global::Routeguide.Point();
         }
         Location.MergeFrom(other.Location);
       }
@@ -444,7 +444,7 @@ namespace Examples {
           }
           case 18: {
             if (location_ == null) {
-              location_ = new global::Examples.Point();
+              location_ = new global::Routeguide.Point();
             }
             input.ReadMessage(location_);
             break;
@@ -461,7 +461,7 @@ namespace Examples {
     public static pb::MessageParser<RouteNote> Parser { get { return _parser; } }
 
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Examples.Proto.RouteGuide.Descriptor.MessageTypes[3]; }
+      get { return global::Routeguide.Proto.RouteGuide.Descriptor.MessageTypes[3]; }
     }
 
     pbr::MessageDescriptor pb::IMessage.Descriptor {
@@ -484,8 +484,8 @@ namespace Examples {
     }
 
     public const int LocationFieldNumber = 1;
-    private global::Examples.Point location_;
-    public global::Examples.Point Location {
+    private global::Routeguide.Point location_;
+    public global::Routeguide.Point Location {
       get { return location_; }
       set {
         location_ = value;
@@ -556,7 +556,7 @@ namespace Examples {
       }
       if (other.location_ != null) {
         if (location_ == null) {
-          location_ = new global::Examples.Point();
+          location_ = new global::Routeguide.Point();
         }
         Location.MergeFrom(other.Location);
       }
@@ -574,7 +574,7 @@ namespace Examples {
             break;
           case 10: {
             if (location_ == null) {
-              location_ = new global::Examples.Point();
+              location_ = new global::Routeguide.Point();
             }
             input.ReadMessage(location_);
             break;
@@ -595,7 +595,7 @@ namespace Examples {
     public static pb::MessageParser<RouteSummary> Parser { get { return _parser; } }
 
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Examples.Proto.RouteGuide.Descriptor.MessageTypes[4]; }
+      get { return global::Routeguide.Proto.RouteGuide.Descriptor.MessageTypes[4]; }
     }
 
     pbr::MessageDescriptor pb::IMessage.Descriptor {
diff --git a/examples/csharp/route_guide/RouteGuide/RouteGuideGrpc.cs b/examples/csharp/route_guide/RouteGuide/RouteGuideGrpc.cs
index f2dc1c2ec09dffa5bd3ea0cb4e9348428bfa787e..d60256fff6520f5a60b0f5774fda9c603214e4b8 100644
--- a/examples/csharp/route_guide/RouteGuide/RouteGuideGrpc.cs
+++ b/examples/csharp/route_guide/RouteGuide/RouteGuideGrpc.cs
@@ -7,39 +7,39 @@ using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;
 
-namespace Examples {
+namespace Routeguide {
   public static class RouteGuide
   {
-    static readonly string __ServiceName = "examples.RouteGuide";
+    static readonly string __ServiceName = "routeguide.RouteGuide";
 
-    static readonly Marshaller<global::Examples.Point> __Marshaller_Point = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Examples.Point.Parser.ParseFrom);
-    static readonly Marshaller<global::Examples.Feature> __Marshaller_Feature = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Examples.Feature.Parser.ParseFrom);
-    static readonly Marshaller<global::Examples.Rectangle> __Marshaller_Rectangle = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Examples.Rectangle.Parser.ParseFrom);
-    static readonly Marshaller<global::Examples.RouteSummary> __Marshaller_RouteSummary = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Examples.RouteSummary.Parser.ParseFrom);
-    static readonly Marshaller<global::Examples.RouteNote> __Marshaller_RouteNote = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Examples.RouteNote.Parser.ParseFrom);
+    static readonly Marshaller<global::Routeguide.Point> __Marshaller_Point = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Routeguide.Point.Parser.ParseFrom);
+    static readonly Marshaller<global::Routeguide.Feature> __Marshaller_Feature = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Routeguide.Feature.Parser.ParseFrom);
+    static readonly Marshaller<global::Routeguide.Rectangle> __Marshaller_Rectangle = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Routeguide.Rectangle.Parser.ParseFrom);
+    static readonly Marshaller<global::Routeguide.RouteSummary> __Marshaller_RouteSummary = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Routeguide.RouteSummary.Parser.ParseFrom);
+    static readonly Marshaller<global::Routeguide.RouteNote> __Marshaller_RouteNote = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Routeguide.RouteNote.Parser.ParseFrom);
 
-    static readonly Method<global::Examples.Point, global::Examples.Feature> __Method_GetFeature = new Method<global::Examples.Point, global::Examples.Feature>(
+    static readonly Method<global::Routeguide.Point, global::Routeguide.Feature> __Method_GetFeature = new Method<global::Routeguide.Point, global::Routeguide.Feature>(
         MethodType.Unary,
         __ServiceName,
         "GetFeature",
         __Marshaller_Point,
         __Marshaller_Feature);
 
-    static readonly Method<global::Examples.Rectangle, global::Examples.Feature> __Method_ListFeatures = new Method<global::Examples.Rectangle, global::Examples.Feature>(
+    static readonly Method<global::Routeguide.Rectangle, global::Routeguide.Feature> __Method_ListFeatures = new Method<global::Routeguide.Rectangle, global::Routeguide.Feature>(
         MethodType.ServerStreaming,
         __ServiceName,
         "ListFeatures",
         __Marshaller_Rectangle,
         __Marshaller_Feature);
 
-    static readonly Method<global::Examples.Point, global::Examples.RouteSummary> __Method_RecordRoute = new Method<global::Examples.Point, global::Examples.RouteSummary>(
+    static readonly Method<global::Routeguide.Point, global::Routeguide.RouteSummary> __Method_RecordRoute = new Method<global::Routeguide.Point, global::Routeguide.RouteSummary>(
         MethodType.ClientStreaming,
         __ServiceName,
         "RecordRoute",
         __Marshaller_Point,
         __Marshaller_RouteSummary);
 
-    static readonly Method<global::Examples.RouteNote, global::Examples.RouteNote> __Method_RouteChat = new Method<global::Examples.RouteNote, global::Examples.RouteNote>(
+    static readonly Method<global::Routeguide.RouteNote, global::Routeguide.RouteNote> __Method_RouteChat = new Method<global::Routeguide.RouteNote, global::Routeguide.RouteNote>(
         MethodType.DuplexStreaming,
         __ServiceName,
         "RouteChat",
@@ -49,31 +49,31 @@ namespace Examples {
     // service descriptor
     public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor
     {
-      get { return global::Examples.Proto.RouteGuide.Descriptor.Services[0]; }
+      get { return global::Routeguide.Proto.RouteGuide.Descriptor.Services[0]; }
     }
 
     // client interface
     public interface IRouteGuideClient
     {
-      global::Examples.Feature GetFeature(global::Examples.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
-      global::Examples.Feature GetFeature(global::Examples.Point request, CallOptions options);
-      AsyncUnaryCall<global::Examples.Feature> GetFeatureAsync(global::Examples.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
-      AsyncUnaryCall<global::Examples.Feature> GetFeatureAsync(global::Examples.Point request, CallOptions options);
-      AsyncServerStreamingCall<global::Examples.Feature> ListFeatures(global::Examples.Rectangle request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
-      AsyncServerStreamingCall<global::Examples.Feature> ListFeatures(global::Examples.Rectangle request, CallOptions options);
-      AsyncClientStreamingCall<global::Examples.Point, global::Examples.RouteSummary> RecordRoute(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
-      AsyncClientStreamingCall<global::Examples.Point, global::Examples.RouteSummary> RecordRoute(CallOptions options);
-      AsyncDuplexStreamingCall<global::Examples.RouteNote, global::Examples.RouteNote> RouteChat(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
-      AsyncDuplexStreamingCall<global::Examples.RouteNote, global::Examples.RouteNote> RouteChat(CallOptions options);
+      global::Routeguide.Feature GetFeature(global::Routeguide.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
+      global::Routeguide.Feature GetFeature(global::Routeguide.Point request, CallOptions options);
+      AsyncUnaryCall<global::Routeguide.Feature> GetFeatureAsync(global::Routeguide.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
+      AsyncUnaryCall<global::Routeguide.Feature> GetFeatureAsync(global::Routeguide.Point request, CallOptions options);
+      AsyncServerStreamingCall<global::Routeguide.Feature> ListFeatures(global::Routeguide.Rectangle request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
+      AsyncServerStreamingCall<global::Routeguide.Feature> ListFeatures(global::Routeguide.Rectangle request, CallOptions options);
+      AsyncClientStreamingCall<global::Routeguide.Point, global::Routeguide.RouteSummary> RecordRoute(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
+      AsyncClientStreamingCall<global::Routeguide.Point, global::Routeguide.RouteSummary> RecordRoute(CallOptions options);
+      AsyncDuplexStreamingCall<global::Routeguide.RouteNote, global::Routeguide.RouteNote> RouteChat(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken));
+      AsyncDuplexStreamingCall<global::Routeguide.RouteNote, global::Routeguide.RouteNote> RouteChat(CallOptions options);
     }
 
     // server-side interface
     public interface IRouteGuide
     {
-      Task<global::Examples.Feature> GetFeature(global::Examples.Point request, ServerCallContext context);
-      Task ListFeatures(global::Examples.Rectangle request, IServerStreamWriter<global::Examples.Feature> responseStream, ServerCallContext context);
-      Task<global::Examples.RouteSummary> RecordRoute(IAsyncStreamReader<global::Examples.Point> requestStream, ServerCallContext context);
-      Task RouteChat(IAsyncStreamReader<global::Examples.RouteNote> requestStream, IServerStreamWriter<global::Examples.RouteNote> responseStream, ServerCallContext context);
+      Task<global::Routeguide.Feature> GetFeature(global::Routeguide.Point request, ServerCallContext context);
+      Task ListFeatures(global::Routeguide.Rectangle request, IServerStreamWriter<global::Routeguide.Feature> responseStream, ServerCallContext context);
+      Task<global::Routeguide.RouteSummary> RecordRoute(IAsyncStreamReader<global::Routeguide.Point> requestStream, ServerCallContext context);
+      Task RouteChat(IAsyncStreamReader<global::Routeguide.RouteNote> requestStream, IServerStreamWriter<global::Routeguide.RouteNote> responseStream, ServerCallContext context);
     }
 
     // client stub
@@ -82,52 +82,52 @@ namespace Examples {
       public RouteGuideClient(Channel channel) : base(channel)
       {
       }
-      public global::Examples.Feature GetFeature(global::Examples.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
+      public global::Routeguide.Feature GetFeature(global::Routeguide.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
       {
         var call = CreateCall(__Method_GetFeature, new CallOptions(headers, deadline, cancellationToken));
         return Calls.BlockingUnaryCall(call, request);
       }
-      public global::Examples.Feature GetFeature(global::Examples.Point request, CallOptions options)
+      public global::Routeguide.Feature GetFeature(global::Routeguide.Point request, CallOptions options)
       {
         var call = CreateCall(__Method_GetFeature, options);
         return Calls.BlockingUnaryCall(call, request);
       }
-      public AsyncUnaryCall<global::Examples.Feature> GetFeatureAsync(global::Examples.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
+      public AsyncUnaryCall<global::Routeguide.Feature> GetFeatureAsync(global::Routeguide.Point request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
       {
         var call = CreateCall(__Method_GetFeature, new CallOptions(headers, deadline, cancellationToken));
         return Calls.AsyncUnaryCall(call, request);
       }
-      public AsyncUnaryCall<global::Examples.Feature> GetFeatureAsync(global::Examples.Point request, CallOptions options)
+      public AsyncUnaryCall<global::Routeguide.Feature> GetFeatureAsync(global::Routeguide.Point request, CallOptions options)
       {
         var call = CreateCall(__Method_GetFeature, options);
         return Calls.AsyncUnaryCall(call, request);
       }
-      public AsyncServerStreamingCall<global::Examples.Feature> ListFeatures(global::Examples.Rectangle request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
+      public AsyncServerStreamingCall<global::Routeguide.Feature> ListFeatures(global::Routeguide.Rectangle request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
       {
         var call = CreateCall(__Method_ListFeatures, new CallOptions(headers, deadline, cancellationToken));
         return Calls.AsyncServerStreamingCall(call, request);
       }
-      public AsyncServerStreamingCall<global::Examples.Feature> ListFeatures(global::Examples.Rectangle request, CallOptions options)
+      public AsyncServerStreamingCall<global::Routeguide.Feature> ListFeatures(global::Routeguide.Rectangle request, CallOptions options)
       {
         var call = CreateCall(__Method_ListFeatures, options);
         return Calls.AsyncServerStreamingCall(call, request);
       }
-      public AsyncClientStreamingCall<global::Examples.Point, global::Examples.RouteSummary> RecordRoute(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
+      public AsyncClientStreamingCall<global::Routeguide.Point, global::Routeguide.RouteSummary> RecordRoute(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
       {
         var call = CreateCall(__Method_RecordRoute, new CallOptions(headers, deadline, cancellationToken));
         return Calls.AsyncClientStreamingCall(call);
       }
-      public AsyncClientStreamingCall<global::Examples.Point, global::Examples.RouteSummary> RecordRoute(CallOptions options)
+      public AsyncClientStreamingCall<global::Routeguide.Point, global::Routeguide.RouteSummary> RecordRoute(CallOptions options)
       {
         var call = CreateCall(__Method_RecordRoute, options);
         return Calls.AsyncClientStreamingCall(call);
       }
-      public AsyncDuplexStreamingCall<global::Examples.RouteNote, global::Examples.RouteNote> RouteChat(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
+      public AsyncDuplexStreamingCall<global::Routeguide.RouteNote, global::Routeguide.RouteNote> RouteChat(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
       {
         var call = CreateCall(__Method_RouteChat, new CallOptions(headers, deadline, cancellationToken));
         return Calls.AsyncDuplexStreamingCall(call);
       }
-      public AsyncDuplexStreamingCall<global::Examples.RouteNote, global::Examples.RouteNote> RouteChat(CallOptions options)
+      public AsyncDuplexStreamingCall<global::Routeguide.RouteNote, global::Routeguide.RouteNote> RouteChat(CallOptions options)
       {
         var call = CreateCall(__Method_RouteChat, options);
         return Calls.AsyncDuplexStreamingCall(call);
diff --git a/examples/csharp/route_guide/RouteGuide/RouteGuideUtil.cs b/examples/csharp/route_guide/RouteGuide/RouteGuideUtil.cs
index 21a0be43d21e67022d7af2991f36d38cb7c1a074..e898738c7ae1c3d22d94eeb241e1f56fe8611288 100644
--- a/examples/csharp/route_guide/RouteGuide/RouteGuideUtil.cs
+++ b/examples/csharp/route_guide/RouteGuide/RouteGuideUtil.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Examples
+namespace Routeguide
 {
     /// <summary>
     /// Utility methods for the route guide example.
diff --git a/examples/csharp/route_guide/RouteGuideClient/Program.cs b/examples/csharp/route_guide/RouteGuideClient/Program.cs
index 4ddb526585fd8991e346363819a9bae6dc2bc356..be65fc38cd48f1c0d6bca67cd6bb91d5e371702f 100644
--- a/examples/csharp/route_guide/RouteGuideClient/Program.cs
+++ b/examples/csharp/route_guide/RouteGuideClient/Program.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Examples
+namespace Routeguide
 {
     class Program
     {
diff --git a/examples/csharp/route_guide/RouteGuideServer/Program.cs b/examples/csharp/route_guide/RouteGuideServer/Program.cs
index 0a4d73f391def829eb66161983b37943a6ad238f..baced0b10ab493cc0732943cf95fea3e6bf539a8 100644
--- a/examples/csharp/route_guide/RouteGuideServer/Program.cs
+++ b/examples/csharp/route_guide/RouteGuideServer/Program.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Examples
+namespace Routeguide
 {
     class Program
     {
diff --git a/examples/csharp/route_guide/RouteGuideServer/RouteGuideImpl.cs b/examples/csharp/route_guide/RouteGuideServer/RouteGuideImpl.cs
index fbe0f4471cf512643c8b1043660c66bc5e03eb4a..b82829438d68285707378dffca8e51427132cc51 100644
--- a/examples/csharp/route_guide/RouteGuideServer/RouteGuideImpl.cs
+++ b/examples/csharp/route_guide/RouteGuideServer/RouteGuideImpl.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 using Grpc.Core.Utils;
 
-namespace Examples
+namespace Routeguide
 {
     /// <summary>
     /// Example implementation of RouteGuide server.
diff --git a/grpc.gyp b/grpc.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..c76276ba84cfccbff7a92e03c4879a4deacb8447
--- /dev/null
+++ b/grpc.gyp
@@ -0,0 +1,12641 @@
+# GRPC gyp file
+# This currently builds C code.
+# This file has been automatically generated from a template file.
+# Please look at the templates directory instead.
+# This file can be regenerated from the template by running
+# tools/buildgen/generate_projects.sh
+
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Some of this file is built with the help of
+# https://n8.io/converting-a-c-library-to-gyp/
+{
+  # TODO: Finish windows support
+  'target_defaults': {
+    'default_configuration': 'Debug',
+    'configurations': {
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 1, # static debug
+          },
+        },
+      },
+      'Release': {
+        'defines': [ 'NDEBUG' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 0, # static release
+          },
+        },
+      }
+    },
+    'msvs_settings': {
+      'VCLinkerTool': {
+        'GenerateDebugInformation': 'true',
+      },
+    },
+    # TODO: Add fallback for Windows, and if pkg-config is not available
+    'defines': [
+      'TSI_OPENSSL_ALPN_SUPPORT=<!(pkg-config --atleast-version=1.0.2 openssl >/dev/null 2>&1 && echo 1 || echo 0)'
+    ],
+    'include_dirs': [
+      '.',
+      'include'
+    ],
+    # TODO: Check for libraries with pkg-config
+    'libraries': [
+      '-lcrypto',
+      '-lssl',
+      '-ldl',
+      '-lpthread',
+      '-lz'
+    ]
+  },
+  'targets': [
+    # TODO: Add C++ targets
+    {
+      'target_name': 'gpr',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+      ],
+      'sources': [
+        'src/core/support/alloc.c',
+        'src/core/support/cmdline.c',
+        'src/core/support/cpu_iphone.c',
+        'src/core/support/cpu_linux.c',
+        'src/core/support/cpu_posix.c',
+        'src/core/support/cpu_windows.c',
+        'src/core/support/env_linux.c',
+        'src/core/support/env_posix.c',
+        'src/core/support/env_win32.c',
+        'src/core/support/file.c',
+        'src/core/support/file_posix.c',
+        'src/core/support/file_win32.c',
+        'src/core/support/histogram.c',
+        'src/core/support/host_port.c',
+        'src/core/support/log.c',
+        'src/core/support/log_android.c',
+        'src/core/support/log_linux.c',
+        'src/core/support/log_posix.c',
+        'src/core/support/log_win32.c',
+        'src/core/support/murmur_hash.c',
+        'src/core/support/slice.c',
+        'src/core/support/slice_buffer.c',
+        'src/core/support/stack_lockfree.c',
+        'src/core/support/string.c',
+        'src/core/support/string_posix.c',
+        'src/core/support/string_win32.c',
+        'src/core/support/subprocess_posix.c',
+        'src/core/support/sync.c',
+        'src/core/support/sync_posix.c',
+        'src/core/support/sync_win32.c',
+        'src/core/support/thd.c',
+        'src/core/support/thd_posix.c',
+        'src/core/support/thd_win32.c',
+        'src/core/support/time.c',
+        'src/core/support/time_posix.c',
+        'src/core/support/time_win32.c',
+        'src/core/support/tls_pthread.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'gpr_test_util',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'gpr',
+      ],
+      'sources': [
+        'test/core/util/test_config.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'grpc',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'gpr',
+      ],
+      'sources': [
+        'src/core/httpcli/httpcli_security_connector.c',
+        'src/core/security/base64.c',
+        'src/core/security/client_auth_filter.c',
+        'src/core/security/credentials.c',
+        'src/core/security/credentials_metadata.c',
+        'src/core/security/credentials_posix.c',
+        'src/core/security/credentials_win32.c',
+        'src/core/security/google_default_credentials.c',
+        'src/core/security/handshake.c',
+        'src/core/security/json_token.c',
+        'src/core/security/jwt_verifier.c',
+        'src/core/security/secure_endpoint.c',
+        'src/core/security/security_connector.c',
+        'src/core/security/security_context.c',
+        'src/core/security/server_auth_filter.c',
+        'src/core/security/server_secure_chttp2.c',
+        'src/core/surface/init_secure.c',
+        'src/core/surface/secure_channel_create.c',
+        'src/core/tsi/fake_transport_security.c',
+        'src/core/tsi/ssl_transport_security.c',
+        'src/core/tsi/transport_security.c',
+        'src/core/census/grpc_context.c',
+        'src/core/census/grpc_filter.c',
+        'src/core/channel/channel_args.c',
+        'src/core/channel/channel_stack.c',
+        'src/core/channel/client_channel.c',
+        '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/client_config/client_config.c',
+        'src/core/client_config/connector.c',
+        'src/core/client_config/lb_policies/pick_first.c',
+        'src/core/client_config/lb_policies/round_robin.c',
+        'src/core/client_config/lb_policy.c',
+        'src/core/client_config/lb_policy_factory.c',
+        'src/core/client_config/lb_policy_registry.c',
+        'src/core/client_config/resolver.c',
+        'src/core/client_config/resolver_factory.c',
+        'src/core/client_config/resolver_registry.c',
+        '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',
+        'src/core/debug/trace.c',
+        'src/core/httpcli/format_request.c',
+        'src/core/httpcli/httpcli.c',
+        'src/core/httpcli/parser.c',
+        'src/core/iomgr/alarm.c',
+        'src/core/iomgr/alarm_heap.c',
+        'src/core/iomgr/endpoint.c',
+        'src/core/iomgr/endpoint_pair_posix.c',
+        'src/core/iomgr/endpoint_pair_windows.c',
+        'src/core/iomgr/fd_posix.c',
+        'src/core/iomgr/iocp_windows.c',
+        'src/core/iomgr/iomgr.c',
+        'src/core/iomgr/iomgr_posix.c',
+        'src/core/iomgr/iomgr_windows.c',
+        'src/core/iomgr/pollset_multipoller_with_epoll.c',
+        'src/core/iomgr/pollset_multipoller_with_poll_posix.c',
+        'src/core/iomgr/pollset_posix.c',
+        'src/core/iomgr/pollset_set_posix.c',
+        'src/core/iomgr/pollset_set_windows.c',
+        'src/core/iomgr/pollset_windows.c',
+        'src/core/iomgr/resolve_address_posix.c',
+        'src/core/iomgr/resolve_address_windows.c',
+        'src/core/iomgr/sockaddr_utils.c',
+        'src/core/iomgr/socket_utils_common_posix.c',
+        'src/core/iomgr/socket_utils_linux.c',
+        'src/core/iomgr/socket_utils_posix.c',
+        'src/core/iomgr/socket_windows.c',
+        'src/core/iomgr/tcp_client_posix.c',
+        'src/core/iomgr/tcp_client_windows.c',
+        'src/core/iomgr/tcp_posix.c',
+        'src/core/iomgr/tcp_server_posix.c',
+        'src/core/iomgr/tcp_server_windows.c',
+        'src/core/iomgr/tcp_windows.c',
+        'src/core/iomgr/time_averaged_stats.c',
+        'src/core/iomgr/udp_server.c',
+        'src/core/iomgr/wakeup_fd_eventfd.c',
+        'src/core/iomgr/wakeup_fd_nospecial.c',
+        'src/core/iomgr/wakeup_fd_pipe.c',
+        'src/core/iomgr/wakeup_fd_posix.c',
+        'src/core/json/json.c',
+        'src/core/json/json_reader.c',
+        'src/core/json/json_string.c',
+        'src/core/json/json_writer.c',
+        'src/core/profiling/basic_timers.c',
+        'src/core/profiling/stap_timers.c',
+        'src/core/surface/byte_buffer.c',
+        'src/core/surface/byte_buffer_queue.c',
+        'src/core/surface/byte_buffer_reader.c',
+        'src/core/surface/call.c',
+        'src/core/surface/call_details.c',
+        '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/completion_queue.c',
+        'src/core/surface/event_string.c',
+        'src/core/surface/init.c',
+        'src/core/surface/lame_client.c',
+        'src/core/surface/metadata_array.c',
+        'src/core/surface/server.c',
+        'src/core/surface/server_chttp2.c',
+        'src/core/surface/server_create.c',
+        'src/core/surface/surface_trace.c',
+        'src/core/surface/version.c',
+        'src/core/transport/chttp2/alpn.c',
+        'src/core/transport/chttp2/bin_encoder.c',
+        'src/core/transport/chttp2/frame_data.c',
+        'src/core/transport/chttp2/frame_goaway.c',
+        'src/core/transport/chttp2/frame_ping.c',
+        'src/core/transport/chttp2/frame_rst_stream.c',
+        'src/core/transport/chttp2/frame_settings.c',
+        'src/core/transport/chttp2/frame_window_update.c',
+        'src/core/transport/chttp2/hpack_parser.c',
+        'src/core/transport/chttp2/hpack_table.c',
+        'src/core/transport/chttp2/huffsyms.c',
+        'src/core/transport/chttp2/incoming_metadata.c',
+        'src/core/transport/chttp2/parsing.c',
+        'src/core/transport/chttp2/status_conversion.c',
+        'src/core/transport/chttp2/stream_encoder.c',
+        'src/core/transport/chttp2/stream_lists.c',
+        'src/core/transport/chttp2/stream_map.c',
+        'src/core/transport/chttp2/timeout_encoding.c',
+        'src/core/transport/chttp2/varint.c',
+        'src/core/transport/chttp2/writing.c',
+        'src/core/transport/chttp2_transport.c',
+        'src/core/transport/connectivity_state.c',
+        'src/core/transport/metadata.c',
+        'src/core/transport/stream_op.c',
+        'src/core/transport/transport.c',
+        'src/core/transport/transport_op_string.c',
+        'src/core/census/context.c',
+        'src/core/census/initialize.c',
+        'src/core/census/operation.c',
+        'src/core/census/tracing.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'grpc_test_util',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'gpr',
+        'gpr_test_util',
+        'grpc',
+      ],
+      'sources': [
+        'test/core/end2end/data/server1_cert.c',
+        'test/core/end2end/data/server1_key.c',
+        'test/core/end2end/data/test_root_cert.c',
+        'test/core/end2end/cq_verifier.c',
+        'test/core/end2end/fixtures/proxy.c',
+        'test/core/iomgr/endpoint_tests.c',
+        'test/core/security/oauth2_utils.c',
+        'test/core/util/grpc_profiler.c',
+        'test/core/util/parse_hexstring.c',
+        'test/core/util/port_posix.c',
+        'test/core/util/port_windows.c',
+        'test/core/util/slice_splitter.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'grpc_test_util_unsecure',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'gpr',
+        'gpr_test_util',
+        'grpc',
+      ],
+      'sources': [
+        'test/core/end2end/cq_verifier.c',
+        'test/core/end2end/fixtures/proxy.c',
+        'test/core/iomgr/endpoint_tests.c',
+        'test/core/security/oauth2_utils.c',
+        'test/core/util/grpc_profiler.c',
+        'test/core/util/parse_hexstring.c',
+        'test/core/util/port_posix.c',
+        'test/core/util/port_windows.c',
+        'test/core/util/slice_splitter.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'grpc_unsecure',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'gpr',
+      ],
+      'sources': [
+        'src/core/surface/init_unsecure.c',
+        'src/core/census/grpc_context.c',
+        'src/core/census/grpc_filter.c',
+        'src/core/channel/channel_args.c',
+        'src/core/channel/channel_stack.c',
+        'src/core/channel/client_channel.c',
+        '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/client_config/client_config.c',
+        'src/core/client_config/connector.c',
+        'src/core/client_config/lb_policies/pick_first.c',
+        'src/core/client_config/lb_policies/round_robin.c',
+        'src/core/client_config/lb_policy.c',
+        'src/core/client_config/lb_policy_factory.c',
+        'src/core/client_config/lb_policy_registry.c',
+        'src/core/client_config/resolver.c',
+        'src/core/client_config/resolver_factory.c',
+        'src/core/client_config/resolver_registry.c',
+        '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',
+        'src/core/debug/trace.c',
+        'src/core/httpcli/format_request.c',
+        'src/core/httpcli/httpcli.c',
+        'src/core/httpcli/parser.c',
+        'src/core/iomgr/alarm.c',
+        'src/core/iomgr/alarm_heap.c',
+        'src/core/iomgr/endpoint.c',
+        'src/core/iomgr/endpoint_pair_posix.c',
+        'src/core/iomgr/endpoint_pair_windows.c',
+        'src/core/iomgr/fd_posix.c',
+        'src/core/iomgr/iocp_windows.c',
+        'src/core/iomgr/iomgr.c',
+        'src/core/iomgr/iomgr_posix.c',
+        'src/core/iomgr/iomgr_windows.c',
+        'src/core/iomgr/pollset_multipoller_with_epoll.c',
+        'src/core/iomgr/pollset_multipoller_with_poll_posix.c',
+        'src/core/iomgr/pollset_posix.c',
+        'src/core/iomgr/pollset_set_posix.c',
+        'src/core/iomgr/pollset_set_windows.c',
+        'src/core/iomgr/pollset_windows.c',
+        'src/core/iomgr/resolve_address_posix.c',
+        'src/core/iomgr/resolve_address_windows.c',
+        'src/core/iomgr/sockaddr_utils.c',
+        'src/core/iomgr/socket_utils_common_posix.c',
+        'src/core/iomgr/socket_utils_linux.c',
+        'src/core/iomgr/socket_utils_posix.c',
+        'src/core/iomgr/socket_windows.c',
+        'src/core/iomgr/tcp_client_posix.c',
+        'src/core/iomgr/tcp_client_windows.c',
+        'src/core/iomgr/tcp_posix.c',
+        'src/core/iomgr/tcp_server_posix.c',
+        'src/core/iomgr/tcp_server_windows.c',
+        'src/core/iomgr/tcp_windows.c',
+        'src/core/iomgr/time_averaged_stats.c',
+        'src/core/iomgr/udp_server.c',
+        'src/core/iomgr/wakeup_fd_eventfd.c',
+        'src/core/iomgr/wakeup_fd_nospecial.c',
+        'src/core/iomgr/wakeup_fd_pipe.c',
+        'src/core/iomgr/wakeup_fd_posix.c',
+        'src/core/json/json.c',
+        'src/core/json/json_reader.c',
+        'src/core/json/json_string.c',
+        'src/core/json/json_writer.c',
+        'src/core/profiling/basic_timers.c',
+        'src/core/profiling/stap_timers.c',
+        'src/core/surface/byte_buffer.c',
+        'src/core/surface/byte_buffer_queue.c',
+        'src/core/surface/byte_buffer_reader.c',
+        'src/core/surface/call.c',
+        'src/core/surface/call_details.c',
+        '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/completion_queue.c',
+        'src/core/surface/event_string.c',
+        'src/core/surface/init.c',
+        'src/core/surface/lame_client.c',
+        'src/core/surface/metadata_array.c',
+        'src/core/surface/server.c',
+        'src/core/surface/server_chttp2.c',
+        'src/core/surface/server_create.c',
+        'src/core/surface/surface_trace.c',
+        'src/core/surface/version.c',
+        'src/core/transport/chttp2/alpn.c',
+        'src/core/transport/chttp2/bin_encoder.c',
+        'src/core/transport/chttp2/frame_data.c',
+        'src/core/transport/chttp2/frame_goaway.c',
+        'src/core/transport/chttp2/frame_ping.c',
+        'src/core/transport/chttp2/frame_rst_stream.c',
+        'src/core/transport/chttp2/frame_settings.c',
+        'src/core/transport/chttp2/frame_window_update.c',
+        'src/core/transport/chttp2/hpack_parser.c',
+        'src/core/transport/chttp2/hpack_table.c',
+        'src/core/transport/chttp2/huffsyms.c',
+        'src/core/transport/chttp2/incoming_metadata.c',
+        'src/core/transport/chttp2/parsing.c',
+        'src/core/transport/chttp2/status_conversion.c',
+        'src/core/transport/chttp2/stream_encoder.c',
+        'src/core/transport/chttp2/stream_lists.c',
+        'src/core/transport/chttp2/stream_map.c',
+        'src/core/transport/chttp2/timeout_encoding.c',
+        'src/core/transport/chttp2/varint.c',
+        'src/core/transport/chttp2/writing.c',
+        'src/core/transport/chttp2_transport.c',
+        'src/core/transport/connectivity_state.c',
+        'src/core/transport/metadata.c',
+        'src/core/transport/stream_op.c',
+        'src/core/transport/transport.c',
+        'src/core/transport/transport_op_string.c',
+        'src/core/census/context.c',
+        'src/core/census/initialize.c',
+        'src/core/census/operation.c',
+        'src/core/census/tracing.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'grpc_zookeeper',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'gpr',
+        'grpc',
+      ],
+      'sources': [
+        'src/core/client_config/resolvers/zookeeper_resolver.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'reconnect_server',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/util/reconnect_server.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_compress',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_compress.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_fakesec',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_fakesec.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_full',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_full.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_full+poll',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_full+poll.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_oauth2',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_oauth2.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_proxy',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_proxy.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_sockpair',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_sockpair.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_sockpair+trace',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_sockpair+trace.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_sockpair_1byte',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_sockpair_1byte.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_ssl',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_ssl.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_ssl+poll',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_ssl+poll.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_ssl_proxy',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_ssl_proxy.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_uds',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_uds.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_fixture_h2_uds+poll',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/fixtures/h2_uds+poll.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_bad_hostname',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/bad_hostname.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_binary_metadata',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/binary_metadata.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_call_creds',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/call_creds.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_cancel_after_accept',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/cancel_after_accept.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_cancel_after_client_done',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/cancel_after_client_done.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_cancel_after_invoke',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/cancel_after_invoke.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_cancel_before_invoke',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/cancel_before_invoke.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_cancel_in_a_vacuum',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/cancel_in_a_vacuum.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_census_simple_request',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/census_simple_request.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_channel_connectivity',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/channel_connectivity.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_compressed_payload',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/compressed_payload.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_default_host',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/default_host.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_disappearing_server',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/disappearing_server.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_empty_batch',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/empty_batch.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_graceful_server_shutdown',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/graceful_server_shutdown.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_high_initial_seqno',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/high_initial_seqno.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_invoke_large_request',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/invoke_large_request.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_large_metadata',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/large_metadata.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_max_concurrent_streams',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/max_concurrent_streams.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_max_message_length',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/max_message_length.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_metadata',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/metadata.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_no_op',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/no_op.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_payload',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/payload.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_ping_pong_streaming',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/ping_pong_streaming.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_registered_call',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/registered_call.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_request_with_flags',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/request_with_flags.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_request_with_payload',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/request_with_payload.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_server_finishes_request',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/server_finishes_request.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_shutdown_finishes_calls',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/shutdown_finishes_calls.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_shutdown_finishes_tags',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/shutdown_finishes_tags.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_simple_delayed_request',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/simple_delayed_request.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_simple_request',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/simple_request.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_test_trailing_metadata',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/tests/trailing_metadata.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'end2end_certs',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+      ],
+      'sources': [
+        'test/core/end2end/data/test_root_cert.c',
+        'test/core/end2end/data/server1_cert.c',
+        'test/core/end2end/data/server1_key.c',
+      ],
+    },
+    # TODO: Add C++ targets
+    {
+      'target_name': 'bad_client_test',
+      'product_prefix': 'lib',
+      'type': 'static_library',
+      'dependencies': [
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/bad_client/bad_client.c',
+      ],
+    },
+    {
+      'target_name': 'alarm_heap_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/alarm_heap_test.c',
+      ]
+    },
+    {
+      'target_name': 'alarm_list_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/alarm_list_test.c',
+      ]
+    },
+    {
+      'target_name': 'alarm_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/alarm_test.c',
+      ]
+    },
+    {
+      'target_name': 'alpn_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/alpn_test.c',
+      ]
+    },
+    {
+      'target_name': 'bin_encoder_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/bin_encoder_test.c',
+      ]
+    },
+    {
+      'target_name': 'chttp2_status_conversion_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/status_conversion_test.c',
+      ]
+    },
+    {
+      'target_name': 'chttp2_stream_encoder_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/stream_encoder_test.c',
+      ]
+    },
+    {
+      'target_name': 'chttp2_stream_map_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/stream_map_test.c',
+      ]
+    },
+    {
+      'target_name': 'compression_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/compression/compression_test.c',
+      ]
+    },
+    {
+      'target_name': 'dualstack_socket_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/dualstack_socket_test.c',
+      ]
+    },
+    {
+      'target_name': 'endpoint_pair_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/endpoint_pair_test.c',
+      ]
+    },
+    {
+      'target_name': 'fd_conservation_posix_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/fd_conservation_posix_test.c',
+      ]
+    },
+    {
+      'target_name': 'fd_posix_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/fd_posix_test.c',
+      ]
+    },
+    {
+      'target_name': 'fling_client',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/fling/client.c',
+      ]
+    },
+    {
+      'target_name': 'fling_server',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/fling/server.c',
+      ]
+    },
+    {
+      'target_name': 'fling_stream_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/fling/fling_stream_test.c',
+      ]
+    },
+    {
+      'target_name': 'fling_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/fling/fling_test.c',
+      ]
+    },
+    {
+      'target_name': 'gen_hpack_tables',
+      'type': 'executable',
+      'dependencies': [
+        'gpr',
+        'grpc',
+      ],
+      'sources': [
+        'tools/codegen/core/gen_hpack_tables.c',
+      ]
+    },
+    {
+      'target_name': 'gen_legal_metadata_characters',
+      'type': 'executable',
+      'dependencies': [
+      ],
+      'sources': [
+        'tools/codegen/core/gen_legal_metadata_characters.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_cmdline_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/cmdline_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_env_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/env_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_file_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/file_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_histogram_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/histogram_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_host_port_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/host_port_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_log_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/log_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_slice_buffer_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/slice_buffer_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_slice_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/slice_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_stack_lockfree_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/stack_lockfree_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_string_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/string_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_sync_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/sync_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_thd_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/thd_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_time_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/time_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_tls_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/tls_test.c',
+      ]
+    },
+    {
+      'target_name': 'gpr_useful_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/useful_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_auth_context_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/auth_context_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_base64_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/base64_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_byte_buffer_reader_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/surface/byte_buffer_reader_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_channel_args_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/channel/channel_args_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_channel_stack_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/channel/channel_stack_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_completion_queue_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/surface/completion_queue_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_create_jwt',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/create_jwt.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_credentials_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/credentials_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_fetch_oauth2',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/fetch_oauth2.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_json_token_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/json_token_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_jwt_verifier_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/jwt_verifier_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_print_google_default_creds_token',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/print_google_default_creds_token.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_security_connector_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/security_connector_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_stream_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/stream_op_test.c',
+      ]
+    },
+    {
+      'target_name': 'grpc_verify_jwt',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/verify_jwt.c',
+      ]
+    },
+    {
+      'target_name': 'hpack_parser_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/hpack_parser_test.c',
+      ]
+    },
+    {
+      'target_name': 'hpack_table_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/hpack_table_test.c',
+      ]
+    },
+    {
+      'target_name': 'httpcli_format_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/httpcli/format_request_test.c',
+      ]
+    },
+    {
+      'target_name': 'httpcli_parser_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/httpcli/parser_test.c',
+      ]
+    },
+    {
+      'target_name': 'httpcli_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/httpcli/httpcli_test.c',
+      ]
+    },
+    {
+      'target_name': 'json_rewrite',
+      'type': 'executable',
+      'dependencies': [
+        'grpc',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/json/json_rewrite.c',
+      ]
+    },
+    {
+      'target_name': 'json_rewrite_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/json/json_rewrite_test.c',
+      ]
+    },
+    {
+      'target_name': 'json_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/json/json_test.c',
+      ]
+    },
+    {
+      'target_name': 'lame_client_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/surface/lame_client_test.c',
+      ]
+    },
+    {
+      'target_name': 'lb_policies_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/client_config/lb_policies_test.c',
+      ]
+    },
+    {
+      'target_name': 'low_level_ping_pong_benchmark',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/network_benchmarks/low_level_ping_pong.c',
+      ]
+    },
+    {
+      'target_name': 'message_compress_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/compression/message_compress_test.c',
+      ]
+    },
+    {
+      'target_name': 'multi_init_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/surface/multi_init_test.c',
+      ]
+    },
+    {
+      'target_name': 'multiple_server_queues_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/multiple_server_queues_test.c',
+      ]
+    },
+    {
+      'target_name': 'murmur_hash_test',
+      'type': 'executable',
+      'dependencies': [
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/support/murmur_hash_test.c',
+      ]
+    },
+    {
+      'target_name': 'no_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/end2end/no_server_test.c',
+      ]
+    },
+    {
+      'target_name': 'resolve_address_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/resolve_address_test.c',
+      ]
+    },
+    {
+      'target_name': 'secure_endpoint_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/security/secure_endpoint_test.c',
+      ]
+    },
+    {
+      'target_name': 'sockaddr_utils_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/sockaddr_utils_test.c',
+      ]
+    },
+    {
+      'target_name': 'tcp_client_posix_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/tcp_client_posix_test.c',
+      ]
+    },
+    {
+      'target_name': 'tcp_posix_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/tcp_posix_test.c',
+      ]
+    },
+    {
+      'target_name': 'tcp_server_posix_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/tcp_server_posix_test.c',
+      ]
+    },
+    {
+      'target_name': 'time_averaged_stats_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/time_averaged_stats_test.c',
+      ]
+    },
+    {
+      'target_name': 'timeout_encoding_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/chttp2/timeout_encoding_test.c',
+      ]
+    },
+    {
+      'target_name': 'timers_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/profiling/timers_test.c',
+      ]
+    },
+    {
+      'target_name': 'transport_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/transport/metadata_test.c',
+      ]
+    },
+    {
+      'target_name': 'transport_security_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/tsi/transport_security_test.c',
+      ]
+    },
+    {
+      'target_name': 'udp_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/iomgr/udp_server_test.c',
+      ]
+    },
+    {
+      'target_name': 'uri_parser_test',
+      'type': 'executable',
+      'dependencies': [
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/client_config/uri_parser_test.c',
+      ]
+    },
+    {
+      'target_name': 'h2_compress_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_fakesec_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_fakesec',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_oauth2_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_oauth2',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl+poll_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl+poll',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_default_host_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_default_host',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_ssl_proxy_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_ssl_proxy',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_bad_hostname_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_bad_hostname',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_binary_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_binary_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_call_creds_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_call_creds',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_after_accept_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_after_accept',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_after_client_done_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_after_client_done',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_after_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_after_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_before_invoke_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_before_invoke',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_in_a_vacuum_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_in_a_vacuum',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_census_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_census_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_channel_connectivity_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_channel_connectivity',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_compressed_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_compressed_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_disappearing_server_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_disappearing_server',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_empty_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_empty_batch',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_graceful_server_shutdown_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_graceful_server_shutdown',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_high_initial_seqno_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_high_initial_seqno',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_invoke_large_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_invoke_large_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_large_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_large_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_max_concurrent_streams_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_max_concurrent_streams',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_max_message_length_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_max_message_length',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_no_op_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_no_op',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_ping_pong_streaming_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_ping_pong_streaming',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_registered_call_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_registered_call',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_request_with_flags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_request_with_flags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_request_with_payload_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_request_with_payload',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_server_finishes_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_server_finishes_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_shutdown_finishes_calls_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_shutdown_finishes_calls',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_shutdown_finishes_tags_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_shutdown_finishes_tags',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_simple_delayed_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_simple_delayed_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_simple_request_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_simple_request',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_trailing_metadata_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_trailing_metadata',
+        'end2end_certs',
+        'grpc_test_util',
+        'grpc',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_channel_connectivity_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_channel_connectivity',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_default_host_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_default_host',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_disappearing_server_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_disappearing_server',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_simple_delayed_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_simple_delayed_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_compress_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_compress',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_channel_connectivity_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_channel_connectivity',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_default_host_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_default_host',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_disappearing_server_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_disappearing_server',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_simple_delayed_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_simple_delayed_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_channel_connectivity_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_channel_connectivity',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_default_host_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_default_host',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_disappearing_server_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_disappearing_server',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_simple_delayed_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_simple_delayed_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_full+poll_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_full+poll',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_default_host_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_default_host',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_disappearing_server_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_disappearing_server',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_simple_delayed_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_simple_delayed_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_proxy_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_proxy',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair+trace_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair+trace',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_sockpair_1byte_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_sockpair_1byte',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_channel_connectivity_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_channel_connectivity',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_disappearing_server_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_disappearing_server',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_simple_delayed_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_simple_delayed_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_bad_hostname_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_bad_hostname',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_binary_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_binary_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_after_accept_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_after_accept',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_after_client_done_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_after_client_done',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_after_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_after_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_before_invoke_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_before_invoke',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_cancel_in_a_vacuum_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_cancel_in_a_vacuum',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_census_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_census_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_channel_connectivity_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_channel_connectivity',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_compressed_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_compressed_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_disappearing_server_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_disappearing_server',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_empty_batch_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_empty_batch',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_graceful_server_shutdown_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_graceful_server_shutdown',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_high_initial_seqno_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_high_initial_seqno',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_invoke_large_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_invoke_large_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_large_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_large_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_max_concurrent_streams_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_max_concurrent_streams',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_max_message_length_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_max_message_length',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_no_op_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_no_op',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_ping_pong_streaming_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_ping_pong_streaming',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_registered_call_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_registered_call',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_request_with_flags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_request_with_flags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_request_with_payload_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_request_with_payload',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_server_finishes_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_server_finishes_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_shutdown_finishes_calls_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_shutdown_finishes_calls',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_shutdown_finishes_tags_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_shutdown_finishes_tags',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_simple_delayed_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_simple_delayed_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_simple_request_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_simple_request',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'h2_uds+poll_trailing_metadata_nosec_test',
+      'type': 'executable',
+      'dependencies': [
+        'end2end_fixture_h2_uds+poll',
+        'end2end_test_trailing_metadata',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+      ]
+    },
+    {
+      'target_name': 'connection_prefix_bad_client_test',
+      'type': 'executable',
+      'dependencies': [
+        'bad_client_test',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/bad_client/tests/connection_prefix.c',
+      ]
+    },
+    {
+      'target_name': 'initial_settings_frame_bad_client_test',
+      'type': 'executable',
+      'dependencies': [
+        'bad_client_test',
+        'grpc_test_util_unsecure',
+        'grpc_unsecure',
+        'gpr_test_util',
+        'gpr',
+      ],
+      'sources': [
+        'test/core/bad_client/tests/initial_settings_frame.c',
+      ]
+    },
+  ]
+}
diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c
index fe3673c6071b1b164a5c091893596c9d6e6a35b4..725c18e6ccd8a02a46dbd36343ecb503160420b9 100644
--- a/src/core/iomgr/tcp_windows.c
+++ b/src/core/iomgr/tcp_windows.c
@@ -144,7 +144,7 @@ static int on_read(grpc_tcp *tcp, int success) {
   int do_abort = 0;
 
   if (success) {
-    if (socket->read_info.wsa_error != 0) {
+    if (socket->read_info.wsa_error != 0 && !tcp->shutting_down) {
       if (socket->read_info.wsa_error != WSAECONNRESET) {
         char *utf8_message = gpr_format_message(info->wsa_error);
         gpr_log(GPR_ERROR, "ReadFile overlapped error: %s", utf8_message);
@@ -153,7 +153,7 @@ static int on_read(grpc_tcp *tcp, int success) {
       success = 0;
       gpr_slice_unref(tcp->read_slice);
     } else {
-      if (info->bytes_transfered != 0) {
+      if (info->bytes_transfered != 0 && !tcp->shutting_down) {
         sub = gpr_slice_sub_no_ref(tcp->read_slice, 0, info->bytes_transfered);
         gpr_slice_buffer_add(tcp->read_slices, sub);
         success = 1;
diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c
index c8811325b9b2a9d1e40fd371aa5140cbb117a96e..16b3fed08ff160ad5922ae2e83dab777e2c03335 100644
--- a/src/core/security/client_auth_filter.c
+++ b/src/core/security/client_auth_filter.c
@@ -209,7 +209,8 @@ static void auth_start_transport_op(grpc_call_element *elem,
   size_t i;
   grpc_client_security_context *sec_ctx = NULL;
 
-  if (calld->security_context_set == 0) {
+  if (calld->security_context_set == 0 &&
+      op->cancel_with_status == GRPC_STATUS_OK) {
     calld->security_context_set = 1;
     GPR_ASSERT(op->context);
     if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) {
@@ -224,11 +225,11 @@ static void auth_start_transport_op(grpc_call_element *elem,
         chand->security_connector->base.auth_context, "client_auth_filter");
   }
 
-  if (op->bind_pollset) {
+  if (op->bind_pollset != NULL) {
     calld->pollset = op->bind_pollset;
   }
 
-  if (op->send_ops && !calld->sent_initial_metadata) {
+  if (op->send_ops != NULL && !calld->sent_initial_metadata) {
     size_t nops = op->send_ops->nops;
     grpc_stream_op *ops = op->send_ops->ops;
     for (i = 0; i < nops; i++) {
diff --git a/src/csharp/Grpc.Core/Logging/ConsoleLogger.cs b/src/csharp/Grpc.Core/Logging/ConsoleLogger.cs
index 35561d25d8a566c26772c8c57d3ce7d8cb6f930f..5c5b8021641ebf46afa762c0b3d905d58f00e27d 100644
--- a/src/csharp/Grpc.Core/Logging/ConsoleLogger.cs
+++ b/src/csharp/Grpc.Core/Logging/ConsoleLogger.cs
@@ -79,48 +79,72 @@ namespace Grpc.Core.Logging
         }
 
         /// <summary>Logs a message with severity Debug.</summary>
-        public void Debug(string message, params object[] formatArgs)
+        public void Debug(string message)
         {
-            Log("D", message, formatArgs);
+            Log("D", message);
+        }
+
+        /// <summary>Logs a formatted message with severity Debug.</summary>
+        public void Debug(string format, params object[] formatArgs)
+        {
+            Debug(string.Format(format, formatArgs));
         }
 
         /// <summary>Logs a message with severity Info.</summary>
-        public void Info(string message, params object[] formatArgs)
+        public void Info(string message)
+        {
+            Log("I", message);
+        }
+
+        /// <summary>Logs a formatted message with severity Info.</summary>
+        public void Info(string format, params object[] formatArgs)
         {
-            Log("I", message, formatArgs);
+            Info(string.Format(format, formatArgs));
         }
 
         /// <summary>Logs a message with severity Warning.</summary>
-        public void Warning(string message, params object[] formatArgs)
+        public void Warning(string message)
         {
-            Log("W", message, formatArgs);
+            Log("W", message);
+        }
+
+        /// <summary>Logs a formatted message with severity Warning.</summary>
+        public void Warning(string format, params object[] formatArgs)
+        {
+            Warning(string.Format(format, formatArgs));
         }
 
         /// <summary>Logs a message and an associated exception with severity Warning.</summary>
-        public void Warning(Exception exception, string message, params object[] formatArgs)
+        public void Warning(Exception exception, string message)
         {
-            Log("W", message + " " + exception, formatArgs);
+            Warning(message + " " + exception);
         }
 
         /// <summary>Logs a message with severity Error.</summary>
-        public void Error(string message, params object[] formatArgs)
+        public void Error(string message)
+        {
+            Log("E", message);
+        }
+
+        /// <summary>Logs a formatted message with severity Error.</summary>
+        public void Error(string format, params object[] formatArgs)
         {
-            Log("E", message, formatArgs);
+            Error(string.Format(format, formatArgs));
         }
 
         /// <summary>Logs a message and an associated exception with severity Error.</summary>
-        public void Error(Exception exception, string message, params object[] formatArgs)
+        public void Error(Exception exception, string message)
         {
-            Log("E", message + " " + exception, formatArgs);
+            Error(message + " " + exception);
         }
 
-        private void Log(string severityString, string message, object[] formatArgs)
+        private void Log(string severityString, string message)
         {
             Console.Error.WriteLine("{0}{1} {2}{3}",
                 severityString,
                 DateTime.Now,
                 forTypeString,
-                string.Format(message, formatArgs));
+                message);
         }
     }
 }
diff --git a/src/csharp/Grpc.Core/Logging/ILogger.cs b/src/csharp/Grpc.Core/Logging/ILogger.cs
index 61e0c91388bafbd2182e880f9a7f962e4fafefd2..7c0326422f4cfeffde6dc15fe3c7bc136cc729fc 100644
--- a/src/csharp/Grpc.Core/Logging/ILogger.cs
+++ b/src/csharp/Grpc.Core/Logging/ILogger.cs
@@ -43,21 +43,33 @@ namespace Grpc.Core.Logging
         ILogger ForType<T>();
 
         /// <summary>Logs a message with severity Debug.</summary>
-        void Debug(string message, params object[] formatArgs);
+        void Debug(string message);
+
+        /// <summary>Logs a formatted message with severity Debug.</summary>
+        void Debug(string format, params object[] formatArgs);
 
         /// <summary>Logs a message with severity Info.</summary>
-        void Info(string message, params object[] formatArgs);
+        void Info(string message);
+
+        /// <summary>Logs a formatted message with severity Info.</summary>
+        void Info(string format, params object[] formatArgs);
 
         /// <summary>Logs a message with severity Warning.</summary>
-        void Warning(string message, params object[] formatArgs);
+        void Warning(string message);
+
+        /// <summary>Logs a formatted message with severity Warning.</summary>
+        void Warning(string format, params object[] formatArgs);
 
         /// <summary>Logs a message and an associated exception with severity Warning.</summary>
-        void Warning(Exception exception, string message, params object[] formatArgs);
+        void Warning(Exception exception, string message);
 
         /// <summary>Logs a message with severity Error.</summary>
-        void Error(string message, params object[] formatArgs);
+        void Error(string message);
+
+        /// <summary>Logs a formatted message with severity Error.</summary>
+        void Error(string format, params object[] formatArgs);
 
         /// <summary>Logs a message and an associated exception with severity Error.</summary>
-        void Error(Exception exception, string message, params object[] formatArgs);
+        void Error(Exception exception, string message);
     }
 }
diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs
index eda821bc3120e9aaaca8d55301bfd2e71ca10a6f..e9ec30e9238bc21069e2659f737130ef19e73df0 100644
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@@ -41,6 +41,6 @@ namespace Grpc.Core
         /// <summary>
         /// Current version of gRPC C#
         /// </summary>
-        public const string CurrentVersion = "0.7.0";
+        public const string CurrentVersion = "0.7.1";
     }
 }
diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
index 0884c6ea60a39f49b424cb1ac0e400bdb4e69644..616093d4aebf8503bcf39cf3a4a92d2d57da228f 100644
--- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
+++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs
@@ -131,7 +131,7 @@ namespace Grpc.IntegrationTesting
             var channel = new Channel(options.ServerHost, options.ServerPort, credentials, channelOptions);
             TestService.TestServiceClient client = new TestService.TestServiceClient(channel);
             await RunTestCaseAsync(client, options);
-            channel.ShutdownAsync().Wait();
+            await channel.ShutdownAsync();
         }
 
         private async Task RunTestCaseAsync(TestService.TestServiceClient client, ClientOptions options)
diff --git a/src/csharp/Grpc.IntegrationTesting/proto/test.proto b/src/csharp/Grpc.IntegrationTesting/proto/test.proto
index f9e0d2a03962a6ba680cf603bc2433c6ef2b4f8f..5496f72af07bcb3cab6505ac21258e6ae08bac46 100644
--- a/src/csharp/Grpc.IntegrationTesting/proto/test.proto
+++ b/src/csharp/Grpc.IntegrationTesting/proto/test.proto
@@ -44,7 +44,6 @@ service TestService {
   rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
-  // TODO(Issue 527): Describe required server behavior.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
 
   // One request followed by a sequence of responses (streamed download).
diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat
index ea2206e7606d6250e2672d191cd735e8b39f369d..a3505b1e0126358a64ff4fcb32a9209dac17c47a 100644
--- a/src/csharp/build_packages.bat
+++ b/src/csharp/build_packages.bat
@@ -1,12 +1,12 @@
 @rem Builds gRPC NuGet packages
 
 @rem Current package versions
-set VERSION=0.7.0
-set CORE_VERSION=0.11.0
+set VERSION=0.7.1
+set CORE_VERSION=0.11.1
 set PROTOBUF_VERSION=3.0.0-alpha4
 
 @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well.
-set VERSION_WITH_BETA=0.7.0-beta
+set VERSION_WITH_BETA=%VERSION%-beta
 
 @rem Adjust the location of nuget.exe
 set NUGET=C:\nuget\nuget.exe
diff --git a/src/node/binding.gyp b/src/node/binding.gyp
index 734dc8410b55832cd350f90aa1b4a87ccf5ba640..a64403093243c4630d028ea9c1d85388df1b31bc 100644
--- a/src/node/binding.gyp
+++ b/src/node/binding.gyp
@@ -8,7 +8,6 @@
         '-std=c++0x',
         '-Wall',
         '-pthread',
-        '-pedantic',
         '-g',
         '-zdefs',
         '-Werror',
diff --git a/src/node/ext/byte_buffer.cc b/src/node/ext/byte_buffer.cc
index 7eff11c2b341e881ac2abd4bba1b99572928da9b..e1786ddba7ee88d169288646952eba5b5680f4da 100644
--- a/src/node/ext/byte_buffer.cc
+++ b/src/node/ext/byte_buffer.cc
@@ -44,15 +44,16 @@
 namespace grpc {
 namespace node {
 
+
 using v8::Context;
 using v8::Function;
-using v8::Handle;
+using v8::Local;
 using v8::Object;
 using v8::Number;
 using v8::Value;
 
-grpc_byte_buffer *BufferToByteBuffer(Handle<Value> buffer) {
-  NanScope();
+grpc_byte_buffer *BufferToByteBuffer(Local<Value> buffer) {
+  Nan::HandleScope scope;
   int length = ::node::Buffer::Length(buffer);
   char *data = ::node::Buffer::Data(buffer);
   gpr_slice slice = gpr_slice_malloc(length);
@@ -62,10 +63,10 @@ grpc_byte_buffer *BufferToByteBuffer(Handle<Value> buffer) {
   return byte_buffer;
 }
 
-Handle<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
-  NanEscapableScope();
+Local<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
+  Nan::EscapableHandleScope scope;
   if (buffer == NULL) {
-    return NanEscapeScope(NanNull());
+    return scope.Escape(Nan::Null());
   }
   size_t length = grpc_byte_buffer_length(buffer);
   char *result = reinterpret_cast<char *>(calloc(length, sizeof(char)));
@@ -77,21 +78,22 @@ Handle<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
     memcpy(result + offset, GPR_SLICE_START_PTR(next), GPR_SLICE_LENGTH(next));
     offset += GPR_SLICE_LENGTH(next);
   }
-  return NanEscapeScope(MakeFastBuffer(NanNewBufferHandle(result, length)));
+  return scope.Escape(MakeFastBuffer(
+      Nan::NewBuffer(result, length).ToLocalChecked()));
 }
 
-Handle<Value> MakeFastBuffer(Handle<Value> slowBuffer) {
-  NanEscapableScope();
-  Handle<Object> globalObj = NanGetCurrentContext()->Global();
-  Handle<Function> bufferConstructor = Handle<Function>::Cast(
-      globalObj->Get(NanNew("Buffer")));
-  Handle<Value> consArgs[3] = {
+Local<Value> MakeFastBuffer(Local<Value> slowBuffer) {
+  Nan::EscapableHandleScope scope;
+  Local<Object> globalObj = Nan::GetCurrentContext()->Global();
+  Local<Function> bufferConstructor = Local<Function>::Cast(
+      globalObj->Get(Nan::New("Buffer").ToLocalChecked()));
+  Local<Value> consArgs[3] = {
     slowBuffer,
-    NanNew<Number>(::node::Buffer::Length(slowBuffer)),
-    NanNew<Number>(0)
+    Nan::New<Number>(::node::Buffer::Length(slowBuffer)),
+    Nan::New<Number>(0)
   };
-  Handle<Object> fastBuffer = bufferConstructor->NewInstance(3, consArgs);
-  return NanEscapeScope(fastBuffer);
+  Local<Object> fastBuffer = bufferConstructor->NewInstance(3, consArgs);
+  return scope.Escape(fastBuffer);
 }
 }  // namespace node
 }  // namespace grpc
diff --git a/src/node/ext/byte_buffer.h b/src/node/ext/byte_buffer.h
index 5083674d394a35dcace146d4fbc51737e16a7672..55bc0ab3771e989b96f0f8b9e20bc2c4d3cb1836 100644
--- a/src/node/ext/byte_buffer.h
+++ b/src/node/ext/byte_buffer.h
@@ -45,14 +45,14 @@ namespace node {
 
 /* Convert a Node.js Buffer to grpc_byte_buffer. Requires that
    ::node::Buffer::HasInstance(buffer) */
-grpc_byte_buffer *BufferToByteBuffer(v8::Handle<v8::Value> buffer);
+grpc_byte_buffer *BufferToByteBuffer(v8::Local<v8::Value> buffer);
 
 /* Convert a grpc_byte_buffer to a Node.js Buffer */
-v8::Handle<v8::Value> ByteBufferToBuffer(grpc_byte_buffer *buffer);
+v8::Local<v8::Value> ByteBufferToBuffer(grpc_byte_buffer *buffer);
 
 /* Convert a ::node::Buffer to a fast Buffer, as defined in the Node
    Buffer documentation */
-v8::Handle<v8::Value> MakeFastBuffer(v8::Handle<v8::Value> slowBuffer);
+v8::Local<v8::Value> MakeFastBuffer(v8::Local<v8::Value> slowBuffer);
 
 }  // namespace node
 }  // namespace grpc
diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc
index 560869e6fa420389f1453e22b1c509350a8f6190..b08a9f96d8120624b6f9df4197f99a58420af045 100644
--- a/src/node/ext/call.cc
+++ b/src/node/ext/call.cc
@@ -54,52 +54,61 @@ using std::vector;
 namespace grpc {
 namespace node {
 
+using Nan::Callback;
+using Nan::EscapableHandleScope;
+using Nan::HandleScope;
+using Nan::Maybe;
+using Nan::MaybeLocal;
+using Nan::ObjectWrap;
+using Nan::Persistent;
+using Nan::Utf8String;
+
 using v8::Array;
 using v8::Boolean;
 using v8::Exception;
 using v8::External;
 using v8::Function;
 using v8::FunctionTemplate;
-using v8::Handle;
-using v8::HandleScope;
 using v8::Integer;
 using v8::Local;
 using v8::Number;
 using v8::Object;
 using v8::ObjectTemplate;
-using v8::Persistent;
 using v8::Uint32;
 using v8::String;
 using v8::Value;
 
-NanCallback *Call::constructor;
+Callback *Call::constructor;
 Persistent<FunctionTemplate> Call::fun_tpl;
 
 bool EndsWith(const char *str, const char *substr) {
   return strcmp(str+strlen(str)-strlen(substr), substr) == 0;
 }
 
-bool CreateMetadataArray(Handle<Object> metadata, grpc_metadata_array *array,
+bool CreateMetadataArray(Local<Object> metadata, grpc_metadata_array *array,
                          shared_ptr<Resources> resources) {
-  NanScope();
+  HandleScope scope;
   grpc_metadata_array_init(array);
-  Handle<Array> keys(metadata->GetOwnPropertyNames());
+  Local<Array> keys = Nan::GetOwnPropertyNames(metadata).ToLocalChecked();
   for (unsigned int i = 0; i < keys->Length(); i++) {
-    Handle<String> current_key(keys->Get(i)->ToString());
-    if (!metadata->Get(current_key)->IsArray()) {
+    Local<String> current_key = Nan::To<String>(
+        Nan::Get(keys, i).ToLocalChecked()).ToLocalChecked();
+    Local<Value> value_array = Nan::Get(metadata, current_key).ToLocalChecked();
+    if (!value_array->IsArray()) {
       return false;
     }
-    array->capacity += Local<Array>::Cast(metadata->Get(current_key))->Length();
+    array->capacity += Local<Array>::Cast(value_array)->Length();
   }
   array->metadata = reinterpret_cast<grpc_metadata*>(
       gpr_malloc(array->capacity * sizeof(grpc_metadata)));
   for (unsigned int i = 0; i < keys->Length(); i++) {
-    Handle<String> current_key(keys->Get(i)->ToString());
-    NanUtf8String *utf8_key = new NanUtf8String(current_key);
-    resources->strings.push_back(unique_ptr<NanUtf8String>(utf8_key));
-    Handle<Array> values = Local<Array>::Cast(metadata->Get(current_key));
+    Local<String> current_key(keys->Get(i)->ToString());
+    Utf8String *utf8_key = new Utf8String(current_key);
+    resources->strings.push_back(unique_ptr<Utf8String>(utf8_key));
+    Local<Array> values = Local<Array>::Cast(
+        Nan::Get(metadata, current_key).ToLocalChecked());
     for (unsigned int j = 0; j < values->Length(); j++) {
-      Handle<Value> value = values->Get(j);
+      Local<Value> value = Nan::Get(values, j).ToLocalChecked();
       grpc_metadata *current = &array->metadata[array->count];
       current->key = **utf8_key;
       // Only allow binary headers for "-bin" keys
@@ -107,18 +116,16 @@ bool CreateMetadataArray(Handle<Object> metadata, grpc_metadata_array *array,
         if (::node::Buffer::HasInstance(value)) {
           current->value = ::node::Buffer::Data(value);
           current->value_length = ::node::Buffer::Length(value);
-          Persistent<Value> *handle = new Persistent<Value>();
-          NanAssignPersistent(*handle, value);
-          resources->handles.push_back(unique_ptr<PersistentHolder>(
-              new PersistentHolder(handle)));
+          PersistentValue *handle = new PersistentValue(value);
+          resources->handles.push_back(unique_ptr<PersistentValue>(handle));
         } else {
           return false;
         }
       } else {
         if (value->IsString()) {
-          Handle<String> string_value = value->ToString();
-          NanUtf8String *utf8_value = new NanUtf8String(string_value);
-          resources->strings.push_back(unique_ptr<NanUtf8String>(utf8_value));
+          Local<String> string_value = Nan::To<String>(value).ToLocalChecked();
+          Utf8String *utf8_value = new Utf8String(string_value);
+          resources->strings.push_back(unique_ptr<Utf8String>(utf8_value));
           current->value = **utf8_value;
           current->value_length = string_value->Length();
         } else {
@@ -131,8 +138,8 @@ bool CreateMetadataArray(Handle<Object> metadata, grpc_metadata_array *array,
   return true;
 }
 
-Handle<Value> ParseMetadata(const grpc_metadata_array *metadata_array) {
-  NanEscapableScope();
+Local<Value> ParseMetadata(const grpc_metadata_array *metadata_array) {
+  EscapableHandleScope scope;
   grpc_metadata *metadata_elements = metadata_array->metadata;
   size_t length = metadata_array->count;
   std::map<const char*, size_t> size_map;
@@ -142,49 +149,62 @@ Handle<Value> ParseMetadata(const grpc_metadata_array *metadata_array) {
     const char *key = metadata_elements[i].key;
     if (size_map.count(key)) {
       size_map[key] += 1;
+    } else {
+      size_map[key] = 1;
     }
     index_map[key] = 0;
   }
-  Handle<Object> metadata_object = NanNew<Object>();
+  Local<Object> metadata_object = Nan::New<Object>();
   for (unsigned int i = 0; i < length; i++) {
     grpc_metadata* elem = &metadata_elements[i];
-    Handle<String> key_string = NanNew(elem->key);
-    Handle<Array> array;
-    if (metadata_object->Has(key_string)) {
-      array = Handle<Array>::Cast(metadata_object->Get(key_string));
+    Local<String> key_string = Nan::New(elem->key).ToLocalChecked();
+    Local<Array> array;
+    MaybeLocal<Value> maybe_array = Nan::Get(metadata_object, key_string);
+    if (maybe_array.IsEmpty() || !maybe_array.ToLocalChecked()->IsArray()) {
+      array = Nan::New<Array>(size_map[elem->key]);
+      Nan::Set(metadata_object, key_string, array);
     } else {
-      array = NanNew<Array>(size_map[elem->key]);
-      metadata_object->Set(key_string, array);
+      array = Local<Array>::Cast(maybe_array.ToLocalChecked());
     }
     if (EndsWith(elem->key, "-bin")) {
-      array->Set(index_map[elem->key],
-                 NanNewBufferHandle(elem->value, elem->value_length));
+      Nan::Set(array, index_map[elem->key],
+               Nan::CopyBuffer(elem->value,
+                               elem->value_length).ToLocalChecked());
     } else {
-      array->Set(index_map[elem->key], NanNew(elem->value));
+      Nan::Set(array, index_map[elem->key],
+               Nan::New(elem->value).ToLocalChecked());
     }
     index_map[elem->key] += 1;
   }
-  return NanEscapeScope(metadata_object);
+  return scope.Escape(metadata_object);
 }
 
-Handle<Value> Op::GetOpType() const {
-  NanEscapableScope();
-  return NanEscapeScope(NanNew<String>(GetTypeString()));
+Local<Value> Op::GetOpType() const {
+  EscapableHandleScope scope;
+  return scope.Escape(Nan::New(GetTypeString()).ToLocalChecked());
+}
+
+Op::~Op() {
 }
 
 class SendMetadataOp : public Op {
  public:
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(NanTrue());
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(Nan::True());
   }
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     if (!value->IsObject()) {
       return false;
     }
     grpc_metadata_array array;
-    if (!CreateMetadataArray(value->ToObject(), &array, resources)) {
+    MaybeLocal<Object> maybe_metadata = Nan::To<Object>(value);
+    if (maybe_metadata.IsEmpty()) {
+      return false;
+    }
+    if (!CreateMetadataArray(maybe_metadata.ToLocalChecked(),
+                             &array, resources)) {
       return false;
     }
     out->data.send_initial_metadata.count = array.count;
@@ -199,27 +219,28 @@ class SendMetadataOp : public Op {
 
 class SendMessageOp : public Op {
  public:
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(NanTrue());
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(Nan::True());
   }
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     if (!::node::Buffer::HasInstance(value)) {
       return false;
     }
-    Handle<Object> object_value = value->ToObject();
-    if (object_value->HasOwnProperty(NanNew("grpcWriteFlags"))) {
-      Handle<Value> flag_value = object_value->Get(NanNew("grpcWriteFlags"));
+    Local<Object> object_value = Nan::To<Object>(value).ToLocalChecked();
+    MaybeLocal<Value> maybe_flag_value = Nan::Get(
+        object_value, Nan::New("grpcWriteFlags").ToLocalChecked());
+    if (!maybe_flag_value.IsEmpty()) {
+      Local<Value> flag_value = maybe_flag_value.ToLocalChecked();
       if (flag_value->IsUint32()) {
-        out->flags = flag_value->Uint32Value() & GRPC_WRITE_USED_MASK;
+        Maybe<uint32_t> maybe_flag = Nan::To<uint32_t>(flag_value);
+        out->flags = maybe_flag.FromMaybe(0) & GRPC_WRITE_USED_MASK;
       }
     }
     out->data.send_message = BufferToByteBuffer(value);
-    Persistent<Value> *handle = new Persistent<Value>();
-    NanAssignPersistent(*handle, value);
-    resources->handles.push_back(unique_ptr<PersistentHolder>(
-        new PersistentHolder(handle)));
+    PersistentValue *handle = new PersistentValue(value);
+    resources->handles.push_back(unique_ptr<PersistentValue>(handle));
     return true;
   }
  protected:
@@ -230,11 +251,11 @@ class SendMessageOp : public Op {
 
 class SendClientCloseOp : public Op {
  public:
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(NanTrue());
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(Nan::True());
   }
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     return true;
   }
@@ -246,39 +267,55 @@ class SendClientCloseOp : public Op {
 
 class SendServerStatusOp : public Op {
  public:
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(NanTrue());
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(Nan::True());
   }
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     if (!value->IsObject()) {
       return false;
     }
-    Handle<Object> server_status = value->ToObject();
-    if (!server_status->Get(NanNew("metadata"))->IsObject()) {
+    Local<Object> server_status = Nan::To<Object>(value).ToLocalChecked();
+    MaybeLocal<Value> maybe_metadata = Nan::Get(
+        server_status, Nan::New("metadata").ToLocalChecked());
+    if (maybe_metadata.IsEmpty()) {
       return false;
     }
-    if (!server_status->Get(NanNew("code"))->IsUint32()) {
+    if (!maybe_metadata.ToLocalChecked()->IsObject()) {
       return false;
     }
-    if (!server_status->Get(NanNew("details"))->IsString()) {
+    Local<Object> metadata = Nan::To<Object>(
+        maybe_metadata.ToLocalChecked()).ToLocalChecked();
+    MaybeLocal<Value> maybe_code = Nan::Get(server_status,
+                                            Nan::New("code").ToLocalChecked());
+    if (maybe_code.IsEmpty()) {
       return false;
     }
+    if (!maybe_code.ToLocalChecked()->IsUint32()) {
+      return false;
+    }
+    uint32_t code = Nan::To<uint32_t>(maybe_code.ToLocalChecked()).FromJust();
+    MaybeLocal<Value> maybe_details = Nan::Get(
+        server_status, Nan::New("details").ToLocalChecked());
+    if (maybe_details.IsEmpty()) {
+      return false;
+    }
+    if (!maybe_details.ToLocalChecked()->IsString()) {
+      return false;
+    }
+    Local<String> details = Nan::To<String>(
+        maybe_details.ToLocalChecked()).ToLocalChecked();
     grpc_metadata_array array;
-    if (!CreateMetadataArray(server_status->Get(NanNew("metadata"))->
-                             ToObject(),
-                             &array, resources)) {
+    if (!CreateMetadataArray(metadata, &array, resources)) {
       return false;
     }
     out->data.send_status_from_server.trailing_metadata_count = array.count;
     out->data.send_status_from_server.trailing_metadata = array.metadata;
     out->data.send_status_from_server.status =
-        static_cast<grpc_status_code>(
-            server_status->Get(NanNew("code"))->Uint32Value());
-    NanUtf8String *str = new NanUtf8String(
-        server_status->Get(NanNew("details")));
-    resources->strings.push_back(unique_ptr<NanUtf8String>(str));
+        static_cast<grpc_status_code>(code);
+    Utf8String *str = new Utf8String(details);
+    resources->strings.push_back(unique_ptr<Utf8String>(str));
     out->data.send_status_from_server.status_details = **str;
     return true;
   }
@@ -298,12 +335,12 @@ class GetMetadataOp : public Op {
     grpc_metadata_array_destroy(&recv_metadata);
   }
 
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(ParseMetadata(&recv_metadata));
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(ParseMetadata(&recv_metadata));
   }
 
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     out->data.recv_initial_metadata = &recv_metadata;
     return true;
@@ -325,15 +362,15 @@ class ReadMessageOp : public Op {
   }
   ~ReadMessageOp() {
     if (recv_message != NULL) {
-      gpr_free(recv_message);
+      grpc_byte_buffer_destroy(recv_message);
     }
   }
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(ByteBufferToBuffer(recv_message));
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(ByteBufferToBuffer(recv_message));
   }
 
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     out->data.recv_message = &recv_message;
     return true;
@@ -361,7 +398,7 @@ class ClientStatusOp : public Op {
     gpr_free(status_details);
   }
 
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     out->data.recv_status_on_client.trailing_metadata = &metadata_array;
     out->data.recv_status_on_client.status = &status;
@@ -370,15 +407,18 @@ class ClientStatusOp : public Op {
     return true;
   }
 
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    Handle<Object> status_obj = NanNew<Object>();
-    status_obj->Set(NanNew("code"), NanNew<Number>(status));
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    Local<Object> status_obj = Nan::New<Object>();
+    Nan::Set(status_obj, Nan::New("code").ToLocalChecked(),
+                    Nan::New<Number>(status));
     if (status_details != NULL) {
-      status_obj->Set(NanNew("details"), NanNew(status_details));
+      Nan::Set(status_obj, Nan::New("details").ToLocalChecked(),
+               Nan::New(status_details).ToLocalChecked());
     }
-    status_obj->Set(NanNew("metadata"), ParseMetadata(&metadata_array));
-    return NanEscapeScope(status_obj);
+    Nan::Set(status_obj, Nan::New("metadata").ToLocalChecked(),
+             ParseMetadata(&metadata_array));
+    return scope.Escape(status_obj);
   }
  protected:
   std::string GetTypeString() const {
@@ -393,12 +433,12 @@ class ClientStatusOp : public Op {
 
 class ServerCloseResponseOp : public Op {
  public:
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
-    return NanEscapeScope(NanNew<Boolean>(cancelled));
+  Local<Value> GetNodeValue() const {
+    EscapableHandleScope scope;
+    return scope.Escape(Nan::New<Boolean>(cancelled));
   }
 
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     out->data.recv_close_on_server.cancelled = &cancelled;
     return true;
@@ -413,7 +453,7 @@ class ServerCloseResponseOp : public Op {
   int cancelled;
 };
 
-tag::tag(NanCallback *callback, OpVec *ops,
+tag::tag(Callback *callback, OpVec *ops,
          shared_ptr<Resources> resources) :
     callback(callback), ops(ops), resources(resources){
 }
@@ -423,19 +463,19 @@ tag::~tag() {
   delete ops;
 }
 
-Handle<Value> GetTagNodeValue(void *tag) {
-  NanEscapableScope();
+Local<Value> GetTagNodeValue(void *tag) {
+  EscapableHandleScope scope;
   struct tag *tag_struct = reinterpret_cast<struct tag *>(tag);
-  Handle<Object> tag_obj = NanNew<Object>();
+  Local<Object> tag_obj = Nan::New<Object>();
   for (vector<unique_ptr<Op> >::iterator it = tag_struct->ops->begin();
        it != tag_struct->ops->end(); ++it) {
     Op *op_ptr = it->get();
-    tag_obj->Set(op_ptr->GetOpType(), op_ptr->GetNodeValue());
+    Nan::Set(tag_obj, op_ptr->GetOpType(), op_ptr->GetNodeValue());
   }
-  return NanEscapeScope(tag_obj);
+  return scope.Escape(tag_obj);
 }
 
-NanCallback *GetTagCallback(void *tag) {
+Callback *GetTagCallback(void *tag) {
   struct tag *tag_struct = reinterpret_cast<struct tag *>(tag);
   return tag_struct->callback;
 }
@@ -452,140 +492,149 @@ Call::~Call() {
   grpc_call_destroy(wrapped_call);
 }
 
-void Call::Init(Handle<Object> exports) {
-  NanScope();
-  Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
-  tpl->SetClassName(NanNew("Call"));
+void Call::Init(Local<Object> exports) {
+  HandleScope scope;
+  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+  tpl->SetClassName(Nan::New("Call").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
-  NanSetPrototypeTemplate(tpl, "startBatch",
-                          NanNew<FunctionTemplate>(StartBatch)->GetFunction());
-  NanSetPrototypeTemplate(tpl, "cancel",
-                          NanNew<FunctionTemplate>(Cancel)->GetFunction());
-  NanSetPrototypeTemplate(
-      tpl, "cancelWithStatus",
-      NanNew<FunctionTemplate>(CancelWithStatus)->GetFunction());
-  NanSetPrototypeTemplate(tpl, "getPeer",
-                          NanNew<FunctionTemplate>(GetPeer)->GetFunction());
-  NanAssignPersistent(fun_tpl, tpl);
-  Handle<Function> ctr = tpl->GetFunction();
-  exports->Set(NanNew("Call"), ctr);
-  constructor = new NanCallback(ctr);
+  Nan::SetPrototypeMethod(tpl, "startBatch", StartBatch);
+  Nan::SetPrototypeMethod(tpl, "cancel", Cancel);
+  Nan::SetPrototypeMethod(tpl, "cancelWithStatus", CancelWithStatus);
+  Nan::SetPrototypeMethod(tpl, "getPeer", GetPeer);
+  fun_tpl.Reset(tpl);
+  Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked();
+  Nan::Set(exports, Nan::New("Call").ToLocalChecked(), ctr);
+  constructor = new Callback(ctr);
 }
 
-bool Call::HasInstance(Handle<Value> val) {
-  NanScope();
-  return NanHasInstance(fun_tpl, val);
+bool Call::HasInstance(Local<Value> val) {
+  HandleScope scope;
+  return Nan::New(fun_tpl)->HasInstance(val);
 }
 
-Handle<Value> Call::WrapStruct(grpc_call *call) {
-  NanEscapableScope();
+Local<Value> Call::WrapStruct(grpc_call *call) {
+  EscapableHandleScope scope;
   if (call == NULL) {
-    return NanEscapeScope(NanNull());
+    return scope.Escape(Nan::Null());
   }
   const int argc = 1;
-  Handle<Value> argv[argc] = {NanNew<External>(reinterpret_cast<void *>(call))};
-  return NanEscapeScope(constructor->GetFunction()->NewInstance(argc, argv));
+  Local<Value> argv[argc] = {Nan::New<External>(
+      reinterpret_cast<void *>(call))};
+  MaybeLocal<Object> maybe_instance = Nan::NewInstance(
+      constructor->GetFunction(), argc, argv);
+  if (maybe_instance.IsEmpty()) {
+    return scope.Escape(Nan::Null());
+  } else {
+    return scope.Escape(maybe_instance.ToLocalChecked());
+  }
 }
 
 NAN_METHOD(Call::New) {
-  NanScope();
-
-  if (args.IsConstructCall()) {
+  if (info.IsConstructCall()) {
     Call *call;
-    if (args[0]->IsExternal()) {
-      Handle<External> ext = args[0].As<External>();
+    if (info[0]->IsExternal()) {
+      Local<External> ext = info[0].As<External>();
       // This option is used for wrapping an existing call
       grpc_call *call_value =
           reinterpret_cast<grpc_call *>(ext->Value());
       call = new Call(call_value);
     } else {
-      if (!Channel::HasInstance(args[0])) {
-        return NanThrowTypeError("Call's first argument must be a Channel");
+      if (!Channel::HasInstance(info[0])) {
+        return Nan::ThrowTypeError("Call's first argument must be a Channel");
       }
-      if (!args[1]->IsString()) {
-        return NanThrowTypeError("Call's second argument must be a string");
+      if (!info[1]->IsString()) {
+        return Nan::ThrowTypeError("Call's second argument must be a string");
       }
-      if (!(args[2]->IsNumber() || args[2]->IsDate())) {
-        return NanThrowTypeError(
+      if (!(info[2]->IsNumber() || info[2]->IsDate())) {
+        return Nan::ThrowTypeError(
             "Call's third argument must be a date or a number");
       }
       // These arguments are at the end because they are optional
       grpc_call *parent_call = NULL;
-      if (Call::HasInstance(args[4])) {
-        Call *parent_obj = ObjectWrap::Unwrap<Call>(args[4]->ToObject());
+      if (Call::HasInstance(info[4])) {
+        Call *parent_obj = ObjectWrap::Unwrap<Call>(
+            Nan::To<Object>(info[4]).ToLocalChecked());
         parent_call = parent_obj->wrapped_call;
-      } else if (!(args[4]->IsUndefined() || args[4]->IsNull())) {
-        return NanThrowTypeError(
+      } else if (!(info[4]->IsUndefined() || info[4]->IsNull())) {
+        return Nan::ThrowTypeError(
             "Call's fifth argument must be another call, if provided");
       }
       gpr_uint32 propagate_flags = GRPC_PROPAGATE_DEFAULTS;
-      if (args[5]->IsUint32()) {
-        propagate_flags = args[5]->Uint32Value();
-      } else if (!(args[5]->IsUndefined() || args[5]->IsNull())) {
-        return NanThrowTypeError(
+      if (info[5]->IsUint32()) {
+        propagate_flags = Nan::To<uint32_t>(info[5]).FromJust();
+      } else if (!(info[5]->IsUndefined() || info[5]->IsNull())) {
+        return Nan::ThrowTypeError(
             "Call's sixth argument must be propagate flags, if provided");
       }
-      Handle<Object> channel_object = args[0]->ToObject();
+      Local<Object> channel_object = Nan::To<Object>(info[0]).ToLocalChecked();
       Channel *channel = ObjectWrap::Unwrap<Channel>(channel_object);
       if (channel->GetWrappedChannel() == NULL) {
-        return NanThrowError("Call cannot be created from a closed channel");
+        return Nan::ThrowError("Call cannot be created from a closed channel");
       }
-      NanUtf8String method(args[1]);
-      double deadline = args[2]->NumberValue();
+      Utf8String method(info[1]);
+      double deadline = Nan::To<double>(info[2]).FromJust();
       grpc_channel *wrapped_channel = channel->GetWrappedChannel();
       grpc_call *wrapped_call;
-      if (args[3]->IsString()) {
-        NanUtf8String host_override(args[3]);
+      if (info[3]->IsString()) {
+        Utf8String host_override(info[3]);
         wrapped_call = grpc_channel_create_call(
             wrapped_channel, parent_call, propagate_flags,
             CompletionQueueAsyncWorker::GetQueue(), *method,
             *host_override, MillisecondsToTimespec(deadline), NULL);
-      } else if (args[3]->IsUndefined() || args[3]->IsNull()) {
+      } else if (info[3]->IsUndefined() || info[3]->IsNull()) {
         wrapped_call = grpc_channel_create_call(
             wrapped_channel, parent_call, propagate_flags,
             CompletionQueueAsyncWorker::GetQueue(), *method,
             NULL, MillisecondsToTimespec(deadline), NULL);
       } else {
-        return NanThrowTypeError("Call's fourth argument must be a string");
+        return Nan::ThrowTypeError("Call's fourth argument must be a string");
       }
       call = new Call(wrapped_call);
-      args.This()->SetHiddenValue(NanNew("channel_"), channel_object);
+      info.This()->SetHiddenValue(Nan::New("channel_").ToLocalChecked(),
+                                  channel_object);
     }
-    call->Wrap(args.This());
-    NanReturnValue(args.This());
+    call->Wrap(info.This());
+    info.GetReturnValue().Set(info.This());
   } else {
     const int argc = 4;
-    Local<Value> argv[argc] = {args[0], args[1], args[2], args[3]};
-    NanReturnValue(constructor->GetFunction()->NewInstance(argc, argv));
+    Local<Value> argv[argc] = {info[0], info[1], info[2], info[3]};
+    MaybeLocal<Object> maybe_instance = constructor->GetFunction()->NewInstance(
+        argc, argv);
+    if (maybe_instance.IsEmpty()) {
+      // There's probably a pending exception
+      return;
+    } else {
+      info.GetReturnValue().Set(maybe_instance.ToLocalChecked());
+    }
   }
 }
 
 NAN_METHOD(Call::StartBatch) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("startBatch can only be called on Call objects");
+  if (!Call::HasInstance(info.This())) {
+    return Nan::ThrowTypeError("startBatch can only be called on Call objects");
   }
-  if (!args[0]->IsObject()) {
-    return NanThrowError("startBatch's first argument must be an object");
+  if (!info[0]->IsObject()) {
+    return Nan::ThrowError("startBatch's first argument must be an object");
   }
-  if (!args[1]->IsFunction()) {
-    return NanThrowError("startBatch's second argument must be a callback");
+  if (!info[1]->IsFunction()) {
+    return Nan::ThrowError("startBatch's second argument must be a callback");
   }
-  Handle<Function> callback_func = args[1].As<Function>();
-  Call *call = ObjectWrap::Unwrap<Call>(args.This());
+  Local<Function> callback_func = info[1].As<Function>();
+  Call *call = ObjectWrap::Unwrap<Call>(info.This());
   shared_ptr<Resources> resources(new Resources);
-  Handle<Object> obj = args[0]->ToObject();
-  Handle<Array> keys = obj->GetOwnPropertyNames();
+  Local<Object> obj = Nan::To<Object>(info[0]).ToLocalChecked();
+  Local<Array> keys = Nan::GetOwnPropertyNames(obj).ToLocalChecked();
   size_t nops = keys->Length();
   vector<grpc_op> ops(nops);
   unique_ptr<OpVec> op_vector(new OpVec());
   for (unsigned int i = 0; i < nops; i++) {
     unique_ptr<Op> op;
-    if (!keys->Get(i)->IsUint32()) {
-      return NanThrowError(
+    MaybeLocal<Value> maybe_key = Nan::Get(keys, i);
+    if (maybe_key.IsEmpty() || (!maybe_key.ToLocalChecked()->IsUint32())) {
+      return Nan::ThrowError(
           "startBatch's first argument's keys must be integers");
     }
-    uint32_t type = keys->Get(i)->Uint32Value();
+    uint32_t type = Nan::To<uint32_t>(maybe_key.ToLocalChecked()).FromJust();
     ops[i].op = static_cast<grpc_op_type>(type);
     ops[i].flags = 0;
     ops[i].reserved = NULL;
@@ -615,67 +664,64 @@ NAN_METHOD(Call::StartBatch) {
         op.reset(new ServerCloseResponseOp());
         break;
       default:
-        return NanThrowError("Argument object had an unrecognized key");
+        return Nan::ThrowError("Argument object had an unrecognized key");
     }
     if (!op->ParseOp(obj->Get(type), &ops[i], resources)) {
-      return NanThrowTypeError("Incorrectly typed arguments to startBatch");
+      return Nan::ThrowTypeError("Incorrectly typed arguments to startBatch");
     }
     op_vector->push_back(std::move(op));
   }
-  NanCallback *callback = new NanCallback(callback_func);
+  Callback *callback = new Callback(callback_func);
   grpc_call_error error = grpc_call_start_batch(
       call->wrapped_call, &ops[0], nops, new struct tag(
           callback, op_vector.release(), resources), NULL);
   if (error != GRPC_CALL_OK) {
-    return NanThrowError(nanErrorWithCode("startBatch failed", error));
+    return Nan::ThrowError(nanErrorWithCode("startBatch failed", error));
   }
   CompletionQueueAsyncWorker::Next();
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Call::Cancel) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("cancel can only be called on Call objects");
+  if (!Call::HasInstance(info.This())) {
+    return Nan::ThrowTypeError("cancel can only be called on Call objects");
   }
-  Call *call = ObjectWrap::Unwrap<Call>(args.This());
+  Call *call = ObjectWrap::Unwrap<Call>(info.This());
   grpc_call_error error = grpc_call_cancel(call->wrapped_call, NULL);
   if (error != GRPC_CALL_OK) {
-    return NanThrowError(nanErrorWithCode("cancel failed", error));
+    return Nan::ThrowError(nanErrorWithCode("cancel failed", error));
   }
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Call::CancelWithStatus) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("cancel can only be called on Call objects");
+  Nan::HandleScope scope;
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("cancel can only be called on Call objects");
   }
-  if (!args[0]->IsUint32()) {
-    return NanThrowTypeError(
+  if (!info[0]->IsUint32()) {
+    return Nan::ThrowTypeError(
         "cancelWithStatus's first argument must be a status code");
   }
-  if (!args[1]->IsString()) {
-    return NanThrowTypeError(
+  if (!info[1]->IsString()) {
+    return Nan::ThrowTypeError(
         "cancelWithStatus's second argument must be a string");
   }
-  Call *call = ObjectWrap::Unwrap<Call>(args.This());
-  grpc_status_code code = static_cast<grpc_status_code>(args[0]->Uint32Value());
-  NanUtf8String details(args[0]);
+  Call *call = ObjectWrap::Unwrap<Call>(info.This());
+  grpc_status_code code = static_cast<grpc_status_code>(
+      Nan::To<uint32_t>(info[0]).FromJust());
+  Utf8String details(info[0]);
   grpc_call_cancel_with_status(call->wrapped_call, code, *details, NULL);
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Call::GetPeer) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("getPeer can only be called on Call objects");
+  Nan::HandleScope scope;
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("getPeer can only be called on Call objects");
   }
-  Call *call = ObjectWrap::Unwrap<Call>(args.This());
+  Call *call = ObjectWrap::Unwrap<Call>(info.This());
   char *peer = grpc_call_get_peer(call->wrapped_call);
-  Handle<Value> peer_value = NanNew(peer);
+  Local<Value> peer_value = Nan::New(peer).ToLocalChecked();
   gpr_free(peer);
-  NanReturnValue(peer_value);
+  info.GetReturnValue().Set(peer_value);
 }
 
 }  // namespace node
diff --git a/src/node/ext/call.h b/src/node/ext/call.h
index 89f81dcf4dc3660aadcd4e6bff5836fd6ca49005..2f8e1f17aae95e0cf124c482aace6ff275445a9c 100644
--- a/src/node/ext/call.h
+++ b/src/node/ext/call.h
@@ -51,6 +51,8 @@ namespace node {
 using std::unique_ptr;
 using std::shared_ptr;
 
+typedef Nan::Persistent<v8::Value, Nan::CopyablePersistentTraits<v8::Value>> PersistentValue;
+
 /**
  * Helper function for throwing errors with a grpc_call_error value.
  * Modified from the answer by Gus Goose to
@@ -58,69 +60,54 @@ using std::shared_ptr;
  */
 inline v8::Local<v8::Value> nanErrorWithCode(const char *msg,
                                              grpc_call_error code) {
-    NanEscapableScope();
-    v8::Local<v8::Object> err = NanError(msg).As<v8::Object>();
-    err->Set(NanNew("code"), NanNew<v8::Uint32>(code));
-    return NanEscapeScope(err);
+  Nan::EscapableHandleScope scope;
+    v8::Local<v8::Object> err = Nan::Error(msg).As<v8::Object>();
+    Nan::Set(err, Nan::New("code").ToLocalChecked(), Nan::New<v8::Uint32>(code));
+    return scope.Escape(err);
 }
 
-v8::Handle<v8::Value> ParseMetadata(const grpc_metadata_array *metadata_array);
-
-class PersistentHolder {
- public:
-  explicit PersistentHolder(v8::Persistent<v8::Value> *persist) :
-      persist(persist) {
-  }
-
-  ~PersistentHolder() {
-    NanDisposePersistent(*persist);
-    delete persist;
-  }
-
- private:
-  v8::Persistent<v8::Value> *persist;
-};
+v8::Local<v8::Value> ParseMetadata(const grpc_metadata_array *metadata_array);
 
 struct Resources {
-  std::vector<unique_ptr<NanUtf8String> > strings;
-  std::vector<unique_ptr<PersistentHolder> > handles;
+  std::vector<unique_ptr<Nan::Utf8String> > strings;
+  std::vector<unique_ptr<PersistentValue> > handles;
 };
 
 class Op {
  public:
-  virtual v8::Handle<v8::Value> GetNodeValue() const = 0;
-  virtual bool ParseOp(v8::Handle<v8::Value> value, grpc_op *out,
+  virtual v8::Local<v8::Value> GetNodeValue() const = 0;
+  virtual bool ParseOp(v8::Local<v8::Value> value, grpc_op *out,
                        shared_ptr<Resources> resources) = 0;
-  v8::Handle<v8::Value> GetOpType() const;
+  virtual ~Op();
+  v8::Local<v8::Value> GetOpType() const;
 
  protected:
   virtual std::string GetTypeString() const = 0;
 };
 
 typedef std::vector<unique_ptr<Op>> OpVec;
-
 struct tag {
-  tag(NanCallback *callback, OpVec *ops,
+  tag(Nan::Callback *callback, OpVec *ops,
       shared_ptr<Resources> resources);
   ~tag();
-  NanCallback *callback;
+  Nan::Callback *callback;
   OpVec *ops;
   shared_ptr<Resources> resources;
 };
 
-v8::Handle<v8::Value> GetTagNodeValue(void *tag);
+v8::Local<v8::Value> GetTagNodeValue(void *tag);
 
-NanCallback *GetTagCallback(void *tag);
+Nan::Callback *GetTagCallback(void *tag);
 
 void DestroyTag(void *tag);
 
 /* Wrapper class for grpc_call structs. */
-class Call : public ::node::ObjectWrap {
+class Call : public Nan::ObjectWrap {
  public:
-  static void Init(v8::Handle<v8::Object> exports);
-  static bool HasInstance(v8::Handle<v8::Value> val);
+  static void Init(v8::Local<v8::Object> exports);
+  static bool HasInstance(v8::Local<v8::Value> val);
   /* Wrap a grpc_call struct in a javascript object */
-  static v8::Handle<v8::Value> WrapStruct(grpc_call *call);
+  static v8::Local<v8::Value> WrapStruct(grpc_call *call);
 
  private:
   explicit Call(grpc_call *call);
@@ -135,9 +122,9 @@ class Call : public ::node::ObjectWrap {
   static NAN_METHOD(Cancel);
   static NAN_METHOD(CancelWithStatus);
   static NAN_METHOD(GetPeer);
-  static NanCallback *constructor;
+  static Nan::Callback *constructor;
   // Used for typechecking instances of this javascript class
-  static v8::Persistent<v8::FunctionTemplate> fun_tpl;
+  static Nan::Persistent<v8::FunctionTemplate> fun_tpl;
 
   grpc_call *wrapped_call;
 };
diff --git a/src/node/ext/channel.cc b/src/node/ext/channel.cc
index 9aed96bbf5ae430eebc1f76cd34f8f50e623764d..6eb1e77688413d2cca4932e2cae9d8890f7196b0 100644
--- a/src/node/ext/channel.cc
+++ b/src/node/ext/channel.cc
@@ -48,21 +48,27 @@
 namespace grpc {
 namespace node {
 
+using Nan::Callback;
+using Nan::EscapableHandleScope;
+using Nan::HandleScope;
+using Nan::Maybe;
+using Nan::MaybeLocal;
+using Nan::ObjectWrap;
+using Nan::Persistent;
+using Nan::Utf8String;
+
 using v8::Array;
 using v8::Exception;
 using v8::Function;
 using v8::FunctionTemplate;
-using v8::Handle;
-using v8::HandleScope;
 using v8::Integer;
 using v8::Local;
 using v8::Number;
 using v8::Object;
-using v8::Persistent;
 using v8::String;
 using v8::Value;
 
-NanCallback *Channel::constructor;
+Callback *Channel::constructor;
 Persistent<FunctionTemplate> Channel::fun_tpl;
 
 Channel::Channel(grpc_channel *channel) : wrapped_channel(channel) {}
@@ -73,88 +79,89 @@ Channel::~Channel() {
   }
 }
 
-void Channel::Init(Handle<Object> exports) {
-  NanScope();
-  Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
-  tpl->SetClassName(NanNew("Channel"));
+void Channel::Init(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+  tpl->SetClassName(Nan::New("Channel").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
-  NanSetPrototypeTemplate(tpl, "close",
-                          NanNew<FunctionTemplate>(Close)->GetFunction());
-  NanSetPrototypeTemplate(tpl, "getTarget",
-                          NanNew<FunctionTemplate>(GetTarget)->GetFunction());
-  NanSetPrototypeTemplate(
-      tpl, "getConnectivityState",
-      NanNew<FunctionTemplate>(GetConnectivityState)->GetFunction());
-  NanSetPrototypeTemplate(
-      tpl, "watchConnectivityState",
-      NanNew<FunctionTemplate>(WatchConnectivityState)->GetFunction());
-  NanAssignPersistent(fun_tpl, tpl);
-  Handle<Function> ctr = tpl->GetFunction();
-  constructor = new NanCallback(ctr);
-  exports->Set(NanNew("Channel"), ctr);
+  Nan::SetPrototypeMethod(tpl, "close", Close);
+  Nan::SetPrototypeMethod(tpl, "getTarget", GetTarget);
+  Nan::SetPrototypeMethod(tpl, "getConnectivityState", GetConnectivityState);
+  Nan::SetPrototypeMethod(tpl, "watchConnectivityState",
+                          WatchConnectivityState);
+  fun_tpl.Reset(tpl);
+  Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked();
+  Nan::Set(exports, Nan::New("Channel").ToLocalChecked(), ctr);
+  constructor = new Callback(ctr);
 }
 
-bool Channel::HasInstance(Handle<Value> val) {
-  NanScope();
-  return NanHasInstance(fun_tpl, val);
+bool Channel::HasInstance(Local<Value> val) {
+  HandleScope scope;
+  return Nan::New(fun_tpl)->HasInstance(val);
 }
 
 grpc_channel *Channel::GetWrappedChannel() { return this->wrapped_channel; }
 
 NAN_METHOD(Channel::New) {
-  NanScope();
-
-  if (args.IsConstructCall()) {
-    if (!args[0]->IsString()) {
-      return NanThrowTypeError(
+  if (info.IsConstructCall()) {
+    if (!info[0]->IsString()) {
+      return Nan::ThrowTypeError(
           "Channel expects a string, a credential and an object");
     }
     grpc_channel *wrapped_channel;
     // Owned by the Channel object
-    NanUtf8String host(args[0]);
+    Utf8String host(info[0]);
     grpc_credentials *creds;
-    if (!Credentials::HasInstance(args[1])) {
-      return NanThrowTypeError(
+    if (!Credentials::HasInstance(info[1])) {
+      return Nan::ThrowTypeError(
           "Channel's second argument must be a credential");
     }
     Credentials *creds_object = ObjectWrap::Unwrap<Credentials>(
-        args[1]->ToObject());
+        Nan::To<Object>(info[1]).ToLocalChecked());
     creds = creds_object->GetWrappedCredentials();
     grpc_channel_args *channel_args_ptr;
-    if (args[2]->IsUndefined()) {
+    if (info[2]->IsUndefined()) {
       channel_args_ptr = NULL;
       wrapped_channel = grpc_insecure_channel_create(*host, NULL, NULL);
-    } else if (args[2]->IsObject()) {
-      Handle<Object> args_hash(args[2]->ToObject()->Clone());
-      Handle<Array> keys(args_hash->GetOwnPropertyNames());
+    } else if (info[2]->IsObject()) {
+      Local<Object> args_hash = Nan::To<Object>(info[2]).ToLocalChecked();
+      Local<Array> keys(Nan::GetOwnPropertyNames(args_hash).ToLocalChecked());
       grpc_channel_args channel_args;
       channel_args.num_args = keys->Length();
       channel_args.args = reinterpret_cast<grpc_arg *>(
           calloc(channel_args.num_args, sizeof(grpc_arg)));
       /* These are used to keep all strings until then end of the block, then
          destroy them */
-      std::vector<NanUtf8String *> key_strings(keys->Length());
-      std::vector<NanUtf8String *> value_strings(keys->Length());
+      std::vector<Nan::Utf8String *> key_strings(keys->Length());
+      std::vector<Nan::Utf8String *> value_strings(keys->Length());
       for (unsigned int i = 0; i < channel_args.num_args; i++) {
-        Handle<String> current_key(keys->Get(i)->ToString());
-        Handle<Value> current_value(args_hash->Get(current_key));
-        key_strings[i] = new NanUtf8String(current_key);
+        MaybeLocal<String> maybe_key = Nan::To<String>(
+            Nan::Get(keys, i).ToLocalChecked());
+        if (maybe_key.IsEmpty()) {
+          free(channel_args.args);
+          return Nan::ThrowTypeError("Arg keys must be strings");
+        }
+        Local<String> current_key = maybe_key.ToLocalChecked();
+        Local<Value> current_value = Nan::Get(args_hash,
+                                               current_key).ToLocalChecked();
+        key_strings[i] = new Nan::Utf8String(current_key);
         channel_args.args[i].key = **key_strings[i];
         if (current_value->IsInt32()) {
           channel_args.args[i].type = GRPC_ARG_INTEGER;
-          channel_args.args[i].value.integer = current_value->Int32Value();
+          channel_args.args[i].value.integer = Nan::To<int32_t>(
+              current_value).FromJust();
         } else if (current_value->IsString()) {
           channel_args.args[i].type = GRPC_ARG_STRING;
-          value_strings[i] = new NanUtf8String(current_value);
+          value_strings[i] = new Nan::Utf8String(current_value);
           channel_args.args[i].value.string = **value_strings[i];
         } else {
           free(channel_args.args);
-          return NanThrowTypeError("Arg values must be strings");
+          return Nan::ThrowTypeError("Arg values must be strings");
         }
       }
       channel_args_ptr = &channel_args;
     } else {
-      return NanThrowTypeError("Channel expects a string and an object");
+      return Nan::ThrowTypeError("Channel expects a string and an object");
     }
     if (creds == NULL) {
       wrapped_channel = grpc_insecure_channel_create(*host, channel_args_ptr,
@@ -167,73 +174,79 @@ NAN_METHOD(Channel::New) {
       free(channel_args_ptr->args);
     }
     Channel *channel = new Channel(wrapped_channel);
-    channel->Wrap(args.This());
-    NanReturnValue(args.This());
+    channel->Wrap(info.This());
+    info.GetReturnValue().Set(info.This());
+    return;
   } else {
     const int argc = 3;
-    Local<Value> argv[argc] = {args[0], args[1], args[2]};
-    NanReturnValue(constructor->GetFunction()->NewInstance(argc, argv));
+    Local<Value> argv[argc] = {info[0], info[1], info[2]};
+    MaybeLocal<Object> maybe_instance = constructor->GetFunction()->NewInstance(
+        argc, argv);
+    if (maybe_instance.IsEmpty()) {
+      // There's probably a pending exception
+      return;
+    } else {
+      info.GetReturnValue().Set(maybe_instance.ToLocalChecked());
+    }
   }
 }
 
 NAN_METHOD(Channel::Close) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("close can only be called on Channel objects");
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("close can only be called on Channel objects");
   }
-  Channel *channel = ObjectWrap::Unwrap<Channel>(args.This());
+  Channel *channel = ObjectWrap::Unwrap<Channel>(info.This());
   if (channel->wrapped_channel != NULL) {
     grpc_channel_destroy(channel->wrapped_channel);
     channel->wrapped_channel = NULL;
   }
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Channel::GetTarget) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("getTarget can only be called on Channel objects");
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("getTarget can only be called on Channel objects");
   }
-  Channel *channel = ObjectWrap::Unwrap<Channel>(args.This());
-  NanReturnValue(NanNew(grpc_channel_get_target(channel->wrapped_channel)));
+  Channel *channel = ObjectWrap::Unwrap<Channel>(info.This());
+  info.GetReturnValue().Set(Nan::New(
+      grpc_channel_get_target(channel->wrapped_channel)).ToLocalChecked());
 }
 
 NAN_METHOD(Channel::GetConnectivityState) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError(
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError(
         "getConnectivityState can only be called on Channel objects");
   }
-  Channel *channel = ObjectWrap::Unwrap<Channel>(args.This());
-  int try_to_connect = (int)args[0]->Equals(NanTrue());
-  NanReturnValue(grpc_channel_check_connectivity_state(channel->wrapped_channel,
-                                                       try_to_connect));
+  Channel *channel = ObjectWrap::Unwrap<Channel>(info.This());
+  int try_to_connect = (int)info[0]->Equals(Nan::True());
+  info.GetReturnValue().Set(
+      grpc_channel_check_connectivity_state(channel->wrapped_channel,
+                                            try_to_connect));
 }
 
 NAN_METHOD(Channel::WatchConnectivityState) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError(
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError(
         "watchConnectivityState can only be called on Channel objects");
   }
-  if (!args[0]->IsUint32()) {
-    return NanThrowTypeError(
+  if (!info[0]->IsUint32()) {
+    return Nan::ThrowTypeError(
         "watchConnectivityState's first argument must be a channel state");
   }
-  if (!(args[1]->IsNumber() || args[1]->IsDate())) {
-    return NanThrowTypeError(
+  if (!(info[1]->IsNumber() || info[1]->IsDate())) {
+    return Nan::ThrowTypeError(
         "watchConnectivityState's second argument must be a date or a number");
   }
-  if (!args[2]->IsFunction()) {
-    return NanThrowTypeError(
+  if (!info[2]->IsFunction()) {
+    return Nan::ThrowTypeError(
         "watchConnectivityState's third argument must be a callback");
   }
   grpc_connectivity_state last_state =
-      static_cast<grpc_connectivity_state>(args[0]->Uint32Value());
-  double deadline = args[1]->NumberValue();
-  Handle<Function> callback_func = args[2].As<Function>();
-  NanCallback *callback = new NanCallback(callback_func);
-  Channel *channel = ObjectWrap::Unwrap<Channel>(args.This());
+      static_cast<grpc_connectivity_state>(
+          Nan::To<uint32_t>(info[0]).FromJust());
+  double deadline = Nan::To<double>(info[1]).FromJust();
+  Local<Function> callback_func = info[2].As<Function>();
+  Nan::Callback *callback = new Callback(callback_func);
+  Channel *channel = ObjectWrap::Unwrap<Channel>(info.This());
   unique_ptr<OpVec> ops(new OpVec());
   grpc_channel_watch_connectivity_state(
       channel->wrapped_channel, last_state, MillisecondsToTimespec(deadline),
@@ -242,7 +255,6 @@ NAN_METHOD(Channel::WatchConnectivityState) {
                      ops.release(),
                      shared_ptr<Resources>(nullptr)));
   CompletionQueueAsyncWorker::Next();
-  NanReturnUndefined();
 }
 
 }  // namespace node
diff --git a/src/node/ext/channel.h b/src/node/ext/channel.h
index 458f71d09303947a4f5c227943f74cd44f17f5ab..0062fd03f4a6f3081666a3f946331f1f5621eaed 100644
--- a/src/node/ext/channel.h
+++ b/src/node/ext/channel.h
@@ -42,10 +42,10 @@ namespace grpc {
 namespace node {
 
 /* Wrapper class for grpc_channel structs */
-class Channel : public ::node::ObjectWrap {
+class Channel : public Nan::ObjectWrap {
  public:
-  static void Init(v8::Handle<v8::Object> exports);
-  static bool HasInstance(v8::Handle<v8::Value> val);
+  static void Init(v8::Local<v8::Object> exports);
+  static bool HasInstance(v8::Local<v8::Value> val);
   /* This is used to typecheck javascript objects before converting them to
      this type */
   static v8::Persistent<v8::Value> prototype;
@@ -66,8 +66,8 @@ class Channel : public ::node::ObjectWrap {
   static NAN_METHOD(GetTarget);
   static NAN_METHOD(GetConnectivityState);
   static NAN_METHOD(WatchConnectivityState);
-  static NanCallback *constructor;
-  static v8::Persistent<v8::FunctionTemplate> fun_tpl;
+  static Nan::Callback *constructor;
+  static Nan::Persistent<v8::FunctionTemplate> fun_tpl;
 
   grpc_channel *wrapped_channel;
 };
diff --git a/src/node/ext/completion_queue_async_worker.cc b/src/node/ext/completion_queue_async_worker.cc
index bf2cd946a5c89fc96bd73afaa88371e3301cd8b4..3a79f7c45d0190d84110950a2803985a3aa3dd3c 100644
--- a/src/node/ext/completion_queue_async_worker.cc
+++ b/src/node/ext/completion_queue_async_worker.cc
@@ -46,9 +46,8 @@ namespace node {
 const int max_queue_threads = 2;
 
 using v8::Function;
-using v8::Handle;
+using v8::Local;
 using v8::Object;
-using v8::Persistent;
 using v8::Value;
 
 grpc_completion_queue *CompletionQueueAsyncWorker::queue;
@@ -57,7 +56,7 @@ int CompletionQueueAsyncWorker::current_threads;
 int CompletionQueueAsyncWorker::waiting_next_calls;
 
 CompletionQueueAsyncWorker::CompletionQueueAsyncWorker()
-    : NanAsyncWorker(NULL) {}
+    : Nan::AsyncWorker(NULL) {}
 
 CompletionQueueAsyncWorker::~CompletionQueueAsyncWorker() {}
 
@@ -72,42 +71,42 @@ void CompletionQueueAsyncWorker::Execute() {
 grpc_completion_queue *CompletionQueueAsyncWorker::GetQueue() { return queue; }
 
 void CompletionQueueAsyncWorker::Next() {
-  NanScope();
+  Nan::HandleScope scope;
   if (current_threads < max_queue_threads) {
     CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
-    NanAsyncQueueWorker(worker);
+    Nan::AsyncQueueWorker(worker);
   } else {
     waiting_next_calls += 1;
   }
 }
 
-void CompletionQueueAsyncWorker::Init(Handle<Object> exports) {
-  NanScope();
+void CompletionQueueAsyncWorker::Init(Local<Object> exports) {
+  Nan::HandleScope scope;
   current_threads = 0;
   waiting_next_calls = 0;
   queue = grpc_completion_queue_create(NULL);
 }
 
 void CompletionQueueAsyncWorker::HandleOKCallback() {
-  NanScope();
+  Nan::HandleScope scope;
   if (waiting_next_calls > 0) {
     waiting_next_calls -= 1;
     CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
-    NanAsyncQueueWorker(worker);
+    Nan::AsyncQueueWorker(worker);
   } else {
     current_threads -= 1;
   }
-  NanCallback *callback = GetTagCallback(result.tag);
-  Handle<Value> argv[] = {NanNull(), GetTagNodeValue(result.tag)};
+  Nan::Callback *callback = GetTagCallback(result.tag);
+  Local<Value> argv[] = {Nan::Null(), GetTagNodeValue(result.tag)};
   callback->Call(2, argv);
 
   DestroyTag(result.tag);
 }
 
 void CompletionQueueAsyncWorker::HandleErrorCallback() {
-  NanScope();
-  NanCallback *callback = GetTagCallback(result.tag);
-  Handle<Value> argv[] = {NanError(ErrorMessage())};
+  Nan::HandleScope scope;
+  Nan::Callback *callback = GetTagCallback(result.tag);
+  Local<Value> argv[] = {Nan::Error(ErrorMessage())};
 
   callback->Call(1, argv);
 
diff --git a/src/node/ext/completion_queue_async_worker.h b/src/node/ext/completion_queue_async_worker.h
index 27fedf2fce42995c805c18fc47d698be9a56c496..6e541167658aefd4c88c92394c0bafe83a2dfb14 100644
--- a/src/node/ext/completion_queue_async_worker.h
+++ b/src/node/ext/completion_queue_async_worker.h
@@ -42,7 +42,7 @@ namespace node {
 
 /* A worker that asynchronously calls completion_queue_next, and queues onto the
    node event loop a call to the function stored in the event's tag. */
-class CompletionQueueAsyncWorker : public NanAsyncWorker {
+class CompletionQueueAsyncWorker : public Nan::AsyncWorker {
  public:
   CompletionQueueAsyncWorker();
 
@@ -59,7 +59,7 @@ class CompletionQueueAsyncWorker : public NanAsyncWorker {
   static void Next();
 
   /* Initialize the CompletionQueueAsyncWorker class */
-  static void Init(v8::Handle<v8::Object> exports);
+  static void Init(v8::Local<v8::Object> exports);
 
  protected:
   /* Called when Execute has succeeded (completed without setting an error
diff --git a/src/node/ext/credentials.cc b/src/node/ext/credentials.cc
index c3b04dcea753edc986a2e7ed4700fe8fa6d279e2..4f41c92f6a7926ddaf7a39f0c1ae8ef0adb68e7b 100644
--- a/src/node/ext/credentials.cc
+++ b/src/node/ext/credentials.cc
@@ -41,20 +41,26 @@
 namespace grpc {
 namespace node {
 
+using Nan::Callback;
+using Nan::EscapableHandleScope;
+using Nan::HandleScope;
+using Nan::Maybe;
+using Nan::MaybeLocal;
+using Nan::ObjectWrap;
+using Nan::Persistent;
+using Nan::Utf8String;
+
 using v8::Exception;
 using v8::External;
 using v8::Function;
 using v8::FunctionTemplate;
-using v8::Handle;
-using v8::HandleScope;
 using v8::Integer;
 using v8::Local;
 using v8::Object;
 using v8::ObjectTemplate;
-using v8::Persistent;
 using v8::Value;
 
-NanCallback *Credentials::constructor;
+Nan::Callback *Credentials::constructor;
 Persistent<FunctionTemplate> Credentials::fun_tpl;
 
 Credentials::Credentials(grpc_credentials *credentials)
@@ -64,40 +70,52 @@ Credentials::~Credentials() {
   grpc_credentials_release(wrapped_credentials);
 }
 
-void Credentials::Init(Handle<Object> exports) {
-  NanScope();
-  Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
-  tpl->SetClassName(NanNew("Credentials"));
+void Credentials::Init(Local<Object> exports) {
+  HandleScope scope;
+  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+  tpl->SetClassName(Nan::New("Credentials").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
-  NanAssignPersistent(fun_tpl, tpl);
-  Handle<Function> ctr = tpl->GetFunction();
-  ctr->Set(NanNew("createDefault"),
-           NanNew<FunctionTemplate>(CreateDefault)->GetFunction());
-  ctr->Set(NanNew("createSsl"),
-           NanNew<FunctionTemplate>(CreateSsl)->GetFunction());
-  ctr->Set(NanNew("createComposite"),
-           NanNew<FunctionTemplate>(CreateComposite)->GetFunction());
-  ctr->Set(NanNew("createGce"),
-           NanNew<FunctionTemplate>(CreateGce)->GetFunction());
-  ctr->Set(NanNew("createIam"),
-           NanNew<FunctionTemplate>(CreateIam)->GetFunction());
-  ctr->Set(NanNew("createInsecure"),
-           NanNew<FunctionTemplate>(CreateInsecure)->GetFunction());
-  constructor = new NanCallback(ctr);
-  exports->Set(NanNew("Credentials"), ctr);
+  fun_tpl.Reset(tpl);
+  Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked();
+  Nan::Set(ctr, Nan::New("createDefault").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateDefault)).ToLocalChecked());
+  Nan::Set(ctr, Nan::New("createSsl").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateSsl)).ToLocalChecked());
+  Nan::Set(ctr, Nan::New("createComposite").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateComposite)).ToLocalChecked());
+  Nan::Set(ctr, Nan::New("createGce").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateGce)).ToLocalChecked());
+  Nan::Set(ctr, Nan::New("createIam").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateIam)).ToLocalChecked());
+  Nan::Set(ctr, Nan::New("createInsecure").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateInsecure)).ToLocalChecked());
+  Nan::Set(exports, Nan::New("Credentials").ToLocalChecked(), ctr);
+  constructor = new Nan::Callback(ctr);
 }
 
-bool Credentials::HasInstance(Handle<Value> val) {
-  NanScope();
-  return NanHasInstance(fun_tpl, val);
+bool Credentials::HasInstance(Local<Value> val) {
+  HandleScope scope;
+  return Nan::New(fun_tpl)->HasInstance(val);
 }
 
-Handle<Value> Credentials::WrapStruct(grpc_credentials *credentials) {
-  NanEscapableScope();
+Local<Value> Credentials::WrapStruct(grpc_credentials *credentials) {
+  EscapableHandleScope scope;
   const int argc = 1;
-  Handle<Value> argv[argc] = {
-    NanNew<External>(reinterpret_cast<void *>(credentials))};
-  return NanEscapeScope(constructor->GetFunction()->NewInstance(argc, argv));
+  Local<Value> argv[argc] = {
+    Nan::New<External>(reinterpret_cast<void *>(credentials))};
+  MaybeLocal<Object> maybe_instance = Nan::NewInstance(
+      constructor->GetFunction(), argc, argv);
+  if (maybe_instance.IsEmpty()) {
+    return scope.Escape(Nan::Null());
+  } else {
+    return scope.Escape(maybe_instance.ToLocalChecked());
+  }
 }
 
 grpc_credentials *Credentials::GetWrappedCredentials() {
@@ -105,115 +123,123 @@ grpc_credentials *Credentials::GetWrappedCredentials() {
 }
 
 NAN_METHOD(Credentials::New) {
-  NanScope();
-
-  if (args.IsConstructCall()) {
-    if (!args[0]->IsExternal()) {
-      return NanThrowTypeError(
+  if (info.IsConstructCall()) {
+    if (!info[0]->IsExternal()) {
+      return Nan::ThrowTypeError(
           "Credentials can only be created with the provided functions");
     }
-    Handle<External> ext = args[0].As<External>();
+    Local<External> ext = info[0].As<External>();
     grpc_credentials *creds_value =
         reinterpret_cast<grpc_credentials *>(ext->Value());
     Credentials *credentials = new Credentials(creds_value);
-    credentials->Wrap(args.This());
-    NanReturnValue(args.This());
+    credentials->Wrap(info.This());
+    info.GetReturnValue().Set(info.This());
+    return;
   } else {
     const int argc = 1;
-    Local<Value> argv[argc] = {args[0]};
-    NanReturnValue(constructor->GetFunction()->NewInstance(argc, argv));
+    Local<Value> argv[argc] = {info[0]};
+    MaybeLocal<Object> maybe_instance = constructor->GetFunction()->NewInstance(
+        argc, argv);
+    if (maybe_instance.IsEmpty()) {
+      // There's probably a pending exception
+      return;
+    } else {
+      info.GetReturnValue().Set(maybe_instance.ToLocalChecked());
+    }
   }
 }
 
 NAN_METHOD(Credentials::CreateDefault) {
-  NanScope();
   grpc_credentials *creds = grpc_google_default_credentials_create();
   if (creds == NULL) {
-    NanReturnNull();
+    info.GetReturnValue().SetNull();
+  } else {
+    info.GetReturnValue().Set(WrapStruct(creds));
   }
-  NanReturnValue(WrapStruct(creds));
 }
 
 NAN_METHOD(Credentials::CreateSsl) {
-  NanScope();
   char *root_certs = NULL;
   grpc_ssl_pem_key_cert_pair key_cert_pair = {NULL, NULL};
-  if (::node::Buffer::HasInstance(args[0])) {
-    root_certs = ::node::Buffer::Data(args[0]);
-  } else if (!(args[0]->IsNull() || args[0]->IsUndefined())) {
-    return NanThrowTypeError("createSsl's first argument must be a Buffer");
+  if (::node::Buffer::HasInstance(info[0])) {
+    root_certs = ::node::Buffer::Data(info[0]);
+  } else if (!(info[0]->IsNull() || info[0]->IsUndefined())) {
+    return Nan::ThrowTypeError("createSsl's first argument must be a Buffer");
   }
-  if (::node::Buffer::HasInstance(args[1])) {
-    key_cert_pair.private_key = ::node::Buffer::Data(args[1]);
-  } else if (!(args[1]->IsNull() || args[1]->IsUndefined())) {
-    return NanThrowTypeError(
+  if (::node::Buffer::HasInstance(info[1])) {
+    key_cert_pair.private_key = ::node::Buffer::Data(info[1]);
+  } else if (!(info[1]->IsNull() || info[1]->IsUndefined())) {
+    return Nan::ThrowTypeError(
         "createSSl's second argument must be a Buffer if provided");
   }
-  if (::node::Buffer::HasInstance(args[2])) {
-    key_cert_pair.cert_chain = ::node::Buffer::Data(args[2]);
-  } else if (!(args[2]->IsNull() || args[2]->IsUndefined())) {
-    return NanThrowTypeError(
+  if (::node::Buffer::HasInstance(info[2])) {
+    key_cert_pair.cert_chain = ::node::Buffer::Data(info[2]);
+  } else if (!(info[2]->IsNull() || info[2]->IsUndefined())) {
+    return Nan::ThrowTypeError(
         "createSSl's third argument must be a Buffer if provided");
   }
   grpc_credentials *creds = grpc_ssl_credentials_create(
       root_certs, key_cert_pair.private_key == NULL ? NULL : &key_cert_pair,
       NULL);
   if (creds == NULL) {
-    NanReturnNull();
+    info.GetReturnValue().SetNull();
+  } else {
+    info.GetReturnValue().Set(WrapStruct(creds));
   }
-  NanReturnValue(WrapStruct(creds));
 }
 
 NAN_METHOD(Credentials::CreateComposite) {
-  NanScope();
-  if (!HasInstance(args[0])) {
-    return NanThrowTypeError(
+  if (!HasInstance(info[0])) {
+    return Nan::ThrowTypeError(
         "createComposite's first argument must be a Credentials object");
   }
-  if (!HasInstance(args[1])) {
-    return NanThrowTypeError(
+  if (!HasInstance(info[1])) {
+    return Nan::ThrowTypeError(
         "createComposite's second argument must be a Credentials object");
   }
-  Credentials *creds1 = ObjectWrap::Unwrap<Credentials>(args[0]->ToObject());
-  Credentials *creds2 = ObjectWrap::Unwrap<Credentials>(args[1]->ToObject());
+  Credentials *creds1 = ObjectWrap::Unwrap<Credentials>(
+      Nan::To<Object>(info[0]).ToLocalChecked());
+  Credentials *creds2 = ObjectWrap::Unwrap<Credentials>(
+      Nan::To<Object>(info[1]).ToLocalChecked());
   grpc_credentials *creds = grpc_composite_credentials_create(
       creds1->wrapped_credentials, creds2->wrapped_credentials, NULL);
   if (creds == NULL) {
-    NanReturnNull();
+    info.GetReturnValue().SetNull();
+  } else {
+    info.GetReturnValue().Set(WrapStruct(creds));
   }
-  NanReturnValue(WrapStruct(creds));
 }
 
 NAN_METHOD(Credentials::CreateGce) {
-  NanScope();
+  Nan::HandleScope scope;
   grpc_credentials *creds = grpc_google_compute_engine_credentials_create(NULL);
   if (creds == NULL) {
-    NanReturnNull();
+    info.GetReturnValue().SetNull();
+  } else {
+    info.GetReturnValue().Set(WrapStruct(creds));
   }
-  NanReturnValue(WrapStruct(creds));
 }
 
 NAN_METHOD(Credentials::CreateIam) {
-  NanScope();
-  if (!args[0]->IsString()) {
-    return NanThrowTypeError("createIam's first argument must be a string");
+  if (!info[0]->IsString()) {
+    return Nan::ThrowTypeError("createIam's first argument must be a string");
   }
-  if (!args[1]->IsString()) {
-    return NanThrowTypeError("createIam's second argument must be a string");
+  if (!info[1]->IsString()) {
+    return Nan::ThrowTypeError("createIam's second argument must be a string");
   }
-  NanUtf8String auth_token(args[0]);
-  NanUtf8String auth_selector(args[1]);
+  Utf8String auth_token(info[0]);
+  Utf8String auth_selector(info[1]);
   grpc_credentials *creds =
       grpc_google_iam_credentials_create(*auth_token, *auth_selector, NULL);
   if (creds == NULL) {
-    NanReturnNull();
+    info.GetReturnValue().SetNull();
+  } else {
+    info.GetReturnValue().Set(WrapStruct(creds));
   }
-  NanReturnValue(WrapStruct(creds));
 }
 
 NAN_METHOD(Credentials::CreateInsecure) {
-  NanScope();
-  NanReturnValue(WrapStruct(NULL));
+  info.GetReturnValue().Set(WrapStruct(NULL));
 }
 
 }  // namespace node
diff --git a/src/node/ext/credentials.h b/src/node/ext/credentials.h
index 62957e61c3e34eabaad6790acad3c0b7f40fa241..1b211175d4575feb7d69560c99cdf90b387d6aa0 100644
--- a/src/node/ext/credentials.h
+++ b/src/node/ext/credentials.h
@@ -43,12 +43,12 @@ namespace grpc {
 namespace node {
 
 /* Wrapper class for grpc_credentials structs */
-class Credentials : public ::node::ObjectWrap {
+class Credentials : public Nan::ObjectWrap {
  public:
-  static void Init(v8::Handle<v8::Object> exports);
-  static bool HasInstance(v8::Handle<v8::Value> val);
+  static void Init(v8::Local<v8::Object> exports);
+  static bool HasInstance(v8::Local<v8::Value> val);
   /* Wrap a grpc_credentials struct in a javascript object */
-  static v8::Handle<v8::Value> WrapStruct(grpc_credentials *credentials);
+  static v8::Local<v8::Value> WrapStruct(grpc_credentials *credentials);
 
   /* Returns the grpc_credentials struct that this object wraps */
   grpc_credentials *GetWrappedCredentials();
@@ -69,9 +69,9 @@ class Credentials : public ::node::ObjectWrap {
   static NAN_METHOD(CreateFake);
   static NAN_METHOD(CreateIam);
   static NAN_METHOD(CreateInsecure);
-  static NanCallback *constructor;
+  static Nan::Callback *constructor;
   // Used for typechecking instances of this javascript class
-  static v8::Persistent<v8::FunctionTemplate> fun_tpl;
+  static Nan::Persistent<v8::FunctionTemplate> fun_tpl;
 
   grpc_credentials *wrapped_credentials;
 };
diff --git a/src/node/ext/node_grpc.cc b/src/node/ext/node_grpc.cc
index 0cf30da9228d83b6154834f5d51136e644f301ac..caca0fc4522db45923410bd498af0cab61f65559 100644
--- a/src/node/ext/node_grpc.cc
+++ b/src/node/ext/node_grpc.cc
@@ -43,171 +43,194 @@
 #include "credentials.h"
 #include "server_credentials.h"
 
-using v8::Handle;
+using v8::Local;
 using v8::Value;
 using v8::Object;
 using v8::Uint32;
 using v8::String;
 
-void InitStatusConstants(Handle<Object> exports) {
-  NanScope();
-  Handle<Object> status = NanNew<Object>();
-  exports->Set(NanNew("status"), status);
-  Handle<Value> OK(NanNew<Uint32, uint32_t>(GRPC_STATUS_OK));
-  status->Set(NanNew("OK"), OK);
-  Handle<Value> CANCELLED(NanNew<Uint32, uint32_t>(GRPC_STATUS_CANCELLED));
-  status->Set(NanNew("CANCELLED"), CANCELLED);
-  Handle<Value> UNKNOWN(NanNew<Uint32, uint32_t>(GRPC_STATUS_UNKNOWN));
-  status->Set(NanNew("UNKNOWN"), UNKNOWN);
-  Handle<Value> INVALID_ARGUMENT(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_INVALID_ARGUMENT));
-  status->Set(NanNew("INVALID_ARGUMENT"), INVALID_ARGUMENT);
-  Handle<Value> DEADLINE_EXCEEDED(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_DEADLINE_EXCEEDED));
-  status->Set(NanNew("DEADLINE_EXCEEDED"), DEADLINE_EXCEEDED);
-  Handle<Value> NOT_FOUND(NanNew<Uint32, uint32_t>(GRPC_STATUS_NOT_FOUND));
-  status->Set(NanNew("NOT_FOUND"), NOT_FOUND);
-  Handle<Value> ALREADY_EXISTS(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_ALREADY_EXISTS));
-  status->Set(NanNew("ALREADY_EXISTS"), ALREADY_EXISTS);
-  Handle<Value> PERMISSION_DENIED(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_PERMISSION_DENIED));
-  status->Set(NanNew("PERMISSION_DENIED"), PERMISSION_DENIED);
-  Handle<Value> UNAUTHENTICATED(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_UNAUTHENTICATED));
-  status->Set(NanNew("UNAUTHENTICATED"), UNAUTHENTICATED);
-  Handle<Value> RESOURCE_EXHAUSTED(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_RESOURCE_EXHAUSTED));
-  status->Set(NanNew("RESOURCE_EXHAUSTED"), RESOURCE_EXHAUSTED);
-  Handle<Value> FAILED_PRECONDITION(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_FAILED_PRECONDITION));
-  status->Set(NanNew("FAILED_PRECONDITION"), FAILED_PRECONDITION);
-  Handle<Value> ABORTED(NanNew<Uint32, uint32_t>(GRPC_STATUS_ABORTED));
-  status->Set(NanNew("ABORTED"), ABORTED);
-  Handle<Value> OUT_OF_RANGE(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_OUT_OF_RANGE));
-  status->Set(NanNew("OUT_OF_RANGE"), OUT_OF_RANGE);
-  Handle<Value> UNIMPLEMENTED(
-      NanNew<Uint32, uint32_t>(GRPC_STATUS_UNIMPLEMENTED));
-  status->Set(NanNew("UNIMPLEMENTED"), UNIMPLEMENTED);
-  Handle<Value> INTERNAL(NanNew<Uint32, uint32_t>(GRPC_STATUS_INTERNAL));
-  status->Set(NanNew("INTERNAL"), INTERNAL);
-  Handle<Value> UNAVAILABLE(NanNew<Uint32, uint32_t>(GRPC_STATUS_UNAVAILABLE));
-  status->Set(NanNew("UNAVAILABLE"), UNAVAILABLE);
-  Handle<Value> DATA_LOSS(NanNew<Uint32, uint32_t>(GRPC_STATUS_DATA_LOSS));
-  status->Set(NanNew("DATA_LOSS"), DATA_LOSS);
+void InitStatusConstants(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<Object> status = Nan::New<Object>();
+  Nan::Set(exports, Nan::New("status").ToLocalChecked(), status);
+  Local<Value> OK(Nan::New<Uint32, uint32_t>(GRPC_STATUS_OK));
+  Nan::Set(status, Nan::New("OK").ToLocalChecked(), OK);
+  Local<Value> CANCELLED(Nan::New<Uint32, uint32_t>(GRPC_STATUS_CANCELLED));
+  Nan::Set(status, Nan::New("CANCELLED").ToLocalChecked(), CANCELLED);
+  Local<Value> UNKNOWN(Nan::New<Uint32, uint32_t>(GRPC_STATUS_UNKNOWN));
+  Nan::Set(status, Nan::New("UNKNOWN").ToLocalChecked(), UNKNOWN);
+  Local<Value> INVALID_ARGUMENT(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_INVALID_ARGUMENT));
+  Nan::Set(status, Nan::New("INVALID_ARGUMENT").ToLocalChecked(),
+           INVALID_ARGUMENT);
+  Local<Value> DEADLINE_EXCEEDED(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_DEADLINE_EXCEEDED));
+  Nan::Set(status, Nan::New("DEADLINE_EXCEEDED").ToLocalChecked(),
+           DEADLINE_EXCEEDED);
+  Local<Value> NOT_FOUND(Nan::New<Uint32, uint32_t>(GRPC_STATUS_NOT_FOUND));
+  Nan::Set(status, Nan::New("NOT_FOUND").ToLocalChecked(), NOT_FOUND);
+  Local<Value> ALREADY_EXISTS(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_ALREADY_EXISTS));
+  Nan::Set(status, Nan::New("ALREADY_EXISTS").ToLocalChecked(), ALREADY_EXISTS);
+  Local<Value> PERMISSION_DENIED(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_PERMISSION_DENIED));
+  Nan::Set(status, Nan::New("PERMISSION_DENIED").ToLocalChecked(),
+           PERMISSION_DENIED);
+  Local<Value> UNAUTHENTICATED(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_UNAUTHENTICATED));
+  Nan::Set(status, Nan::New("UNAUTHENTICATED").ToLocalChecked(),
+           UNAUTHENTICATED);
+  Local<Value> RESOURCE_EXHAUSTED(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_RESOURCE_EXHAUSTED));
+  Nan::Set(status, Nan::New("RESOURCE_EXHAUSTED").ToLocalChecked(),
+           RESOURCE_EXHAUSTED);
+  Local<Value> FAILED_PRECONDITION(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_FAILED_PRECONDITION));
+  Nan::Set(status, Nan::New("FAILED_PRECONDITION").ToLocalChecked(),
+           FAILED_PRECONDITION);
+  Local<Value> ABORTED(Nan::New<Uint32, uint32_t>(GRPC_STATUS_ABORTED));
+  Nan::Set(status, Nan::New("ABORTED").ToLocalChecked(), ABORTED);
+  Local<Value> OUT_OF_RANGE(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_OUT_OF_RANGE));
+  Nan::Set(status, Nan::New("OUT_OF_RANGE").ToLocalChecked(), OUT_OF_RANGE);
+  Local<Value> UNIMPLEMENTED(
+      Nan::New<Uint32, uint32_t>(GRPC_STATUS_UNIMPLEMENTED));
+  Nan::Set(status, Nan::New("UNIMPLEMENTED").ToLocalChecked(), UNIMPLEMENTED);
+  Local<Value> INTERNAL(Nan::New<Uint32, uint32_t>(GRPC_STATUS_INTERNAL));
+  Nan::Set(status, Nan::New("INTERNAL").ToLocalChecked(), INTERNAL);
+  Local<Value> UNAVAILABLE(Nan::New<Uint32, uint32_t>(GRPC_STATUS_UNAVAILABLE));
+  Nan::Set(status, Nan::New("UNAVAILABLE").ToLocalChecked(), UNAVAILABLE);
+  Local<Value> DATA_LOSS(Nan::New<Uint32, uint32_t>(GRPC_STATUS_DATA_LOSS));
+  Nan::Set(status, Nan::New("DATA_LOSS").ToLocalChecked(), DATA_LOSS);
 }
 
-void InitCallErrorConstants(Handle<Object> exports) {
-  NanScope();
-  Handle<Object> call_error = NanNew<Object>();
-  exports->Set(NanNew("callError"), call_error);
-  Handle<Value> OK(NanNew<Uint32, uint32_t>(GRPC_CALL_OK));
-  call_error->Set(NanNew("OK"), OK);
-  Handle<Value> ERROR(NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR));
-  call_error->Set(NanNew("ERROR"), ERROR);
-  Handle<Value> NOT_ON_SERVER(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_NOT_ON_SERVER));
-  call_error->Set(NanNew("NOT_ON_SERVER"), NOT_ON_SERVER);
-  Handle<Value> NOT_ON_CLIENT(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_NOT_ON_CLIENT));
-  call_error->Set(NanNew("NOT_ON_CLIENT"), NOT_ON_CLIENT);
-  Handle<Value> ALREADY_INVOKED(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_ALREADY_INVOKED));
-  call_error->Set(NanNew("ALREADY_INVOKED"), ALREADY_INVOKED);
-  Handle<Value> NOT_INVOKED(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_NOT_INVOKED));
-  call_error->Set(NanNew("NOT_INVOKED"), NOT_INVOKED);
-  Handle<Value> ALREADY_FINISHED(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_ALREADY_FINISHED));
-  call_error->Set(NanNew("ALREADY_FINISHED"), ALREADY_FINISHED);
-  Handle<Value> TOO_MANY_OPERATIONS(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_TOO_MANY_OPERATIONS));
-  call_error->Set(NanNew("TOO_MANY_OPERATIONS"), TOO_MANY_OPERATIONS);
-  Handle<Value> INVALID_FLAGS(
-      NanNew<Uint32, uint32_t>(GRPC_CALL_ERROR_INVALID_FLAGS));
-  call_error->Set(NanNew("INVALID_FLAGS"), INVALID_FLAGS);
+void InitCallErrorConstants(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<Object> call_error = Nan::New<Object>();
+  Nan::Set(exports, Nan::New("callError").ToLocalChecked(), call_error);
+  Local<Value> OK(Nan::New<Uint32, uint32_t>(GRPC_CALL_OK));
+  Nan::Set(call_error, Nan::New("OK").ToLocalChecked(), OK);
+  Local<Value> ERROR(Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR));
+  Nan::Set(call_error, Nan::New("ERROR").ToLocalChecked(), ERROR);
+  Local<Value> NOT_ON_SERVER(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_NOT_ON_SERVER));
+  Nan::Set(call_error, Nan::New("NOT_ON_SERVER").ToLocalChecked(),
+           NOT_ON_SERVER);
+  Local<Value> NOT_ON_CLIENT(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_NOT_ON_CLIENT));
+  Nan::Set(call_error, Nan::New("NOT_ON_CLIENT").ToLocalChecked(),
+           NOT_ON_CLIENT);
+  Local<Value> ALREADY_INVOKED(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_ALREADY_INVOKED));
+  Nan::Set(call_error, Nan::New("ALREADY_INVOKED").ToLocalChecked(),
+           ALREADY_INVOKED);
+  Local<Value> NOT_INVOKED(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_NOT_INVOKED));
+  Nan::Set(call_error, Nan::New("NOT_INVOKED").ToLocalChecked(), NOT_INVOKED);
+  Local<Value> ALREADY_FINISHED(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_ALREADY_FINISHED));
+  Nan::Set(call_error, Nan::New("ALREADY_FINISHED").ToLocalChecked(),
+           ALREADY_FINISHED);
+  Local<Value> TOO_MANY_OPERATIONS(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_TOO_MANY_OPERATIONS));
+  Nan::Set(call_error, Nan::New("TOO_MANY_OPERATIONS").ToLocalChecked(),
+           TOO_MANY_OPERATIONS);
+  Local<Value> INVALID_FLAGS(
+      Nan::New<Uint32, uint32_t>(GRPC_CALL_ERROR_INVALID_FLAGS));
+  Nan::Set(call_error, Nan::New("INVALID_FLAGS").ToLocalChecked(),
+           INVALID_FLAGS);
 }
 
-void InitOpTypeConstants(Handle<Object> exports) {
-  NanScope();
-  Handle<Object> op_type = NanNew<Object>();
-  exports->Set(NanNew("opType"), op_type);
-  Handle<Value> SEND_INITIAL_METADATA(
-      NanNew<Uint32, uint32_t>(GRPC_OP_SEND_INITIAL_METADATA));
-  op_type->Set(NanNew("SEND_INITIAL_METADATA"), SEND_INITIAL_METADATA);
-  Handle<Value> SEND_MESSAGE(
-      NanNew<Uint32, uint32_t>(GRPC_OP_SEND_MESSAGE));
-  op_type->Set(NanNew("SEND_MESSAGE"), SEND_MESSAGE);
-  Handle<Value> SEND_CLOSE_FROM_CLIENT(
-      NanNew<Uint32, uint32_t>(GRPC_OP_SEND_CLOSE_FROM_CLIENT));
-  op_type->Set(NanNew("SEND_CLOSE_FROM_CLIENT"), SEND_CLOSE_FROM_CLIENT);
-  Handle<Value> SEND_STATUS_FROM_SERVER(
-      NanNew<Uint32, uint32_t>(GRPC_OP_SEND_STATUS_FROM_SERVER));
-  op_type->Set(NanNew("SEND_STATUS_FROM_SERVER"), SEND_STATUS_FROM_SERVER);
-  Handle<Value> RECV_INITIAL_METADATA(
-      NanNew<Uint32, uint32_t>(GRPC_OP_RECV_INITIAL_METADATA));
-  op_type->Set(NanNew("RECV_INITIAL_METADATA"), RECV_INITIAL_METADATA);
-  Handle<Value> RECV_MESSAGE(
-      NanNew<Uint32, uint32_t>(GRPC_OP_RECV_MESSAGE));
-  op_type->Set(NanNew("RECV_MESSAGE"), RECV_MESSAGE);
-  Handle<Value> RECV_STATUS_ON_CLIENT(
-      NanNew<Uint32, uint32_t>(GRPC_OP_RECV_STATUS_ON_CLIENT));
-  op_type->Set(NanNew("RECV_STATUS_ON_CLIENT"), RECV_STATUS_ON_CLIENT);
-  Handle<Value> RECV_CLOSE_ON_SERVER(
-      NanNew<Uint32, uint32_t>(GRPC_OP_RECV_CLOSE_ON_SERVER));
-  op_type->Set(NanNew("RECV_CLOSE_ON_SERVER"), RECV_CLOSE_ON_SERVER);
+void InitOpTypeConstants(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<Object> op_type = Nan::New<Object>();
+  Nan::Set(exports, Nan::New("opType").ToLocalChecked(), op_type);
+  Local<Value> SEND_INITIAL_METADATA(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_SEND_INITIAL_METADATA));
+  Nan::Set(op_type, Nan::New("SEND_INITIAL_METADATA").ToLocalChecked(),
+           SEND_INITIAL_METADATA);
+  Local<Value> SEND_MESSAGE(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_SEND_MESSAGE));
+  Nan::Set(op_type, Nan::New("SEND_MESSAGE").ToLocalChecked(), SEND_MESSAGE);
+  Local<Value> SEND_CLOSE_FROM_CLIENT(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_SEND_CLOSE_FROM_CLIENT));
+  Nan::Set(op_type, Nan::New("SEND_CLOSE_FROM_CLIENT").ToLocalChecked(),
+           SEND_CLOSE_FROM_CLIENT);
+  Local<Value> SEND_STATUS_FROM_SERVER(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_SEND_STATUS_FROM_SERVER));
+  Nan::Set(op_type, Nan::New("SEND_STATUS_FROM_SERVER").ToLocalChecked(),
+           SEND_STATUS_FROM_SERVER);
+  Local<Value> RECV_INITIAL_METADATA(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_RECV_INITIAL_METADATA));
+  Nan::Set(op_type, Nan::New("RECV_INITIAL_METADATA").ToLocalChecked(),
+           RECV_INITIAL_METADATA);
+  Local<Value> RECV_MESSAGE(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_RECV_MESSAGE));
+  Nan::Set(op_type, Nan::New("RECV_MESSAGE").ToLocalChecked(), RECV_MESSAGE);
+  Local<Value> RECV_STATUS_ON_CLIENT(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_RECV_STATUS_ON_CLIENT));
+  Nan::Set(op_type, Nan::New("RECV_STATUS_ON_CLIENT").ToLocalChecked(),
+           RECV_STATUS_ON_CLIENT);
+  Local<Value> RECV_CLOSE_ON_SERVER(
+      Nan::New<Uint32, uint32_t>(GRPC_OP_RECV_CLOSE_ON_SERVER));
+  Nan::Set(op_type, Nan::New("RECV_CLOSE_ON_SERVER").ToLocalChecked(),
+           RECV_CLOSE_ON_SERVER);
 }
 
-void InitPropagateConstants(Handle<Object> exports) {
-  NanScope();
-  Handle<Object> propagate = NanNew<Object>();
-  exports->Set(NanNew("propagate"), propagate);
-  Handle<Value> DEADLINE(NanNew<Uint32, uint32_t>(GRPC_PROPAGATE_DEADLINE));
-  propagate->Set(NanNew("DEADLINE"), DEADLINE);
-  Handle<Value> CENSUS_STATS_CONTEXT(
-      NanNew<Uint32, uint32_t>(GRPC_PROPAGATE_CENSUS_STATS_CONTEXT));
-  propagate->Set(NanNew("CENSUS_STATS_CONTEXT"), CENSUS_STATS_CONTEXT);
-  Handle<Value> CENSUS_TRACING_CONTEXT(
-      NanNew<Uint32, uint32_t>(GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT));
-  propagate->Set(NanNew("CENSUS_TRACING_CONTEXT"), CENSUS_TRACING_CONTEXT);
-  Handle<Value> CANCELLATION(
-      NanNew<Uint32, uint32_t>(GRPC_PROPAGATE_CANCELLATION));
-  propagate->Set(NanNew("CANCELLATION"), CANCELLATION);
-  Handle<Value> DEFAULTS(NanNew<Uint32, uint32_t>(GRPC_PROPAGATE_DEFAULTS));
-  propagate->Set(NanNew("DEFAULTS"), DEFAULTS);
+void InitPropagateConstants(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<Object> propagate = Nan::New<Object>();
+  Nan::Set(exports, Nan::New("propagate").ToLocalChecked(), propagate);
+  Local<Value> DEADLINE(Nan::New<Uint32, uint32_t>(GRPC_PROPAGATE_DEADLINE));
+  Nan::Set(propagate, Nan::New("DEADLINE").ToLocalChecked(), DEADLINE);
+  Local<Value> CENSUS_STATS_CONTEXT(
+      Nan::New<Uint32, uint32_t>(GRPC_PROPAGATE_CENSUS_STATS_CONTEXT));
+  Nan::Set(propagate, Nan::New("CENSUS_STATS_CONTEXT").ToLocalChecked(),
+           CENSUS_STATS_CONTEXT);
+  Local<Value> CENSUS_TRACING_CONTEXT(
+      Nan::New<Uint32, uint32_t>(GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT));
+  Nan::Set(propagate, Nan::New("CENSUS_TRACING_CONTEXT").ToLocalChecked(),
+           CENSUS_TRACING_CONTEXT);
+  Local<Value> CANCELLATION(
+      Nan::New<Uint32, uint32_t>(GRPC_PROPAGATE_CANCELLATION));
+  Nan::Set(propagate, Nan::New("CANCELLATION").ToLocalChecked(), CANCELLATION);
+  Local<Value> DEFAULTS(Nan::New<Uint32, uint32_t>(GRPC_PROPAGATE_DEFAULTS));
+  Nan::Set(propagate, Nan::New("DEFAULTS").ToLocalChecked(), DEFAULTS);
 }
 
-void InitConnectivityStateConstants(Handle<Object> exports) {
-  NanScope();
-  Handle<Object> channel_state = NanNew<Object>();
-  exports->Set(NanNew("connectivityState"), channel_state);
-  Handle<Value> IDLE(NanNew<Uint32, uint32_t>(GRPC_CHANNEL_IDLE));
-  channel_state->Set(NanNew("IDLE"), IDLE);
-  Handle<Value> CONNECTING(NanNew<Uint32, uint32_t>(GRPC_CHANNEL_CONNECTING));
-  channel_state->Set(NanNew("CONNECTING"), CONNECTING);
-  Handle<Value> READY(NanNew<Uint32, uint32_t>(GRPC_CHANNEL_READY));
-  channel_state->Set(NanNew("READY"), READY);
-  Handle<Value> TRANSIENT_FAILURE(
-      NanNew<Uint32, uint32_t>(GRPC_CHANNEL_TRANSIENT_FAILURE));
-  channel_state->Set(NanNew("TRANSIENT_FAILURE"), TRANSIENT_FAILURE);
-  Handle<Value> FATAL_FAILURE(
-      NanNew<Uint32, uint32_t>(GRPC_CHANNEL_FATAL_FAILURE));
-  channel_state->Set(NanNew("FATAL_FAILURE"), FATAL_FAILURE);
+void InitConnectivityStateConstants(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<Object> channel_state = Nan::New<Object>();
+  Nan::Set(exports, Nan::New("connectivityState").ToLocalChecked(),
+           channel_state);
+  Local<Value> IDLE(Nan::New<Uint32, uint32_t>(GRPC_CHANNEL_IDLE));
+  Nan::Set(channel_state, Nan::New("IDLE").ToLocalChecked(), IDLE);
+  Local<Value> CONNECTING(Nan::New<Uint32, uint32_t>(GRPC_CHANNEL_CONNECTING));
+  Nan::Set(channel_state, Nan::New("CONNECTING").ToLocalChecked(), CONNECTING);
+  Local<Value> READY(Nan::New<Uint32, uint32_t>(GRPC_CHANNEL_READY));
+  Nan::Set(channel_state, Nan::New("READY").ToLocalChecked(), READY);
+  Local<Value> TRANSIENT_FAILURE(
+      Nan::New<Uint32, uint32_t>(GRPC_CHANNEL_TRANSIENT_FAILURE));
+  Nan::Set(channel_state, Nan::New("TRANSIENT_FAILURE").ToLocalChecked(),
+           TRANSIENT_FAILURE);
+  Local<Value> FATAL_FAILURE(
+      Nan::New<Uint32, uint32_t>(GRPC_CHANNEL_FATAL_FAILURE));
+  Nan::Set(channel_state, Nan::New("FATAL_FAILURE").ToLocalChecked(),
+           FATAL_FAILURE);
 }
 
-void InitWriteFlags(Handle<Object> exports) {
-  NanScope();
-  Handle<Object> write_flags = NanNew<Object>();
-  exports->Set(NanNew("writeFlags"), write_flags);
-  Handle<Value> BUFFER_HINT(NanNew<Uint32, uint32_t>(GRPC_WRITE_BUFFER_HINT));
-  write_flags->Set(NanNew("BUFFER_HINT"), BUFFER_HINT);
-  Handle<Value> NO_COMPRESS(NanNew<Uint32, uint32_t>(GRPC_WRITE_NO_COMPRESS));
-  write_flags->Set(NanNew("NO_COMPRESS"), NO_COMPRESS);
+void InitWriteFlags(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<Object> write_flags = Nan::New<Object>();
+  Nan::Set(exports, Nan::New("writeFlags").ToLocalChecked(), write_flags);
+  Local<Value> BUFFER_HINT(Nan::New<Uint32, uint32_t>(GRPC_WRITE_BUFFER_HINT));
+  Nan::Set(write_flags, Nan::New("BUFFER_HINT").ToLocalChecked(), BUFFER_HINT);
+  Local<Value> NO_COMPRESS(Nan::New<Uint32, uint32_t>(GRPC_WRITE_NO_COMPRESS));
+  Nan::Set(write_flags, Nan::New("NO_COMPRESS").ToLocalChecked(), NO_COMPRESS);
 }
 
-void init(Handle<Object> exports) {
-  NanScope();
+void init(Local<Object> exports) {
+  Nan::HandleScope scope;
   grpc_init();
   InitStatusConstants(exports);
   InitCallErrorConstants(exports);
diff --git a/src/node/ext/server.cc b/src/node/ext/server.cc
index 32a8ff55b122f68c007754798e029dde648728cf..87363fc446becc638b7ab307cf824c6247807058 100644
--- a/src/node/ext/server.cc
+++ b/src/node/ext/server.cc
@@ -50,6 +50,15 @@
 namespace grpc {
 namespace node {
 
+using Nan::Callback;
+using Nan::EscapableHandleScope;
+using Nan::HandleScope;
+using Nan::Maybe;
+using Nan::MaybeLocal;
+using Nan::ObjectWrap;
+using Nan::Persistent;
+using Nan::Utf8String;
+
 using std::unique_ptr;
 using v8::Array;
 using v8::Boolean;
@@ -57,16 +66,13 @@ using v8::Date;
 using v8::Exception;
 using v8::Function;
 using v8::FunctionTemplate;
-using v8::Handle;
-using v8::HandleScope;
 using v8::Local;
 using v8::Number;
 using v8::Object;
-using v8::Persistent;
 using v8::String;
 using v8::Value;
 
-NanCallback *Server::constructor;
+Nan::Callback *Server::constructor;
 Persistent<FunctionTemplate> Server::fun_tpl;
 
 class NewCallOp : public Op {
@@ -82,22 +88,26 @@ class NewCallOp : public Op {
     grpc_metadata_array_destroy(&request_metadata);
   }
 
-  Handle<Value> GetNodeValue() const {
-    NanEscapableScope();
+  Local<Value> GetNodeValue() const {
+    Nan::EscapableHandleScope scope;
     if (call == NULL) {
-      return NanEscapeScope(NanNull());
+      return scope.Escape(Nan::Null());
     }
-    Handle<Object> obj = NanNew<Object>();
-    obj->Set(NanNew("call"), Call::WrapStruct(call));
-    obj->Set(NanNew("method"), NanNew(details.method));
-    obj->Set(NanNew("host"), NanNew(details.host));
-    obj->Set(NanNew("deadline"),
-             NanNew<Date>(TimespecToMilliseconds(details.deadline)));
-    obj->Set(NanNew("metadata"), ParseMetadata(&request_metadata));
-    return NanEscapeScope(obj);
+    Local<Object> obj = Nan::New<Object>();
+    Nan::Set(obj, Nan::New("call").ToLocalChecked(), Call::WrapStruct(call));
+    Nan::Set(obj, Nan::New("method").ToLocalChecked(),
+             Nan::New(details.method).ToLocalChecked());
+    Nan::Set(obj, Nan::New("host").ToLocalChecked(),
+             Nan::New(details.host).ToLocalChecked());
+    Nan::Set(obj, Nan::New("deadline").ToLocalChecked(),
+             Nan::New<Date>(
+                 TimespecToMilliseconds(details.deadline)).ToLocalChecked());
+    Nan::Set(obj, Nan::New("metadata").ToLocalChecked(),
+             ParseMetadata(&request_metadata));
+    return scope.Escape(obj);
   }
 
-  bool ParseOp(Handle<Value> value, grpc_op *out,
+  bool ParseOp(Local<Value> value, grpc_op *out,
                shared_ptr<Resources> resources) {
     return true;
   }
@@ -124,35 +134,25 @@ Server::~Server() {
   grpc_completion_queue_destroy(this->shutdown_queue);
 }
 
-void Server::Init(Handle<Object> exports) {
-  NanScope();
-  Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
-  tpl->SetClassName(NanNew("Server"));
+void Server::Init(Local<Object> exports) {
+  HandleScope scope;
+  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+  tpl->SetClassName(Nan::New("Server").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
-  NanSetPrototypeTemplate(tpl, "requestCall",
-                          NanNew<FunctionTemplate>(RequestCall)->GetFunction());
-
-  NanSetPrototypeTemplate(
-      tpl, "addHttp2Port",
-      NanNew<FunctionTemplate>(AddHttp2Port)->GetFunction());
-
-  NanSetPrototypeTemplate(tpl, "start",
-                          NanNew<FunctionTemplate>(Start)->GetFunction());
-
-  NanSetPrototypeTemplate(tpl, "tryShutdown",
-                          NanNew<FunctionTemplate>(TryShutdown)->GetFunction());
-  NanSetPrototypeTemplate(
-      tpl, "forceShutdown",
-      NanNew<FunctionTemplate>(ForceShutdown)->GetFunction());
-
-  NanAssignPersistent(fun_tpl, tpl);
-  Handle<Function> ctr = tpl->GetFunction();
-  constructor = new NanCallback(ctr);
-  exports->Set(NanNew("Server"), ctr);
+  Nan::SetPrototypeMethod(tpl, "requestCall", RequestCall);
+  Nan::SetPrototypeMethod(tpl, "addHttp2Port", AddHttp2Port);
+  Nan::SetPrototypeMethod(tpl, "start", Start);
+  Nan::SetPrototypeMethod(tpl, "tryShutdown", TryShutdown);
+  Nan::SetPrototypeMethod(tpl, "forceShutdown", ForceShutdown);
+  fun_tpl.Reset(tpl);
+  Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked();
+  Nan::Set(exports, Nan::New("Server").ToLocalChecked(), ctr);
+  constructor = new Callback(ctr);
 }
 
-bool Server::HasInstance(Handle<Value> val) {
-  return NanHasInstance(fun_tpl, val);
+bool Server::HasInstance(Local<Value> val) {
+  HandleScope scope;
+  return Nan::New(fun_tpl)->HasInstance(val);
 }
 
 void Server::ShutdownServer() {
@@ -165,64 +165,77 @@ void Server::ShutdownServer() {
 }
 
 NAN_METHOD(Server::New) {
-  NanScope();
-
   /* If this is not a constructor call, make a constructor call and return
      the result */
-  if (!args.IsConstructCall()) {
+  if (!info.IsConstructCall()) {
     const int argc = 1;
-    Local<Value> argv[argc] = {args[0]};
-    NanReturnValue(constructor->GetFunction()->NewInstance(argc, argv));
+    Local<Value> argv[argc] = {info[0]};
+    MaybeLocal<Object> maybe_instance = constructor->GetFunction()->NewInstance(
+        argc, argv);
+    if (maybe_instance.IsEmpty()) {
+      // There's probably a pending exception
+      return;
+    } else {
+      info.GetReturnValue().Set(maybe_instance.ToLocalChecked());
+      return;
+    }
   }
   grpc_server *wrapped_server;
   grpc_completion_queue *queue = CompletionQueueAsyncWorker::GetQueue();
-  if (args[0]->IsUndefined()) {
+  if (info[0]->IsUndefined()) {
     wrapped_server = grpc_server_create(NULL, NULL);
-  } else if (args[0]->IsObject()) {
-    Handle<Object> args_hash(args[0]->ToObject());
-    Handle<Array> keys(args_hash->GetOwnPropertyNames());
+  } else if (info[0]->IsObject()) {
+    Local<Object> args_hash = Nan::To<Object>(info[0]).ToLocalChecked();
+    Local<Array> keys = Nan::GetOwnPropertyNames(args_hash).ToLocalChecked();
     grpc_channel_args channel_args;
     channel_args.num_args = keys->Length();
     channel_args.args = reinterpret_cast<grpc_arg *>(
         calloc(channel_args.num_args, sizeof(grpc_arg)));
     /* These are used to keep all strings until then end of the block, then
        destroy them */
-    std::vector<NanUtf8String *> key_strings(keys->Length());
-    std::vector<NanUtf8String *> value_strings(keys->Length());
+    std::vector<Utf8String *> key_strings(keys->Length());
+    std::vector<Utf8String *> value_strings(keys->Length());
     for (unsigned int i = 0; i < channel_args.num_args; i++) {
-      Handle<String> current_key(keys->Get(i)->ToString());
-      Handle<Value> current_value(args_hash->Get(current_key));
-      key_strings[i] = new NanUtf8String(current_key);
+      MaybeLocal<String> maybe_key = Nan::To<String>(
+          Nan::Get(keys, i).ToLocalChecked());
+      if (maybe_key.IsEmpty()) {
+        free(channel_args.args);
+        return Nan::ThrowTypeError("Arg keys must be strings");
+      }
+      Local<String> current_key = maybe_key.ToLocalChecked();
+      Local<Value> current_value = Nan::Get(args_hash,
+                                             current_key).ToLocalChecked();
+      key_strings[i] = new Utf8String(current_key);
       channel_args.args[i].key = **key_strings[i];
       if (current_value->IsInt32()) {
         channel_args.args[i].type = GRPC_ARG_INTEGER;
-        channel_args.args[i].value.integer = current_value->Int32Value();
+        channel_args.args[i].value.integer = Nan::To<int32_t>(
+            current_value).FromJust();
       } else if (current_value->IsString()) {
         channel_args.args[i].type = GRPC_ARG_STRING;
-        value_strings[i] = new NanUtf8String(current_value);
+        value_strings[i] = new Utf8String(current_value);
         channel_args.args[i].value.string = **value_strings[i];
       } else {
         free(channel_args.args);
-        return NanThrowTypeError("Arg values must be strings");
+        return Nan::ThrowTypeError("Arg values must be strings");
       }
     }
     wrapped_server = grpc_server_create(&channel_args, NULL);
     free(channel_args.args);
   } else {
-    return NanThrowTypeError("Server expects an object");
+    return Nan::ThrowTypeError("Server expects an object");
   }
   grpc_server_register_completion_queue(wrapped_server, queue, NULL);
   Server *server = new Server(wrapped_server);
-  server->Wrap(args.This());
-  NanReturnValue(args.This());
+  server->Wrap(info.This());
+  info.GetReturnValue().Set(info.This());
 }
 
 NAN_METHOD(Server::RequestCall) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("requestCall can only be called on a Server");
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("requestCall can only be called on a Server");
   }
-  Server *server = ObjectWrap::Unwrap<Server>(args.This());
+  Server *server = ObjectWrap::Unwrap<Server>(info.This());
   NewCallOp *op = new NewCallOp();
   unique_ptr<OpVec> ops(new OpVec());
   ops->push_back(unique_ptr<Op>(op));
@@ -230,79 +243,74 @@ NAN_METHOD(Server::RequestCall) {
       server->wrapped_server, &op->call, &op->details, &op->request_metadata,
       CompletionQueueAsyncWorker::GetQueue(),
       CompletionQueueAsyncWorker::GetQueue(),
-      new struct tag(new NanCallback(args[0].As<Function>()), ops.release(),
+      new struct tag(new Callback(info[0].As<Function>()), ops.release(),
                      shared_ptr<Resources>(nullptr)));
   if (error != GRPC_CALL_OK) {
-    return NanThrowError(nanErrorWithCode("requestCall failed", error));
+    return Nan::ThrowError(nanErrorWithCode("requestCall failed", error));
   }
   CompletionQueueAsyncWorker::Next();
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Server::AddHttp2Port) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError(
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError(
         "addHttp2Port can only be called on a Server");
   }
-  if (!args[0]->IsString()) {
-    return NanThrowTypeError(
+  if (!info[0]->IsString()) {
+    return Nan::ThrowTypeError(
         "addHttp2Port's first argument must be a String");
   }
-  if (!ServerCredentials::HasInstance(args[1])) {
-    return NanThrowTypeError(
+  if (!ServerCredentials::HasInstance(info[1])) {
+    return Nan::ThrowTypeError(
         "addHttp2Port's second argument must be ServerCredentials");
   }
-  Server *server = ObjectWrap::Unwrap<Server>(args.This());
+  Server *server = ObjectWrap::Unwrap<Server>(info.This());
   ServerCredentials *creds_object = ObjectWrap::Unwrap<ServerCredentials>(
-      args[1]->ToObject());
+      Nan::To<Object>(info[1]).ToLocalChecked());
   grpc_server_credentials *creds = creds_object->GetWrappedServerCredentials();
   int port;
   if (creds == NULL) {
     port = grpc_server_add_insecure_http2_port(server->wrapped_server,
-                                               *NanUtf8String(args[0]));
+                                               *Utf8String(info[0]));
   } else {
     port = grpc_server_add_secure_http2_port(server->wrapped_server,
-                                             *NanUtf8String(args[0]),
+                                             *Utf8String(info[0]),
                                              creds);
   }
-  NanReturnValue(NanNew<Number>(port));
+  info.GetReturnValue().Set(Nan::New<Number>(port));
 }
 
 NAN_METHOD(Server::Start) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("start can only be called on a Server");
+  Nan::HandleScope scope;
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("start can only be called on a Server");
   }
-  Server *server = ObjectWrap::Unwrap<Server>(args.This());
+  Server *server = ObjectWrap::Unwrap<Server>(info.This());
   grpc_server_start(server->wrapped_server);
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Server::TryShutdown) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("tryShutdown can only be called on a Server");
+  Nan::HandleScope scope;
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("tryShutdown can only be called on a Server");
   }
-  Server *server = ObjectWrap::Unwrap<Server>(args.This());
+  Server *server = ObjectWrap::Unwrap<Server>(info.This());
   unique_ptr<OpVec> ops(new OpVec());
   grpc_server_shutdown_and_notify(
       server->wrapped_server,
       CompletionQueueAsyncWorker::GetQueue(),
-      new struct tag(new NanCallback(args[0].As<Function>()), ops.release(),
+      new struct tag(new Nan::Callback(info[0].As<Function>()), ops.release(),
                      shared_ptr<Resources>(nullptr)));
   CompletionQueueAsyncWorker::Next();
-  NanReturnUndefined();
 }
 
 NAN_METHOD(Server::ForceShutdown) {
-  NanScope();
-  if (!HasInstance(args.This())) {
-    return NanThrowTypeError("forceShutdown can only be called on a Server");
+  Nan::HandleScope scope;
+  if (!HasInstance(info.This())) {
+    return Nan::ThrowTypeError("forceShutdown can only be called on a Server");
   }
-  Server *server = ObjectWrap::Unwrap<Server>(args.This());
+  Server *server = ObjectWrap::Unwrap<Server>(info.This());
   server->ShutdownServer();
-  NanReturnUndefined();
 }
 
 }  // namespace node
diff --git a/src/node/ext/server.h b/src/node/ext/server.h
index e7d5c3fb11a253197a897ca0a4a38518d1de3ec0..ab5fc210e8ace61e6021d197fc11577d166723cc 100644
--- a/src/node/ext/server.h
+++ b/src/node/ext/server.h
@@ -44,14 +44,14 @@ namespace node {
 /* Wraps grpc_server as a JavaScript object. Provides a constructor
    and wrapper methods for grpc_server_create, grpc_server_request_call,
    grpc_server_add_http2_port, and grpc_server_start. */
-class Server : public ::node::ObjectWrap {
+class Server : public Nan::ObjectWrap {
  public:
   /* Initializes the Server class and exposes the constructor and
      wrapper methods to JavaScript */
-  static void Init(v8::Handle<v8::Object> exports);
+  static void Init(v8::Local<v8::Object> exports);
   /* Tests whether the given value was constructed by this class's
      JavaScript constructor */
-  static bool HasInstance(v8::Handle<v8::Value> val);
+  static bool HasInstance(v8::Local<v8::Value> val);
 
  private:
   explicit Server(grpc_server *server);
@@ -69,8 +69,8 @@ class Server : public ::node::ObjectWrap {
   static NAN_METHOD(Start);
   static NAN_METHOD(TryShutdown);
   static NAN_METHOD(ForceShutdown);
-  static NanCallback *constructor;
-  static v8::Persistent<v8::FunctionTemplate> fun_tpl;
+  static Nan::Callback *constructor;
+  static Nan::Persistent<v8::FunctionTemplate> fun_tpl;
 
   grpc_server *wrapped_server;
   grpc_completion_queue *shutdown_queue;
diff --git a/src/node/ext/server_credentials.cc b/src/node/ext/server_credentials.cc
index b1201eb6641dc73292fe7fe67c475a9f61af8b86..5e922bd877df8c2b9bf98efd0e8247739c4fbd73 100644
--- a/src/node/ext/server_credentials.cc
+++ b/src/node/ext/server_credentials.cc
@@ -41,22 +41,28 @@
 namespace grpc {
 namespace node {
 
+using Nan::Callback;
+using Nan::EscapableHandleScope;
+using Nan::HandleScope;
+using Nan::Maybe;
+using Nan::MaybeLocal;
+using Nan::ObjectWrap;
+using Nan::Persistent;
+using Nan::Utf8String;
+
 using v8::Array;
 using v8::Exception;
 using v8::External;
 using v8::Function;
 using v8::FunctionTemplate;
-using v8::Handle;
-using v8::HandleScope;
 using v8::Integer;
 using v8::Local;
 using v8::Object;
 using v8::ObjectTemplate;
-using v8::Persistent;
 using v8::String;
 using v8::Value;
 
-NanCallback *ServerCredentials::constructor;
+Nan::Callback *ServerCredentials::constructor;
 Persistent<FunctionTemplate> ServerCredentials::fun_tpl;
 
 ServerCredentials::ServerCredentials(grpc_server_credentials *credentials)
@@ -66,33 +72,41 @@ ServerCredentials::~ServerCredentials() {
   grpc_server_credentials_release(wrapped_credentials);
 }
 
-void ServerCredentials::Init(Handle<Object> exports) {
-  NanScope();
-  Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
-  tpl->SetClassName(NanNew("ServerCredentials"));
+void ServerCredentials::Init(Local<Object> exports) {
+  Nan::HandleScope scope;
+  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+  tpl->SetClassName(Nan::New("ServerCredentials").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
-  NanAssignPersistent(fun_tpl, tpl);
-  Handle<Function> ctr = tpl->GetFunction();
-  ctr->Set(NanNew("createSsl"),
-           NanNew<FunctionTemplate>(CreateSsl)->GetFunction());
-  ctr->Set(NanNew("createInsecure"),
-           NanNew<FunctionTemplate>(CreateInsecure)->GetFunction());
-  constructor = new NanCallback(ctr);
-  exports->Set(NanNew("ServerCredentials"), ctr);
+  Local<Function> ctr = tpl->GetFunction();
+  Nan::Set(ctr, Nan::New("createSsl").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateSsl)).ToLocalChecked());
+  Nan::Set(ctr, Nan::New("createInsecure").ToLocalChecked(),
+           Nan::GetFunction(
+               Nan::New<FunctionTemplate>(CreateInsecure)).ToLocalChecked());
+  fun_tpl.Reset(tpl);
+  constructor = new Nan::Callback(ctr);
+  Nan::Set(exports, Nan::New("ServerCredentials").ToLocalChecked(), ctr);
 }
 
-bool ServerCredentials::HasInstance(Handle<Value> val) {
-  NanScope();
-  return NanHasInstance(fun_tpl, val);
+bool ServerCredentials::HasInstance(Local<Value> val) {
+  Nan::HandleScope scope;
+  return Nan::New(fun_tpl)->HasInstance(val);
 }
 
-Handle<Value> ServerCredentials::WrapStruct(
+Local<Value> ServerCredentials::WrapStruct(
     grpc_server_credentials *credentials) {
-  NanEscapableScope();
+  Nan::EscapableHandleScope scope;
   const int argc = 1;
-  Handle<Value> argv[argc] = {
-    NanNew<External>(reinterpret_cast<void *>(credentials))};
-  return NanEscapeScope(constructor->GetFunction()->NewInstance(argc, argv));
+  Local<Value> argv[argc] = {
+    Nan::New<External>(reinterpret_cast<void *>(credentials))};
+  MaybeLocal<Object> maybe_instance = Nan::NewInstance(
+      constructor->GetFunction(), argc, argv);
+  if (maybe_instance.IsEmpty()) {
+    return scope.Escape(Nan::Null());
+  } else {
+    return scope.Escape(maybe_instance.ToLocalChecked());
+  }
 }
 
 grpc_server_credentials *ServerCredentials::GetWrappedServerCredentials() {
@@ -100,96 +114,103 @@ grpc_server_credentials *ServerCredentials::GetWrappedServerCredentials() {
 }
 
 NAN_METHOD(ServerCredentials::New) {
-  NanScope();
-
-  if (args.IsConstructCall()) {
-    if (!args[0]->IsExternal()) {
-      return NanThrowTypeError(
+  if (info.IsConstructCall()) {
+    if (!info[0]->IsExternal()) {
+      return Nan::ThrowTypeError(
           "ServerCredentials can only be created with the provide functions");
     }
-    Handle<External> ext = args[0].As<External>();
+    Local<External> ext = info[0].As<External>();
     grpc_server_credentials *creds_value =
         reinterpret_cast<grpc_server_credentials *>(ext->Value());
     ServerCredentials *credentials = new ServerCredentials(creds_value);
-    credentials->Wrap(args.This());
-    NanReturnValue(args.This());
+    credentials->Wrap(info.This());
+    info.GetReturnValue().Set(info.This());
   } else {
     const int argc = 1;
-    Local<Value> argv[argc] = {args[0]};
-    NanReturnValue(constructor->GetFunction()->NewInstance(argc, argv));
+    Local<Value> argv[argc] = {info[0]};
+    MaybeLocal<Object> maybe_instance = constructor->GetFunction()->NewInstance(
+        argc, argv);
+    if (maybe_instance.IsEmpty()) {
+      // There's probably a pending exception
+      return;
+    } else {
+      info.GetReturnValue().Set(maybe_instance.ToLocalChecked());
+    }
   }
 }
 
 NAN_METHOD(ServerCredentials::CreateSsl) {
-  // TODO: have the node API support multiple key/cert pairs.
-  NanScope();
+  Nan::HandleScope scope;
   char *root_certs = NULL;
-  if (::node::Buffer::HasInstance(args[0])) {
-    root_certs = ::node::Buffer::Data(args[0]);
-  } else if (!(args[0]->IsNull() || args[0]->IsUndefined())) {
-    return NanThrowTypeError(
+  if (::node::Buffer::HasInstance(info[0])) {
+    root_certs = ::node::Buffer::Data(info[0]);
+  } else if (!(info[0]->IsNull() || info[0]->IsUndefined())) {
+    return Nan::ThrowTypeError(
         "createSSl's first argument must be a Buffer if provided");
   }
-  if (!args[1]->IsArray()) {
-    return NanThrowTypeError(
+  if (!info[1]->IsArray()) {
+    return Nan::ThrowTypeError(
         "createSsl's second argument must be a list of objects");
   }
   int force_client_auth = 0;
-  if (args[2]->IsBoolean()) {
-    force_client_auth = (int)args[2]->BooleanValue();
-  } else if (!(args[2]->IsUndefined() || args[2]->IsNull())) {
-    return NanThrowTypeError(
+  if (info[2]->IsBoolean()) {
+    force_client_auth = (int)Nan::To<bool>(info[2]).FromJust();
+  } else if (!(info[2]->IsUndefined() || info[2]->IsNull())) {
+    return Nan::ThrowTypeError(
         "createSsl's third argument must be a boolean if provided");
   }
-  Handle<Array> pair_list = Local<Array>::Cast(args[1]);
+  Local<Array> pair_list = Local<Array>::Cast(info[1]);
   uint32_t key_cert_pair_count = pair_list->Length();
   grpc_ssl_pem_key_cert_pair *key_cert_pairs = new grpc_ssl_pem_key_cert_pair[
       key_cert_pair_count];
 
-  Handle<String> key_key = NanNew("private_key");
-  Handle<String> cert_key = NanNew("cert_chain");
+  Local<String> key_key = Nan::New("private_key").ToLocalChecked();
+  Local<String> cert_key = Nan::New("cert_chain").ToLocalChecked();
 
   for(uint32_t i = 0; i < key_cert_pair_count; i++) {
-    if (!pair_list->Get(i)->IsObject()) {
+    Local<Value> pair_val = Nan::Get(pair_list, i).ToLocalChecked();
+    if (!pair_val->IsObject()) {
       delete key_cert_pairs;
-      return NanThrowTypeError("Key/cert pairs must be objects");
+      return Nan::ThrowTypeError("Key/cert pairs must be objects");
     }
-    Handle<Object> pair_obj = pair_list->Get(i)->ToObject();
-    if (!pair_obj->HasOwnProperty(key_key)) {
+    Local<Object> pair_obj = Nan::To<Object>(pair_val).ToLocalChecked();
+    MaybeLocal<Value> maybe_key = Nan::Get(pair_obj, key_key);
+    if (maybe_key.IsEmpty()) {
       delete key_cert_pairs;
-      return NanThrowTypeError(
+      return Nan::ThrowTypeError(
           "Key/cert pairs must have a private_key and a cert_chain");
     }
-    if (!pair_obj->HasOwnProperty(cert_key)) {
+    MaybeLocal<Value> maybe_cert = Nan::Get(pair_obj, cert_key);
+    if (maybe_cert.IsEmpty()) {
       delete key_cert_pairs;
-      return NanThrowTypeError(
+      return Nan::ThrowTypeError(
           "Key/cert pairs must have a private_key and a cert_chain");
     }
-    if (!::node::Buffer::HasInstance(pair_obj->Get(key_key))) {
+    if (!::node::Buffer::HasInstance(maybe_key.ToLocalChecked())) {
       delete key_cert_pairs;
-      return NanThrowTypeError("private_key must be a Buffer");
+      return Nan::ThrowTypeError("private_key must be a Buffer");
     }
-    if (!::node::Buffer::HasInstance(pair_obj->Get(cert_key))) {
+    if (!::node::Buffer::HasInstance(maybe_cert.ToLocalChecked())) {
       delete key_cert_pairs;
-      return NanThrowTypeError("cert_chain must be a Buffer");
+      return Nan::ThrowTypeError("cert_chain must be a Buffer");
     }
     key_cert_pairs[i].private_key = ::node::Buffer::Data(
-        pair_obj->Get(key_key));
+        maybe_key.ToLocalChecked());
     key_cert_pairs[i].cert_chain = ::node::Buffer::Data(
-        pair_obj->Get(cert_key));
+        maybe_cert.ToLocalChecked());
   }
   grpc_server_credentials *creds = grpc_ssl_server_credentials_create(
       root_certs, key_cert_pairs, key_cert_pair_count, force_client_auth, NULL);
   delete key_cert_pairs;
   if (creds == NULL) {
-    NanReturnNull();
+    info.GetReturnValue().SetNull();
+  } else {
+    info.GetReturnValue().Set(WrapStruct(creds));
   }
-  NanReturnValue(WrapStruct(creds));
 }
 
 NAN_METHOD(ServerCredentials::CreateInsecure) {
-  NanScope();
-  NanReturnValue(WrapStruct(NULL));
+  info.GetReturnValue().Set(WrapStruct(NULL));
 }
 
 }  // namespace node
diff --git a/src/node/ext/server_credentials.h b/src/node/ext/server_credentials.h
index 63903f663c613c244bfb8bd791b8245d272d0ec5..bf279e481c64ec3768ab5ff9d490cf023cc13737 100644
--- a/src/node/ext/server_credentials.h
+++ b/src/node/ext/server_credentials.h
@@ -43,12 +43,12 @@ namespace grpc {
 namespace node {
 
 /* Wrapper class for grpc_server_credentials structs */
-class ServerCredentials : public ::node::ObjectWrap {
+class ServerCredentials : public Nan::ObjectWrap {
  public:
-  static void Init(v8::Handle<v8::Object> exports);
-  static bool HasInstance(v8::Handle<v8::Value> val);
+  static void Init(v8::Local<v8::Object> exports);
+  static bool HasInstance(v8::Local<v8::Value> val);
   /* Wrap a grpc_server_credentials struct in a javascript object */
-  static v8::Handle<v8::Value> WrapStruct(grpc_server_credentials *credentials);
+  static v8::Local<v8::Value> WrapStruct(grpc_server_credentials *credentials);
 
   /* Returns the grpc_server_credentials struct that this object wraps */
   grpc_server_credentials *GetWrappedServerCredentials();
@@ -64,9 +64,9 @@ class ServerCredentials : public ::node::ObjectWrap {
   static NAN_METHOD(New);
   static NAN_METHOD(CreateSsl);
   static NAN_METHOD(CreateInsecure);
-  static NanCallback *constructor;
+  static Nan::Callback *constructor;
   // Used for typechecking instances of this javascript class
-  static v8::Persistent<v8::FunctionTemplate> fun_tpl;
+  static Nan::Persistent<v8::FunctionTemplate> fun_tpl;
 
   grpc_server_credentials *wrapped_credentials;
 };
diff --git a/src/node/interop/test.proto b/src/node/interop/test.proto
index d2c3f9befef6bf3e375062c353f16eb2266c66c8..24e67497fa66ba175f99eab6d0c28573eac0235d 100644
--- a/src/node/interop/test.proto
+++ b/src/node/interop/test.proto
@@ -45,7 +45,6 @@ service TestService {
   rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
-  // TODO(Issue 527): Describe required server behavior.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
 
   // One request followed by a sequence of responses (streamed download).
diff --git a/src/node/package.json b/src/node/package.json
index bb8987cc0d7615eb35044a54e471fd5c9a63c6b5..22f94757ce6c48ed7e638c25668a87d873889186 100644
--- a/src/node/package.json
+++ b/src/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "http://www.grpc.io/",
@@ -27,7 +27,7 @@
   "dependencies": {
     "bindings": "^1.2.0",
     "lodash": "^3.9.3",
-    "nan": "^1.5.0",
+    "nan": "^2.0.0",
     "protobufjs": "^4.0.0"
   },
   "devDependencies": {
diff --git a/src/node/src/server.js b/src/node/src/server.js
index b6f162adf85ccdcbb0029d742288c7e84b81feec..70b4a9d80e3589e8543816df842f702db0f4bfb4 100644
--- a/src/node/src/server.js
+++ b/src/node/src/server.js
@@ -276,6 +276,7 @@ function ServerWritableStream(call, serialize) {
 function _write(chunk, encoding, callback) {
   /* jshint validthis: true */
   var batch = {};
+  var self = this;
   if (!this.call.metadataSent) {
     batch[grpc.opType.SEND_INITIAL_METADATA] =
         (new Metadata())._getCoreRepresentation();
@@ -290,7 +291,7 @@ function _write(chunk, encoding, callback) {
   batch[grpc.opType.SEND_MESSAGE] = message;
   this.call.startBatch(batch, function(err, value) {
     if (err) {
-      this.emit('error', err);
+      self.emit('error', err);
       return;
     }
     callback();
@@ -305,6 +306,7 @@ ServerWritableStream.prototype._write = _write;
  */
 function sendMetadata(responseMetadata) {
   /* jshint validthis: true */
+  var self = this;
   if (!this.call.metadataSent) {
     this.call.metadataSent = true;
     var batch = [];
@@ -312,7 +314,7 @@ function sendMetadata(responseMetadata) {
         responseMetadata._getCoreRepresentation();
     this.call.startBatch(batch, function(err) {
       if (err) {
-        this.emit('error', err);
+        self.emit('error', err);
         return;
       }
     });
diff --git a/src/objective-c/examples/RemoteTestClient/test.proto b/src/objective-c/examples/RemoteTestClient/test.proto
index 2f5a5489b3dd26acec1a873645557a65e8f044d8..514c3b80955fc1c9cf97513d909df6923dd78d72 100644
--- a/src/objective-c/examples/RemoteTestClient/test.proto
+++ b/src/objective-c/examples/RemoteTestClient/test.proto
@@ -45,7 +45,6 @@ service TestService {
   rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
-  // TODO(Issue 527): Describe required server behavior.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
 
   // One request followed by a sequence of responses (streamed download).
diff --git a/src/objective-c/generated_libraries/RemoteTestClient/test.proto b/src/objective-c/generated_libraries/RemoteTestClient/test.proto
index 2f5a5489b3dd26acec1a873645557a65e8f044d8..514c3b80955fc1c9cf97513d909df6923dd78d72 100644
--- a/src/objective-c/generated_libraries/RemoteTestClient/test.proto
+++ b/src/objective-c/generated_libraries/RemoteTestClient/test.proto
@@ -45,7 +45,6 @@ service TestService {
   rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
-  // TODO(Issue 527): Describe required server behavior.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
 
   // One request followed by a sequence of responses (streamed download).
diff --git a/src/php/README.md b/src/php/README.md
index 51322c7526961855a75f7c1151fffbaac5c50780..a054258782d847a63e33227d791ee50097d6a3cf 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -5,7 +5,7 @@ This directory contains source code for PHP implementation of gRPC layered on sh
 
 #Status
 
-Alpha : Ready for early adopters
+Beta
 
 ## Environment
 
@@ -49,7 +49,7 @@ sudo apt-get install libgrpc-dev
 Install the gRPC PHP extension
 
 ```sh
-sudo pecl install grpc-alpha
+sudo pecl install grpc-beta
 ```
 
 **Mac OS X:**
@@ -96,7 +96,7 @@ $ sudo make install   # 'make' should have been run by core grpc
 Install the gRPC PHP extension
 
 ```sh
-$ sudo pecl install grpc-alpha
+$ sudo pecl install grpc-beta
 ```
 
 OR
@@ -109,15 +109,19 @@ $ make
 $ sudo make install
 ```
 
-In your php.ini file, add the line `extension=grpc.so` to load the extension
-at PHP startup.
+Add this line to your `php.ini` file, e.g. `/etc/php5/cli/php.ini`
+
+```sh
+extension=grpc.so
+```
 
 Install Composer
 
 ```sh
 $ cd grpc/src/php
 $ curl -sS https://getcomposer.org/installer | php
-$ php composer.phar install
+$ sudo mv composer.phar /usr/local/bin/composer
+$ composer install
 ```
 
 ## Unit Tests
@@ -164,6 +168,132 @@ $ cd grpc/src/php
 $ ./bin/run_gen_code_test.sh
 ```
 
+## Use the gRPC PHP extension with Apache
+
+Install `apache2`, in addition to `php5` above
+
+```sh
+$ sudo apt-get install apache2
+```
+
+Add this line to your `php.ini` file, e.g. `/etc/php5/apache2/php.ini`
+
+```sh
+extension=grpc.so
+```
+
+Restart apache
+
+```sh
+$ sudo service apache2 restart
+```
+
+Make sure the Node math server is still running, as above. 
+
+```sh
+$ cd grpc/src/node
+$ nodejs examples/math_server.js
+```
+
+Make sure you have run `composer install` to generate the `vendor/autoload.php` file
+
+```sh
+$ composer install
+```
+
+Make sure you have generated the client stub `math.php`
+
+```sh
+$ ./bin/generate_proto_php.sh
+```
+
+Copy the `math_client.php` file into your Apache document root, e.g.
+
+```sh
+$ cp tests/generated_code/math_client.php /var/www/html
+```
+
+You may have to fix the first two lines to point the includes to your installation:
+
+```php
+include 'vendor/autoload.php';
+include 'tests/generated_code/math.php';
+```
+
+Connect to `localhost/math_client.php` in your browser, or run this from command line:
+
+```sh
+$ curl localhost/math_client.php
+```
+
+## Use the gRPC PHP extension with Nginx/PHP-FPM
+
+Install `nginx` and `php5-fpm`, in addition to `php5` above
+
+```sh
+$ sudo apt-get install nginx php5-fpm
+```
+
+Add this line to your `php.ini` file, e.g. `/etc/php5/fpm/php.ini`
+
+```sh
+extension=grpc.so
+```
+
+Uncomment the following lines in your `/etc/nginx/sites-available/default` file:
+
+```
+location ~ \.php$ {
+    include snippets/fastcgi-php.conf;
+    fastcgi_pass unix:/var/run/php5-fpm.sock;
+}
+```
+
+Restart nginx and php-fpm
+
+```sh
+$ sudo service nginx restart
+$ sudo service php5-fpm restart
+```
+
+Make sure the Node math server is still running, as above. 
+
+```sh
+$ cd grpc/src/node
+$ nodejs examples/math_server.js
+```
+
+Make sure you have run `composer install` to generate the `vendor/autoload.php` file
+
+```sh
+$ composer install
+```
+
+Make sure you have generated the client stub `math.php`
+
+```sh
+$ ./bin/generate_proto_php.sh
+```
+
+Copy the `math_client.php` file into your Nginx document root, e.g.
+
+```sh
+$ cp tests/generated_code/math_client.php /var/www/html
+```
+
+You may have to fix the first two lines to point the includes to your installation:
+
+```php
+include 'vendor/autoload.php';
+include 'tests/generated_code/math.php';
+```
+
+Connect to `localhost/math_client.php` in your browser, or run this from command line:
+
+```sh
+$ curl localhost/math_client.php
+```
+
 [homebrew]:http://brew.sh
 [gRPC install script]:https://raw.githubusercontent.com/grpc/homebrew-grpc/master/scripts/install
 [Node]:https://github.com/grpc/grpc/tree/master/src/node/examples
diff --git a/src/php/bin/run_tests.sh b/src/php/bin/run_tests.sh
index 953f408ea8d4aa2bae5fd1dc4b4976c5c6242d7b..1fe68cdab4b05f41a2b557e20a045b2826993852 100755
--- a/src/php/bin/run_tests.sh
+++ b/src/php/bin/run_tests.sh
@@ -31,7 +31,11 @@
 # Loads the local shared library, and runs all of the test cases in tests/
 # against it
 set -e
-cd $(dirname $0)
+cd $(dirname $0)/../../..
+root=$(pwd)
+cd src/php/bin
 source ./determine_extension_dir.sh
+# in some jenkins macos machine, somehow the PHP build script can't find libgrpc.dylib
+export DYLD_LIBRARY_PATH=$root/libs/$config
 php $extension_dir $(which phpunit) -v --debug --strict \
   ../tests/unit_tests
diff --git a/src/php/tests/generated_code/math_client.php b/src/php/tests/generated_code/math_client.php
new file mode 100644
index 0000000000000000000000000000000000000000..7bc78287be80c527c991e50dc69b6483d4d1345a
--- /dev/null
+++ b/src/php/tests/generated_code/math_client.php
@@ -0,0 +1,102 @@
+<?php
+/*
+ *
+ * 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.
+ *
+ */
+
+# Fix the following two lines to point to your installation
+include 'vendor/autoload.php';
+include 'tests/generated_code/math.php';
+
+function p($line) {
+  print("$line<br/>\n");
+}
+
+$host = "localhost:50051";
+p("Connecting to host: $host");
+$client = new math\MathClient($host, []);
+p("Client class: ".get_class($client));
+p('');
+
+p("Running unary call test:");
+$dividend = 7;
+$divisor = 4;
+$div_arg = new math\DivArgs();
+$div_arg->setDividend($dividend);
+$div_arg->setDivisor($divisor);
+$call = $client->Div($div_arg);
+p("Call peer: ".$call->getPeer());
+p("Dividing $dividend by $divisor");
+list($response, $status) = $call->wait();
+p("quotient = ".$response->getQuotient());
+p("remainder = ".$response->getRemainder());
+p('');
+
+p("Running server streaming test:");
+$limit = 7;
+$fib_arg = new math\FibArgs();
+$fib_arg->setLimit($limit);
+$call = $client->Fib($fib_arg);
+$result_array = iterator_to_array($call->responses());
+$result = '';
+foreach ($result_array as $num) {
+  $result .= ' '.$num->getNum();
+}
+p("The first $limit Fibonacci numbers are:".$result);
+p('');
+
+p("Running client streaming test:");
+$call = $client->Sum();
+for ($i = 0; $i <= $limit; $i++) {
+  $num = new math\Num();
+  $num->setNum($i);
+  $call->write($num);
+}
+list($response, $status) = $call->wait();
+p(sprintf("The first %d positive integers sum to: %d",
+          $limit, $response->getNum()));
+p('');
+
+p("Running bidi-streaming test:");
+$call = $client->DivMany();
+for ($i = 0; $i < 7; $i++) {
+  $div_arg = new math\DivArgs();
+  $dividend = 2 * $i + 1;
+  $divisor = 3;
+  $div_arg->setDividend($dividend);
+  $div_arg->setDivisor($divisor);
+  $call->write($div_arg);
+  p("client writing: $dividend / $divisor");
+  $response = $call->read();
+  p(sprintf("server writing: quotient = %d, remainder = %d",
+            $response->getQuotient(), $response->getRemainder()));
+}
+$call->writesDone();
diff --git a/src/php/tests/interop/test.proto b/src/php/tests/interop/test.proto
index 39c08f3544a7758165b3fd3dabd364914ec5cc55..0d169e7f64082170b07007d03ca4a2b56ed7fe3f 100644
--- a/src/php/tests/interop/test.proto
+++ b/src/php/tests/interop/test.proto
@@ -44,7 +44,6 @@ service TestService {
   rpc EmptyCall(grpc.testing.EmptyMessage) returns (grpc.testing.EmptyMessage);
 
   // One request followed by one response.
-  // TODO(Issue 527): Describe required server behavior.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
 
   // One request followed by a sequence of responses (streamed download).
diff --git a/src/php/tests/unit_tests/EndToEndTest.php b/src/php/tests/unit_tests/EndToEndTest.php
index bd464f939fcb558a231b7ffb87525566f3e4ac87..b65366233ad2ad6d83509921b0f3201aef60fd8e 100755
--- a/src/php/tests/unit_tests/EndToEndTest.php
+++ b/src/php/tests/unit_tests/EndToEndTest.php
@@ -204,11 +204,11 @@ class EndToEndTest extends PHPUnit_Framework_TestCase{
   }
 
   public function testWatchConnectivityStateFailed() {
-    $idle_state = $this->channel->getConnectivityState(true);
+    $idle_state = $this->channel->getConnectivityState();
     $this->assertTrue($idle_state == Grpc\CHANNEL_IDLE);
 
     $now = Grpc\Timeval::now();
-    $delta = new Grpc\Timeval(1);
+    $delta = new Grpc\Timeval(500000); // should timeout
     $deadline = $now->add($delta);
 
     $this->assertFalse($this->channel->watchConnectivityState(
diff --git a/src/python/grpcio/grpc/beta/implementations.py b/src/python/grpcio/grpc/beta/implementations.py
index 9b461fb3ddf0bde844679fd28e12499098ef54b5..c9d64ad35a06561a8df50b03c7fbfda3419a54d0 100644
--- a/src/python/grpcio/grpc/beta/implementations.py
+++ b/src/python/grpcio/grpc/beta/implementations.py
@@ -147,7 +147,7 @@ def secure_channel(host, port, client_credentials):
     A secure Channel to the remote host through which RPCs may be conducted.
   """
   intermediary_low_channel = _intermediary_low.Channel(
-      '%s:%d' % (host, port), client_credentials.intermediary_low_credentials)
+      '%s:%d' % (host, port), client_credentials._intermediary_low_credentials)
   return Channel(intermediary_low_channel._internal, intermediary_low_channel)  # pylint: disable=protected-access
 
 
diff --git a/src/python/grpcio/requirements.txt b/src/python/grpcio/requirements.txt
index 608ba402e094aa65db61e990c34e58119408db6c..77356e0a747308a65c9e7d35616ca36e23983589 100644
--- a/src/python/grpcio/requirements.txt
+++ b/src/python/grpcio/requirements.txt
@@ -1,2 +1,2 @@
-enum34==1.0.4
-futures==2.2.0
+enum34>=1.0.4
+futures>=2.2.0
diff --git a/src/python/grpcio/setup.py b/src/python/grpcio/setup.py
index 151b2bfcb4d55fd64f092cb8d6c25f2de016e23e..8b87c09d5c222f63b050ac48c1691f96e43f5b85 100644
--- a/src/python/grpcio/setup.py
+++ b/src/python/grpcio/setup.py
@@ -87,9 +87,8 @@ _PACKAGE_DIRECTORIES = {
 }
 
 _INSTALL_REQUIRES = (
-    'enum34==1.0.4',
-    'futures==2.2.0',
-    'protobuf==3.0.0a3',
+    'enum34>=1.0.4',
+    'futures>=2.2.0',
 )
 
 _SETUP_REQUIRES = (
@@ -104,7 +103,7 @@ _COMMAND_CLASS = {
 
 setuptools.setup(
     name='grpcio',
-    version='0.11.0b0',
+    version='0.11.0b1',
     ext_modules=_EXTENSION_MODULES,
     packages=list(_PACKAGES),
     package_dir=_PACKAGE_DIRECTORIES,
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_future_invocation_asynchronous_event_service.py b/src/python/grpcio_test/grpc_test/framework/interfaces/face/_future_invocation_asynchronous_event_service.py
index 272a37f15f818c7cf81788eece97ec836fa0caf6..303273697558ef8203540ca0b29c38fc6fc250be 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_future_invocation_asynchronous_event_service.py
+++ b/src/python/grpcio_test/grpc_test/framework/interfaces/face/_future_invocation_asynchronous_event_service.py
@@ -72,6 +72,36 @@ class _PauseableIterator(object):
     return next(self._upstream)
 
 
+class _Callback(object):
+
+  def __init__(self):
+    self._condition = threading.Condition()
+    self._called = False
+    self._passed_future = None
+    self._passed_other_stuff = None
+
+  def __call__(self, *args, **kwargs):
+    with self._condition:
+      self._called = True
+      if args:
+        self._passed_future = args[0]
+      if 1 < len(args) or kwargs:
+        self._passed_other_stuff = tuple(args[1:]), dict(kwargs)
+      self._condition.notify_all()
+
+  def future(self):
+    with self._condition:
+      while True:
+        if self._passed_other_stuff is not None:
+          raise ValueError(
+              'Test callback passed unexpected values: %s',
+              self._passed_other_stuff)
+        elif self._called:
+          return self._passed_future
+        else:
+          self._condition.wait()
+
+
 class TestCase(test_coverage.Coverage, unittest.TestCase):
   """A test of the Face layer of RPC Framework.
 
@@ -112,12 +142,15 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.unary_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         request = test_messages.request()
+        callback = _Callback()
 
         response_future = self._invoker.future(group, method)(
             request, test_constants.LONG_TIMEOUT)
+        response_future.add_done_callback(callback)
         response = response_future.result()
 
         test_messages.verify(request, response, self)
+        self.assertIs(callback.future(), response_future)
 
   def testSuccessfulUnaryRequestStreamResponse(self):
     for (group, method), test_messages_sequence in (
@@ -137,15 +170,19 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
       for test_messages in test_messages_sequence:
         requests = test_messages.requests()
         request_iterator = _PauseableIterator(iter(requests))
+        callback = _Callback()
 
         # Use of a paused iterator of requests allows us to test that control is
         # returned to calling code before the iterator yields any requests.
         with request_iterator.pause():
           response_future = self._invoker.future(group, method)(
               request_iterator, test_constants.LONG_TIMEOUT)
-        response = response_future.result()
+          response_future.add_done_callback(callback)
+        future_passed_to_callback = callback.future()
+        response = future_passed_to_callback.result()
 
         test_messages.verify(requests, response, self)
+        self.assertIs(future_passed_to_callback, response_future)
 
   def testSuccessfulStreamRequestStreamResponse(self):
     for (group, method), test_messages_sequence in (
@@ -208,12 +245,15 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.unary_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         request = test_messages.request()
+        callback = _Callback()
 
         with self._control.pause():
           response_future = self._invoker.future(group, method)(
               request, test_constants.LONG_TIMEOUT)
+          response_future.add_done_callback(callback)
           cancel_method_return_value = response_future.cancel()
 
+        self.assertIs(callback.future(), response_future)
         self.assertFalse(cancel_method_return_value)
         self.assertTrue(response_future.cancelled())
 
@@ -236,12 +276,15 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.stream_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         requests = test_messages.requests()
+        callback = _Callback()
 
         with self._control.pause():
           response_future = self._invoker.future(group, method)(
               iter(requests), test_constants.LONG_TIMEOUT)
+          response_future.add_done_callback(callback)
           cancel_method_return_value = response_future.cancel()
 
+        self.assertIs(callback.future(), response_future)
         self.assertFalse(cancel_method_return_value)
         self.assertTrue(response_future.cancelled())
 
@@ -264,10 +307,13 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.unary_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         request = test_messages.request()
+        callback = _Callback()
 
         with self._control.pause():
           response_future = self._invoker.future(
               group, method)(request, _3069_test_constant.REALLY_SHORT_TIMEOUT)
+          response_future.add_done_callback(callback)
+          self.assertIs(callback.future(), response_future)
           self.assertIsInstance(
               response_future.exception(), face.ExpirationError)
           with self.assertRaises(face.ExpirationError):
@@ -290,10 +336,13 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.stream_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         requests = test_messages.requests()
+        callback = _Callback()
 
         with self._control.pause():
           response_future = self._invoker.future(group, method)(
               iter(requests), _3069_test_constant.REALLY_SHORT_TIMEOUT)
+          response_future.add_done_callback(callback)
+          self.assertIs(callback.future(), response_future)
           self.assertIsInstance(
               response_future.exception(), face.ExpirationError)
           with self.assertRaises(face.ExpirationError):
@@ -316,11 +365,14 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.unary_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         request = test_messages.request()
+        callback = _Callback()
 
         with self._control.fail():
           response_future = self._invoker.future(group, method)(
               request, _3069_test_constant.REALLY_SHORT_TIMEOUT)
+          response_future.add_done_callback(callback)
 
+          self.assertIs(callback.future(), response_future)
           # Because the servicer fails outside of the thread from which the
           # servicer-side runtime called into it its failure is
           # indistinguishable from simply not having called its
@@ -350,11 +402,14 @@ class TestCase(test_coverage.Coverage, unittest.TestCase):
         self._digest.stream_unary_messages_sequences.iteritems()):
       for test_messages in test_messages_sequence:
         requests = test_messages.requests()
+        callback = _Callback()
 
         with self._control.fail():
           response_future = self._invoker.future(group, method)(
               iter(requests), _3069_test_constant.REALLY_SHORT_TIMEOUT)
+          response_future.add_done_callback(callback)
 
+          self.assertIs(callback.future(), response_future)
           # Because the servicer fails outside of the thread from which the
           # servicer-side runtime called into it its failure is
           # indistinguishable from simply not having called its
diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio_test/setup.py
index 216119f0e7bb1ba44bc14667946f2ea5ac5a05e7..fe36bc9232ba6ae1dcb80a36bf77b4e5984dde79 100644
--- a/src/python/grpcio_test/setup.py
+++ b/src/python/grpcio_test/setup.py
@@ -72,6 +72,8 @@ _SETUP_REQUIRES = (
 _INSTALL_REQUIRES = (
     'oauth2client>=1.4.7',
     'grpcio>=0.11.0b0',
+    # TODO(issue 3321): Unpin protobuf dependency.
+    'protobuf==3.0.0a3',
 )
 
 _COMMAND_CLASS = {
diff --git a/templates/Makefile.template b/templates/Makefile.template
index d8370ce26892f96c3559dede4c185d9a4242ea80..978e7e704516e6f7826665cec077dce84d142c5e 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -65,8 +65,11 @@
   endif
 
 
+  MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
   ifndef BUILDDIR
-  BUILDDIR = .
+  BUILDDIR_ABSOLUTE = $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
+  else
+  BUILDDIR_ABSOLUTE = $(abspath $(BUILDDIR))
   endif
 
   HAS_GCC = $(shell which gcc > /dev/null 2> /dev/null && echo true || echo false)
@@ -92,10 +95,10 @@
   endif
 
 
-  BINDIR = $(BUILDDIR)/bins
-  OBJDIR = $(BUILDDIR)/objs
-  LIBDIR = $(BUILDDIR)/libs
-  GENDIR = $(BUILDDIR)/gens
+  BINDIR = $(BUILDDIR_ABSOLUTE)/bins
+  OBJDIR = $(BUILDDIR_ABSOLUTE)/objs
+  LIBDIR = $(BUILDDIR_ABSOLUTE)/libs
+  GENDIR = $(BUILDDIR_ABSOLUTE)/gens
 
   # Configurations
 
@@ -1599,13 +1602,13 @@
   	$(Q) $(AR) rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS)
   % if lib.get('baselib', False):
   % if lib.get('secure', 'check') == True:
-  	$(Q) rm -rf tmp-merge-${lib.name}
-  	$(Q) mkdir tmp-merge-${lib.name}
-  	$(Q) ( cd tmp-merge-${lib.name} ; $(AR) x ../$(LIBDIR)/$(CONFIG)/lib${lib.name}.a )
-  	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge-${lib.name} ; <%text>ar x ../$${l}</%text> ) ; done
-  	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/__.SYMDEF*
-  	$(Q) ar rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/*
-  	$(Q) rm -rf tmp-merge-${lib.name}
+  	$(Q) rm -rf $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}
+  	$(Q) mkdir $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}
+  	$(Q) ( cd $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} ; $(AR) x $(LIBDIR)/$(CONFIG)/lib${lib.name}.a )
+  	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} ; <%text>ar x $${l}</%text> ) ; done
+  	$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}/__.SYMDEF*
+  	$(Q) ar rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}/*
+  	$(Q) rm -rf $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}
   % endif
   % endif
   ifeq ($(SYSTEM),Darwin)
diff --git a/templates/grpc.gyp.template b/templates/grpc.gyp.template
new file mode 100644
index 0000000000000000000000000000000000000000..873606202a1d74a80d6b0f5b22f859750b63fe4b
--- /dev/null
+++ b/templates/grpc.gyp.template
@@ -0,0 +1,125 @@
+%YAML 1.2
+--- |
+  # GRPC gyp file
+  # This currently builds C code.
+  # This file has been automatically generated from a template file.
+  # Please look at the templates directory instead.
+  # This file can be regenerated from the template by running
+  # tools/buildgen/generate_projects.sh
+
+  # Copyright 2015, Google Inc.
+  # All rights reserved.
+  #
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions are
+  # met:
+  #
+  #     * Redistributions of source code must retain the above copyright
+  # notice, this list of conditions and the following disclaimer.
+  #     * Redistributions in binary form must reproduce the above
+  # copyright notice, this list of conditions and the following disclaimer
+  # in the documentation and/or other materials provided with the
+  # distribution.
+  #     * Neither the name of Google Inc. nor the names of its
+  # contributors may be used to endorse or promote products derived from
+  # this software without specific prior written permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  # Some of this file is built with the help of
+  # https://n8.io/converting-a-c-library-to-gyp/
+  {
+    # TODO: Finish windows support
+    'target_defaults': {
+      'default_configuration': 'Debug',
+      'configurations': {
+        'Debug': {
+          'defines': [ 'DEBUG', '_DEBUG' ],
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'RuntimeLibrary': 1, # static debug
+            },
+          },
+        },
+        'Release': {
+          'defines': [ 'NDEBUG' ],
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'RuntimeLibrary': 0, # static release
+            },
+          },
+        }
+      },
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'GenerateDebugInformation': 'true',
+        },
+      },
+      # TODO: Add fallback for Windows, and if pkg-config is not available
+      'defines': [
+        'TSI_OPENSSL_ALPN_SUPPORT=<!(pkg-config --atleast-version=1.0.2 openssl >/dev/null 2>&1 && echo 1 || echo 0)'
+      ],
+      'include_dirs': [
+        '.',
+        'include'
+      ],
+      # TODO: Check for libraries with pkg-config
+      'libraries': [
+        '-lcrypto',
+        '-lssl',
+        '-ldl',
+        '-lpthread',
+        '-lz'
+      ]
+    },
+    'targets': [
+      % for lib in libs:
+      # TODO: Add C++ targets
+      % if lib.language == 'c':
+      {
+        'target_name': '${lib.name}',
+        'product_prefix': 'lib',
+        'type': 'static_library',
+        'dependencies': [
+          % for dep in getattr(lib, 'deps', []):
+          '${dep}',
+          % endfor
+        ],
+        'sources': [
+          % for source in lib.src:
+          '${source}',
+          % endfor
+        ],
+      },
+      % endif
+      % endfor
+      % for tgt in targets:
+      % if tgt.language == 'c':
+      {
+        'target_name': '${tgt.name}',
+        'type': 'executable',
+        'dependencies': [
+          % for dep in getattr(tgt, 'deps', []):
+          '${dep}',
+          % endfor
+        ],
+        'sources': [
+          % for source in tgt.src:
+          '${source}',
+          % endfor
+        ]
+      },
+      % endif
+      % endfor
+    ]
+  }
diff --git a/test/core/bad_client/gen_build_yaml.py b/test/core/bad_client/gen_build_yaml.py
index 02dda10be0f4a377ceddffd4a17f65006a2e3f39..3df889ecdaf2ec0c0ed0d0b0a8a86ad0c474b07c 100755
--- a/test/core/bad_client/gen_build_yaml.py
+++ b/test/core/bad_client/gen_build_yaml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c
index 4e7c59569c27b3dd74ffa8fabe6efaab5969c95f..cbf4d031847fca096c6ca42b658c66bd691484fd 100644
--- a/test/core/client_config/lb_policies_test.c
+++ b/test/core/client_config/lb_policies_test.c
@@ -607,26 +607,53 @@ static void verify_rebirth_round_robin(const servers_fixture *f,
                                        const int *actual_connection_sequence,
                                        const size_t num_iters) {
   int *expected_connection_sequence;
-  size_t i;
+  size_t i, j, unique_seq_last_idx, unique_seq_first_idx;
   const size_t expected_seq_length = f->num_servers;
+  uint8_t *seen_elements;
 
   /* verify conn. seq. expectation */
-  /* get the first sequence of "num_servers" elements */
+  /* get the first unique run of length "num_servers". */
   expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length);
-  memcpy(expected_connection_sequence, actual_connection_sequence + 4,
+  seen_elements = gpr_malloc(sizeof(int) * expected_seq_length);
+
+  memset(seen_elements, 0, sizeof(uint8_t) * expected_seq_length);
+  for (i = 0; i < num_iters; i++) {
+    if (actual_connection_sequence[i] < 0 ||
+        seen_elements[actual_connection_sequence[i]] != 0) {
+      /* if anything breaks the uniqueness of the run, back to square zero */
+      memset(seen_elements, 0, sizeof(uint8_t) * expected_seq_length);
+      continue;
+    }
+    seen_elements[actual_connection_sequence[i]] = 1;
+    for (j = 0; j < expected_seq_length; j++) {
+      if (seen_elements[j] == 0) break;
+    }
+    if (j == expected_seq_length) { /* seen all the elements */
+      unique_seq_last_idx = i;
+      break;
+    }
+  }
+  /* make sure we found a valid run */
+  for (j = 0; j < expected_seq_length; j++) {
+      GPR_ASSERT (seen_elements[j] != 0);
+  }
+
+  unique_seq_first_idx = (unique_seq_last_idx - expected_seq_length + 1);
+  memcpy(expected_connection_sequence,
+         actual_connection_sequence + unique_seq_first_idx,
          sizeof(int) * expected_seq_length);
 
   /* first iteration succeeds */
   GPR_ASSERT(actual_connection_sequence[0] != -1);
+  /* then we fail for a while... */
+  GPR_ASSERT(actual_connection_sequence[1] == -1);
+  /* ... but should be up at "unique_seq_first_idx" */
+  GPR_ASSERT(actual_connection_sequence[unique_seq_first_idx] != -1);
 
-  /* back up on the third (or maybe fourth) iteration */
-  i = 3;
-  if (actual_connection_sequence[i] == -1) {
-    i = 4;
-  }
-  for (; i < num_iters; i++) {
+  for (j = 0, i = unique_seq_first_idx; i < num_iters; i++) {
     const int actual = actual_connection_sequence[i];
-    const int expected = expected_connection_sequence[i % expected_seq_length];
+    const int expected =
+        expected_connection_sequence[j++ % expected_seq_length];
     if (actual != expected) {
       gpr_log(GPR_ERROR, "FAILURE: expected %d, actual %d at iter %d", expected,
               actual, i);
@@ -640,6 +667,7 @@ static void verify_rebirth_round_robin(const servers_fixture *f,
   /* things are fine once the servers are brought back up */
   assert_channel_connectivity(client, 1, GRPC_CHANNEL_READY);
   gpr_free(expected_connection_sequence);
+  gpr_free(seen_elements);
 }
 
 int main(int argc, char **argv) {
diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py
index 46cdb80c86332058bda9ceb8a9709451a24a3edf..9988950a6e55500e911e9205f08bf1fe06b966df 100755
--- a/test/core/end2end/gen_build_yaml.py
+++ b/test/core/end2end/gen_build_yaml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/test/core/httpcli/test_server.py b/test/core/httpcli/test_server.py
index babfe84ddcaaa777fe71b5031005e0677ae210c8..4aaf5e30f8dbfbc9e61edff003284045e65d2279 100755
--- a/test/core/httpcli/test_server.py
+++ b/test/core/httpcli/test_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """Server for httpcli_test"""
 
diff --git a/test/proto/test.proto b/test/proto/test.proto
index 92aff23929c8bbc05981e43c4436c9fc9afb1b62..d3166a6540d73961d74b3d1ea20b2760eacdcae3 100644
--- a/test/proto/test.proto
+++ b/test/proto/test.proto
@@ -45,7 +45,6 @@ service TestService {
   rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
-  // TODO(Issue 527): Describe required server behavior.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
 
   // One request followed by a sequence of responses (streamed download).
diff --git a/third_party/protobuf b/third_party/protobuf
index 23408684b4d2bf1b25e14314413a14d542c18bc4..8fce8933649ce09c1661ff2b5b7f6eb79badd251 160000
--- a/third_party/protobuf
+++ b/third_party/protobuf
@@ -1 +1 @@
-Subproject commit 23408684b4d2bf1b25e14314413a14d542c18bc4
+Subproject commit 8fce8933649ce09c1661ff2b5b7f6eb79badd251
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index 939143c4cbc48648af3078e2b8772143071737ee..6c9c6b3749e9b0a2b127e34218ac3bd73bfa54dd 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/buildgen/mako_renderer.py b/tools/buildgen/mako_renderer.py
index abb8df2141ac33a2f63e06a05243e306fdd62257..f1b28d352e7e34d56cbab43b39fed792063dd22d 100755
--- a/tools/buildgen/mako_renderer.py
+++ b/tools/buildgen/mako_renderer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py
index 1d09ed42a572d553e8a0d2e198949dc44a48d1d9..fac2a5af09c171d37ff04e43176c46834e2f42df 100755
--- a/tools/distrib/check_copyright.py
+++ b/tools/distrib/check_copyright.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/env python2.7
 
 # Copyright 2015, Google Inc.
 # All rights reserved.
diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py
index 2acd3cc12f27e76749afd8bc2c02b7957805bc98..4ac8f9c64a847a1455b059bbced463db4f7be327 100755
--- a/tools/distrib/python/docgen.py
+++ b/tools/distrib/python/docgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/distrib/python/submit.py b/tools/distrib/python/submit.py
index 909ba563270ac5e0f70d566e65c9a06a20fbc28c..dffbefd5fe4cd1b0af5ac9737aff243cf3c47aba 100755
--- a/tools/distrib/python/submit.py
+++ b/tools/distrib/python/submit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/dockerfile/grpc_python/Dockerfile b/tools/dockerfile/grpc_python/Dockerfile
index aa29685beee06e2a2ae076cf57385137a704b7a6..bce35adc8b63453642ca2b763200200cb84359a5 100644
--- a/tools/dockerfile/grpc_python/Dockerfile
+++ b/tools/dockerfile/grpc_python/Dockerfile
@@ -40,28 +40,12 @@ RUN make install_c -j12 -C /var/local/git/grpc
 
 # Build Python GRPC
 RUN cd /var/local/git/grpc \
-  && pip install src/python/src \
-  && pip install src/python/interop
+  && pip install src/python/grpcio \
+  && pip install src/python/grpcio_test
 
 # Run Python GRPC's tests
-# TODO(nathaniel): It would be nice for these to be auto-discoverable?
 RUN cd /var/local/git/grpc \
-  && python2.7 -B -m grpc._adapter._blocking_invocation_inline_service_test \
-  && python2.7 -B -m grpc._adapter._c_test \
-  && python2.7 -B -m grpc._adapter._event_invocation_synchronous_event_service_test \
-  && python2.7 -B -m grpc._adapter._future_invocation_asynchronous_event_service_test \
-  && python2.7 -B -m grpc._adapter._links_test \
-  && python2.7 -B -m grpc._adapter._lonely_rear_link_test \
-  && python2.7 -B -m grpc._adapter._low_test \
-  && python2.7 -B -m grpc.early_adopter.implementations_test \
-  && python2.7 -B -m grpc.framework.base.implementations_test \
-  && python2.7 -B -m grpc.framework.face.blocking_invocation_inline_service_test \
-  && python2.7 -B -m grpc.framework.face.event_invocation_synchronous_event_service_test \
-  && python2.7 -B -m grpc.framework.face.future_invocation_asynchronous_event_service_test \
-  && python2.7 -B -m grpc.framework.foundation._later_test \
-  && python2.7 -B -m grpc.framework.foundation._logging_pool_test \
-  && python2.7 -B -m interop._insecure_interop_test \
-  && python2.7 -B -m interop._secure_interop_test
+  && python2.7 -B src/python/grpcio_test/setup.py test
 
 # Add a cacerts directory containing the Google root pem file, allowing the interop client to access the production test instance
 ADD cacerts cacerts
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile
index a900c9e8d122c80d23e0096a3909913e99c979a2..7248f974092b665f40a19b35b042f1f62e7bd79b 100644
--- a/tools/jenkins/grpc_jenkins_slave/Dockerfile
+++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update && apt-get install -y \
   gcc \
   gcc-multilib \
   git \
+  gyp \
   libc6 \
   libc6-dbg \
   libc6-dev \
diff --git a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
index 1d74856edfa8a06155629a0845926324bb0019b7..c1ff85c3ca1e9df179b710e9149c3103f8f3e3ba 100644
--- a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
+++ b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update && apt-get install -y \
   gcc \
   gcc-multilib \
   git \
+  gyp \
   libc6 \
   libc6-dbg \
   libc6-dev \
diff --git a/tools/profile_analyzer/profile_analyzer.py b/tools/profile_analyzer/profile_analyzer.py
index a78f84e5e6496b3aa450f5e36b30f0363da2057d..e5e9a28a92df18496ac59daa9371c95f3a3a6bb4 100755
--- a/tools/profile_analyzer/profile_analyzer.py
+++ b/tools/profile_analyzer/profile_analyzer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/run_tests/antagonist.py b/tools/run_tests/antagonist.py
index 111839ccf932073e78b7e9af99acd3d08521cf96..857addfb38658a80f344a75d7526f8c5a1cc5ba0 100755
--- a/tools/run_tests/antagonist.py
+++ b/tools/run_tests/antagonist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/run_tests/build_php.sh b/tools/run_tests/build_php.sh
index 2fad09e1c4db9d5c6e6cafe21b5cf26e2549ec6b..1d81779b6acd84a969bd14b9d5fe4f1c93374d5e 100755
--- a/tools/run_tests/build_php.sh
+++ b/tools/run_tests/build_php.sh
@@ -46,6 +46,3 @@ cd ext/grpc
 phpize
 ./configure --enable-grpc=$root
 make
-
-# in some jenkins macos machine, somehow the PHP build script can't find libgrpc.dylib
-export DYLD_LIBRARY_PATH=$(pwd)/libs/$config
diff --git a/tools/run_tests/port_server.py b/tools/run_tests/port_server.py
index acb6deaae67057c329f4278c13177fb36417b119..da76230ad5df5d09ddd0c98e1710efd8fd481d5a 100755
--- a/tools/run_tests/port_server.py
+++ b/tools/run_tests/port_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/run_sanity.sh
index c18160a891a6b0cc57224794d892fd76ee7257f9..4b367dcbc77cd96e845de01dd390c3edf1d03547 100755
--- a/tools/run_tests/run_sanity.sh
+++ b/tools/run_tests/run_sanity.sh
@@ -44,7 +44,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
  05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
  c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
  33dd08320648ac71d7d9d732be774ed3818dccc5 third_party/openssl (OpenSSL_1_0_2d)
- 23408684b4d2bf1b25e14314413a14d542c18bc4 third_party/protobuf (v3.0.0-alpha-1-1592-g2340868)
+ 8fce8933649ce09c1661ff2b5b7f6eb79badd251 third_party/protobuf (v3.0.0-alpha-4-1-g8fce893)
  50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 EOF
 
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index f7e9805393d217f80c6b67f064a47cd7ad8e13e0..a1d0376a4fa5a1cb6d3da285600bf724a7a8d148 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
@@ -120,6 +120,18 @@ class ValgrindConfig(object):
                           hash_targets=None)
 
 
+def get_c_tests(travis, test_lang) :
+  out = []
+  platforms_str = 'ci_platforms' if travis else 'platforms'
+  with open('tools/run_tests/tests.json') as f:
+    js = json.load(f)
+    return [tgt
+            for tgt in js
+            if tgt['language'] == test_lang and
+                platform_string() in tgt[platforms_str] and
+                not (travis and tgt['flaky'])]
+
+
 class CLanguage(object):
 
   def __init__(self, make_target, test_lang):
@@ -129,16 +141,9 @@ class CLanguage(object):
 
   def test_specs(self, config, travis):
     out = []
-    with open('tools/run_tests/tests.json') as f:
-      js = json.load(f)
-      platforms_str = 'ci_platforms' if travis else 'platforms'
-      binaries = [tgt
-                  for tgt in js
-                  if tgt['language'] == self.test_lang and
-                      config.build_config not in tgt['exclude_configs'] and
-                      platform_string() in tgt[platforms_str]]
+    binaries = get_c_tests(travis, self.test_lang)
     for target in binaries:
-      if travis and target['flaky']:
+      if config.build_config in target['exclude_configs']:
         continue
       if self.platform == 'windows':
         binary = 'vsprojects/%s/%s.exe' % (
@@ -157,9 +162,15 @@ class CLanguage(object):
       return ['buildtests_%s' % self.make_target]
     return ['buildtests_%s' % self.make_target, 'tools_%s' % self.make_target]
 
+  def pre_build_steps(self):
+    return []
+
   def build_steps(self):
     return []
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return True
 
@@ -167,18 +178,60 @@ class CLanguage(object):
     return self.make_target
 
 
+def gyp_test_paths(travis, config=None):
+  binaries = get_c_tests(travis, 'c')
+  out = []
+  for target in binaries:
+    if config is not None and config.build_config in target['exclude_configs']:
+        continue
+    binary = 'out/Debug/%s' % target['name']
+    out.append(binary)
+  return sorted(out)
+
+
+class GYPCLanguage(object):
+
+  def test_specs(self, config, travis):
+    return [config.job_spec([binary], [binary])
+            for binary in gyp_test_paths(travis, config)]
+
+  def pre_build_steps(self):
+    return [['gyp', '--depth=.', '--suffix=-gyp', 'grpc.gyp']]
+
+  def make_targets(self):
+    return gyp_test_paths(False)
+
+  def build_steps(self):
+    return []
+
+  def makefile_name(self):
+    return 'Makefile-gyp'
+
+  def supports_multi_config(self):
+    return False
+
+  def __str__(self):
+    return 'gyp'
+
+
 class NodeLanguage(object):
 
   def test_specs(self, config, travis):
     return [config.job_spec(['tools/run_tests/run_node.sh'], None,
                             environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['static_c', 'shared_c']
 
   def build_steps(self):
     return [['tools/run_tests/build_node.sh']]
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -192,12 +245,18 @@ class PhpLanguage(object):
     return [config.job_spec(['src/php/bin/run_tests.sh'], None,
                             environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['static_c', 'shared_c']
 
   def build_steps(self):
     return [['tools/run_tests/build_php.sh']]
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -221,6 +280,9 @@ class PythonLanguage(object):
         shortname='py.test',
     )]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['static_c', 'grpc_python_plugin', 'shared_c']
 
@@ -238,6 +300,9 @@ class PythonLanguage(object):
                        do_newline=True)
     return commands
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -251,12 +316,18 @@ class RubyLanguage(object):
     return [config.job_spec(['tools/run_tests/run_ruby.sh'], None,
                             environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['static_c']
 
   def build_steps(self):
     return [['tools/run_tests/build_ruby.sh']]
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -282,6 +353,9 @@ class CSharpLanguage(object):
             environ=_FORCE_ENVIRON_FOR_WRAPPERS)
             for assembly in assemblies]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     # For Windows, this target doesn't really build anything,
     # everything is build by buildall script later.
@@ -296,6 +370,9 @@ class CSharpLanguage(object):
     else:
       return [['tools/run_tests/build_csharp.sh']]
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -309,12 +386,18 @@ class ObjCLanguage(object):
     return [config.job_spec(['src/objective-c/tests/run_tests.sh'], None,
                             environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['grpc_objective_c_plugin', 'interop_server']
 
   def build_steps(self):
     return [['src/objective-c/tests/build_tests.sh']]
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -328,12 +411,18 @@ class Sanity(object):
     return [config.job_spec('tools/run_tests/run_sanity.sh', None),
             config.job_spec('tools/run_tests/check_sources_and_headers.py', None)]
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['run_dep_checks']
 
   def build_steps(self):
     return []
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return False
 
@@ -346,12 +435,18 @@ class Build(object):
   def test_specs(self, config, travis):
     return []
 
+  def pre_build_steps(self):
+    return []
+
   def make_targets(self):
     return ['static']
 
   def build_steps(self):
     return []
 
+  def makefile_name(self):
+    return 'Makefile'
+
   def supports_multi_config(self):
     return True
 
@@ -382,6 +477,7 @@ _DEFAULT = ['opt']
 _LANGUAGES = {
     'c++': CLanguage('cxx', 'c++'),
     'c': CLanguage('c', 'c'),
+    'gyp': GYPCLanguage(),
     'node': NodeLanguage(),
     'php': PhpLanguage(),
     'python': PythonLanguage(),
@@ -514,33 +610,41 @@ if len(build_configs) > 1:
       sys.exit(1)
 
 if platform.system() == 'Windows':
-  def make_jobspec(cfg, targets):
+  def make_jobspec(cfg, targets, makefile='Makefile'):
     extra_args = []
     # better do parallel compilation
     extra_args.extend(["/m"])
     # disable PDB generation: it's broken, and we don't need it during CI
     extra_args.extend(["/p:GenerateDebugInformation=false", "/p:DebugInformationFormat=None"])
     return [
-      jobset.JobSpec(['vsprojects\\build.bat', 
-                      'vsprojects\\%s.sln' % target, 
+      jobset.JobSpec(['vsprojects\\build.bat',
+                      'vsprojects\\%s.sln' % target,
                       '/p:Configuration=%s' % _WINDOWS_CONFIG[cfg]] +
                       extra_args,
                       shell=True, timeout_seconds=90*60)
       for target in targets]
 else:
-  def make_jobspec(cfg, targets):
+  def make_jobspec(cfg, targets, makefile='Makefile'):
     return [jobset.JobSpec([os.getenv('MAKE', 'make'),
+                            '-f', makefile,
                             '-j', '%d' % (multiprocessing.cpu_count() + 1),
                             'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' %
                                 args.slowdown,
                             'CONFIG=%s' % cfg] + targets,
                            timeout_seconds=30*60)]
+make_targets = {}
+for l in languages:
+  makefile = l.makefile_name()
+  make_targets[makefile] = make_targets.get(makefile, set()).union(
+      set(l.make_targets()))
 
-make_targets = list(set(itertools.chain.from_iterable(
-                                         l.make_targets() for l in languages)))
-build_steps = []
+build_steps = list(set(
+                   jobset.JobSpec(cmdline, environ={'CONFIG': cfg})
+                   for cfg in build_configs
+                   for l in languages
+                   for cmdline in l.pre_build_steps()))
 if make_targets:
-  make_commands = itertools.chain.from_iterable(make_jobspec(cfg, make_targets) for cfg in build_configs)
+  make_commands = itertools.chain.from_iterable(make_jobspec(cfg, list(targets), makefile) for cfg in build_configs for (makefile, targets) in make_targets.iteritems())
   build_steps.extend(set(make_commands))
 build_steps.extend(set(
                    jobset.JobSpec(cmdline, environ={'CONFIG': cfg})