diff --git a/build/source_list.bzl b/build/source_list.bzl
index 225a563..deb4866 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -1026,7 +1026,6 @@
     "epoll_server/platform/api/epoll_expect_bug.h",
     "epoll_server/platform/api/epoll_test.h",
     "quic/bindings/quic_libevent.h",
-    "quic/test_tools/quic_client_peer.h",
     "quic/test_tools/quic_mock_syscall_wrapper.h",
     "quic/test_tools/quic_server_peer.h",
     "quic/test_tools/quic_test_client.h",
@@ -1036,7 +1035,6 @@
 epoll_test_support_srcs = [
     "epoll_server/fake_simple_epoll_server.cc",
     "quic/bindings/quic_libevent.cc",
-    "quic/test_tools/quic_client_peer.cc",
     "quic/test_tools/quic_mock_syscall_wrapper.cc",
     "quic/test_tools/quic_server_peer.cc",
     "quic/test_tools/quic_test_client.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index de22a2a..fbcb0c4 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -1026,7 +1026,6 @@
     "src/quiche/epoll_server/platform/api/epoll_expect_bug.h",
     "src/quiche/epoll_server/platform/api/epoll_test.h",
     "src/quiche/quic/bindings/quic_libevent.h",
-    "src/quiche/quic/test_tools/quic_client_peer.h",
     "src/quiche/quic/test_tools/quic_mock_syscall_wrapper.h",
     "src/quiche/quic/test_tools/quic_server_peer.h",
     "src/quiche/quic/test_tools/quic_test_client.h",
@@ -1036,7 +1035,6 @@
 epoll_test_support_srcs = [
     "src/quiche/epoll_server/fake_simple_epoll_server.cc",
     "src/quiche/quic/bindings/quic_libevent.cc",
-    "src/quiche/quic/test_tools/quic_client_peer.cc",
     "src/quiche/quic/test_tools/quic_mock_syscall_wrapper.cc",
     "src/quiche/quic/test_tools/quic_server_peer.cc",
     "src/quiche/quic/test_tools/quic_test_client.cc",
diff --git a/build/source_list.json b/build/source_list.json
index 7c929bf..dffd3bd 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -1025,7 +1025,6 @@
     "quiche/epoll_server/platform/api/epoll_expect_bug.h",
     "quiche/epoll_server/platform/api/epoll_test.h",
     "quiche/quic/bindings/quic_libevent.h",
-    "quiche/quic/test_tools/quic_client_peer.h",
     "quiche/quic/test_tools/quic_mock_syscall_wrapper.h",
     "quiche/quic/test_tools/quic_server_peer.h",
     "quiche/quic/test_tools/quic_test_client.h",
@@ -1035,7 +1034,6 @@
   "epoll_test_support_srcs": [
     "quiche/epoll_server/fake_simple_epoll_server.cc",
     "quiche/quic/bindings/quic_libevent.cc",
-    "quiche/quic/test_tools/quic_client_peer.cc",
     "quiche/quic/test_tools/quic_mock_syscall_wrapper.cc",
     "quiche/quic/test_tools/quic_server_peer.cc",
     "quiche/quic/test_tools/quic_test_client.cc",
diff --git a/quiche/quic/core/http/end_to_end_test.cc b/quiche/quic/core/http/end_to_end_test.cc
index f1db1c4..c0c31de 100644
--- a/quiche/quic/core/http/end_to_end_test.cc
+++ b/quiche/quic/core/http/end_to_end_test.cc
@@ -47,7 +47,6 @@
 #include "quiche/quic/test_tools/packet_reordering_writer.h"
 #include "quiche/quic/test_tools/qpack/qpack_encoder_peer.h"
 #include "quiche/quic/test_tools/qpack/qpack_test_utils.h"
-#include "quiche/quic/test_tools/quic_client_peer.h"
 #include "quiche/quic/test_tools/quic_client_session_cache_peer.h"
 #include "quiche/quic/test_tools/quic_config_peer.h"
 #include "quiche/quic/test_tools/quic_connection_peer.h"
diff --git a/quiche/quic/test_tools/quic_client_peer.cc b/quiche/quic/test_tools/quic_client_peer.cc
deleted file mode 100644
index 0b58e22..0000000
--- a/quiche/quic/test_tools/quic_client_peer.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "quiche/quic/test_tools/quic_client_peer.h"
-
-#include "quiche/quic/tools/quic_client.h"
-
-namespace quic {
-namespace test {
-
-// static
-bool QuicClientPeer::CreateUDPSocketAndBind(QuicClient* client) {
-  return client->network_helper()->CreateUDPSocketAndBind(
-      client->server_address(), client->bind_to_address(),
-      client->local_port());
-}
-
-// static
-void QuicClientPeer::CleanUpUDPSocket(QuicClient* client, int fd) {
-  client->epoll_network_helper()->CleanUpUDPSocket(fd);
-}
-
-// static
-void QuicClientPeer::SetClientPort(QuicClient* client, int port) {
-  client->epoll_network_helper()->SetClientPort(port);
-}
-
-// static
-void QuicClientPeer::SetWriter(QuicClient* client, QuicPacketWriter* writer) {
-  client->set_writer(writer);
-}
-
-}  // namespace test
-}  // namespace quic
diff --git a/quiche/quic/test_tools/quic_client_peer.h b/quiche/quic/test_tools/quic_client_peer.h
deleted file mode 100644
index 7070779..0000000
--- a/quiche/quic/test_tools/quic_client_peer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef QUICHE_QUIC_TEST_TOOLS_QUIC_CLIENT_PEER_H_
-#define QUICHE_QUIC_TEST_TOOLS_QUIC_CLIENT_PEER_H_
-
-namespace quic {
-
-class QuicClient;
-class QuicPacketWriter;
-
-namespace test {
-
-class QuicClientPeer {
- public:
-  QuicClientPeer() = delete;
-
-  static bool CreateUDPSocketAndBind(QuicClient* client);
-  static void CleanUpUDPSocket(QuicClient* client, int fd);
-  static void SetClientPort(QuicClient* client, int port);
-  static void SetWriter(QuicClient* client, QuicPacketWriter* writer);
-};
-
-}  // namespace test
-}  // namespace quic
-
-#endif  // QUICHE_QUIC_TEST_TOOLS_QUIC_CLIENT_PEER_H_
diff --git a/quiche/quic/test_tools/quic_test_client.cc b/quiche/quic/test_tools/quic_test_client.cc
index 32b61ed..2d6de0d 100644
--- a/quiche/quic/test_tools/quic_test_client.cc
+++ b/quiche/quic/test_tools/quic_test_client.cc
@@ -23,7 +23,6 @@
 #include "quiche/quic/platform/api/quic_logging.h"
 #include "quiche/quic/platform/api/quic_stack_trace.h"
 #include "quiche/quic/test_tools/crypto_test_utils.h"
-#include "quiche/quic/test_tools/quic_client_peer.h"
 #include "quiche/quic/test_tools/quic_connection_peer.h"
 #include "quiche/quic/test_tools/quic_spdy_session_peer.h"
 #include "quiche/quic/test_tools/quic_spdy_stream_peer.h"
diff --git a/quiche/quic/tools/quic_client.h b/quiche/quic/tools/quic_client.h
index e878a8e..fc7c62f 100644
--- a/quiche/quic/tools/quic_client.h
+++ b/quiche/quic/tools/quic_client.h
@@ -77,9 +77,6 @@
 
   QuicClientEpollNetworkHelper* epoll_network_helper();
   const QuicClientEpollNetworkHelper* epoll_network_helper() const;
-
- private:
-  friend class test::QuicClientPeer;
 };
 
 }  // namespace quic
diff --git a/quiche/quic/tools/quic_client_test.cc b/quiche/quic/tools/quic_client_test.cc
index 5c3aec6..c3de889 100644
--- a/quiche/quic/tools/quic_client_test.cc
+++ b/quiche/quic/tools/quic_client_test.cc
@@ -16,8 +16,6 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/platform/api/quic_test_loopback.h"
 #include "quiche/quic/test_tools/crypto_test_utils.h"
-#include "quiche/quic/test_tools/quic_client_peer.h"
-#include "quiche/common/quiche_text_utils.h"
 
 namespace quic {
 namespace test {
@@ -117,15 +115,19 @@
   EXPECT_EQ(number_of_open_fds + 1, NumOpenSocketFDs());
 
   // Create more UDP sockets.
-  EXPECT_TRUE(QuicClientPeer::CreateUDPSocketAndBind(client.get()));
+  EXPECT_TRUE(client->network_helper()->CreateUDPSocketAndBind(
+      client->server_address(), client->bind_to_address(),
+      client->local_port()));
   EXPECT_EQ(number_of_open_fds + 2, NumOpenSocketFDs());
-  EXPECT_TRUE(QuicClientPeer::CreateUDPSocketAndBind(client.get()));
+  EXPECT_TRUE(client->network_helper()->CreateUDPSocketAndBind(
+      client->server_address(), client->bind_to_address(),
+      client->local_port()));
   EXPECT_EQ(number_of_open_fds + 3, NumOpenSocketFDs());
 
   // Clean up UDP sockets.
-  QuicClientPeer::CleanUpUDPSocket(client.get(), client->GetLatestFD());
+  client->epoll_network_helper()->CleanUpUDPSocket(client->GetLatestFD());
   EXPECT_EQ(number_of_open_fds + 2, NumOpenSocketFDs());
-  QuicClientPeer::CleanUpUDPSocket(client.get(), client->GetLatestFD());
+  client->epoll_network_helper()->CleanUpUDPSocket(client->GetLatestFD());
   EXPECT_EQ(number_of_open_fds + 1, NumOpenSocketFDs());
 }
 
diff --git a/quiche/quic/tools/quic_default_client_test.cc b/quiche/quic/tools/quic_default_client_test.cc
index 78f6c49..d58a24a 100644
--- a/quiche/quic/tools/quic_default_client_test.cc
+++ b/quiche/quic/tools/quic_default_client_test.cc
@@ -22,7 +22,6 @@
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/platform/api/quic_test_loopback.h"
 #include "quiche/quic/test_tools/crypto_test_utils.h"
-#include "quiche/quic/test_tools/quic_client_peer.h"
 #include "quiche/common/quiche_text_utils.h"
 
 namespace quic {