diff --git a/common/platform/api/quiche_epoll_test_tools.h b/common/platform/api/quiche_epoll_test_tools.h
new file mode 100644
index 0000000..998ed83
--- /dev/null
+++ b/common/platform/api/quiche_epoll_test_tools.h
@@ -0,0 +1,16 @@
+// Copyright (c) 2019 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_COMMON_PLATFORM_API_QUICHE_EPOLL_TEST_TOOLS_H_
+#define QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_TEST_TOOLS_H_
+
+#include "quiche_platform_impl/quiche_epoll_test_tools_impl.h"
+
+namespace quiche {
+
+using QuicheFakeEpollServer = QuicheFakeEpollServerImpl;
+
+}  // namespace quiche
+
+#endif  // QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_TEST_TOOLS_H_
diff --git a/quic/core/quic_epoll_alarm_factory_test.cc b/quic/core/quic_epoll_alarm_factory_test.cc
index c59f2be..976469b 100644
--- a/quic/core/quic_epoll_alarm_factory_test.cc
+++ b/quic/core/quic_epoll_alarm_factory_test.cc
@@ -5,8 +5,8 @@
 #include "quic/core/quic_epoll_alarm_factory.h"
 
 #include "quic/core/quic_epoll_clock.h"
-#include "quic/platform/api/quic_epoll_test_tools.h"
 #include "quic/platform/api/quic_test.h"
+#include "common/platform/api/quiche_epoll_test_tools.h"
 
 namespace quic {
 namespace test {
@@ -36,7 +36,7 @@
 
   const QuicEpollClock clock_;
   QuicEpollAlarmFactory alarm_factory_;
-  QuicFakeEpollServer epoll_server_;
+  quiche::QuicheFakeEpollServer epoll_server_;
   QuicConnectionArena arena_;
 };
 
diff --git a/quic/core/quic_epoll_clock_test.cc b/quic/core/quic_epoll_clock_test.cc
index 2964dfb..cbe8123 100644
--- a/quic/core/quic_epoll_clock_test.cc
+++ b/quic/core/quic_epoll_clock_test.cc
@@ -4,8 +4,8 @@
 
 #include "quic/core/quic_epoll_clock.h"
 
-#include "quic/platform/api/quic_epoll_test_tools.h"
 #include "quic/platform/api/quic_test.h"
+#include "common/platform/api/quiche_epoll_test_tools.h"
 
 namespace quic {
 namespace test {
@@ -13,7 +13,7 @@
 class QuicEpollClockTest : public QuicTest {};
 
 TEST_F(QuicEpollClockTest, ApproximateNowInUsec) {
-  QuicFakeEpollServer epoll_server;
+  quiche::QuicheFakeEpollServer epoll_server;
   QuicEpollClock clock(&epoll_server);
 
   epoll_server.set_now_in_usec(1000000);
@@ -34,7 +34,7 @@
 }
 
 TEST_F(QuicEpollClockTest, NowInUsec) {
-  QuicFakeEpollServer epoll_server;
+  quiche::QuicheFakeEpollServer epoll_server;
   QuicEpollClock clock(&epoll_server);
 
   epoll_server.set_now_in_usec(1000000);
@@ -123,7 +123,7 @@
 }
 
 TEST_F(QuicEpollClockTest, MonotonicityWithFakeEpollClock) {
-  QuicFakeEpollServer epoll_server;
+  quiche::QuicheFakeEpollServer epoll_server;
   QuicEpollClock clock(&epoll_server);
 
   epoll_server.set_now_in_usec(100);
diff --git a/quic/core/quic_epoll_connection_helper_test.cc b/quic/core/quic_epoll_connection_helper_test.cc
index b50ce6d..6965cd2 100644
--- a/quic/core/quic_epoll_connection_helper_test.cc
+++ b/quic/core/quic_epoll_connection_helper_test.cc
@@ -5,8 +5,8 @@
 #include "quic/core/quic_epoll_connection_helper.h"
 
 #include "quic/core/crypto/quic_random.h"
-#include "quic/platform/api/quic_epoll_test_tools.h"
 #include "quic/platform/api/quic_test.h"
+#include "common/platform/api/quiche_epoll_test_tools.h"
 
 namespace quic {
 namespace test {
@@ -17,7 +17,7 @@
   QuicEpollConnectionHelperTest()
       : helper_(&epoll_server_, QuicAllocator::BUFFER_POOL) {}
 
-  QuicFakeEpollServer epoll_server_;
+  quiche::QuicheFakeEpollServer epoll_server_;
   QuicEpollConnectionHelper helper_;
 };
 
diff --git a/quic/platform/api/quic_epoll_test_tools.h b/quic/platform/api/quic_epoll_test_tools.h
deleted file mode 100644
index a7c2ce3..0000000
--- a/quic/platform/api/quic_epoll_test_tools.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2019 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_PLATFORM_API_QUIC_EPOLL_TEST_TOOLS_H_
-#define QUICHE_QUIC_PLATFORM_API_QUIC_EPOLL_TEST_TOOLS_H_
-
-#include "net/quic/platform/impl/quic_epoll_test_tools_impl.h"
-
-using QuicFakeEpollServer = QuicFakeEpollServerImpl;
-
-#endif  // QUICHE_QUIC_PLATFORM_API_QUIC_EPOLL_TEST_TOOLS_H_