diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go
index b4086b8d10e..f553385a999 100644
--- a/clientv3/integration/watch_test.go
+++ b/clientv3/integration/watch_test.go
@@ -607,6 +607,9 @@ func TestConfigurableWatchProgressNotifyInterval(t *testing.T) {
 }
 
 func TestWatchRequestProgress(t *testing.T) {
+	if integration.ThroughProxy {
+		t.Skip("grpc-proxy does not support WatchProgress yet")
+	}
 	testCases := []struct {
 		name     string
 		watchers []string
diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go
index 2479940c726..c64de0a2b73 100644
--- a/integration/cluster_direct.go
+++ b/integration/cluster_direct.go
@@ -23,7 +23,7 @@ import (
 	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
-const throughProxy = false
+const ThroughProxy = false
 
 func toGRPC(c *clientv3.Client) grpcAPI {
 	return grpcAPI{
diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go
index 080b55f9072..020a58f5fbc 100644
--- a/integration/cluster_proxy.go
+++ b/integration/cluster_proxy.go
@@ -26,7 +26,7 @@ import (
 	"go.etcd.io/etcd/proxy/grpcproxy/adapter"
 )
 
-const throughProxy = true
+const ThroughProxy = true
 
 var (
 	pmu     sync.Mutex
diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go
index ccc3f9a5614..ec2139a9a6c 100644
--- a/integration/v3_watch_test.go
+++ b/integration/v3_watch_test.go
@@ -1242,7 +1242,7 @@ func TestV3WatchCancellation(t *testing.T) {
 	}
 
 	var expected string
-	if throughProxy {
+	if ThroughProxy {
 		// grpc proxy has additional 2 watches open
 		expected = "3"
 	} else {
diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go
index 770941b8de9..4493319109e 100644
--- a/proxy/grpcproxy/watch.go
+++ b/proxy/grpcproxy/watch.go
@@ -262,7 +262,8 @@ func (wps *watchProxyStream) recvLoop() error {
 		case *pb.WatchRequest_CancelRequest:
 			wps.delete(uv.CancelRequest.WatchId)
 		default:
-			panic("not implemented")
+			// Panic or Fatalf would allow network clients to crash the serve remotely.
+			//panic("not implemented")
 		}
 	}
 }