diff --git a/quic/api/test/QuicTransportFunctionsTest.cpp b/quic/api/test/QuicTransportFunctionsTest.cpp
index c476503b5..e928c7d08 100644
--- a/quic/api/test/QuicTransportFunctionsTest.cpp
+++ b/quic/api/test/QuicTransportFunctionsTest.cpp
@@ -9,12 +9,12 @@
 #include <quic/api/QuicTransportFunctions.h>
 
 #include <folly/io/async/test/MockAsyncUDPSocket.h>
-#include <quic/api/test/MockQuicStats.h>
 #include <quic/api/test/Mocks.h>
 #include <quic/common/test/TestUtils.h>
 #include <quic/logging/FileQLogger.h>
 #include <quic/logging/QLoggerConstants.h>
 #include <quic/server/state/ServerStateMachine.h>
+#include <quic/state/test/MockQuicStats.h>
 #include <quic/state/test/Mocks.h>
 
 #include <gtest/gtest.h>
diff --git a/quic/flowcontrol/test/QuicFlowControlTest.cpp b/quic/flowcontrol/test/QuicFlowControlTest.cpp
index 5472fef17..1a87dbe45 100644
--- a/quic/flowcontrol/test/QuicFlowControlTest.cpp
+++ b/quic/flowcontrol/test/QuicFlowControlTest.cpp
@@ -6,10 +6,10 @@
  *
  */
 
-#include <quic/api/test/MockQuicStats.h>
 #include <quic/client/state/ClientStateMachine.h>
 #include <quic/common/test/TestUtils.h>
 #include <quic/flowcontrol/QuicFlowController.h>
+#include <quic/state/test/MockQuicStats.h>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/quic/loss/test/QuicLossFunctionsTest.cpp b/quic/loss/test/QuicLossFunctionsTest.cpp
index 0691ebe51..640ad7303 100644
--- a/quic/loss/test/QuicLossFunctionsTest.cpp
+++ b/quic/loss/test/QuicLossFunctionsTest.cpp
@@ -12,7 +12,6 @@
 #include <folly/io/async/test/MockAsyncUDPSocket.h>
 #include <folly/io/async/test/MockTimeoutManager.h>
 #include <quic/api/QuicTransportFunctions.h>
-#include <quic/api/test/MockQuicStats.h>
 #include <quic/client/handshake/FizzClientQuicHandshakeContext.h>
 #include <quic/client/state/ClientStateMachine.h>
 #include <quic/codec/DefaultConnectionIdAlgo.h>
@@ -21,6 +20,7 @@
 #include <quic/loss/QuicLossFunctions.h>
 #include <quic/server/state/ServerStateMachine.h>
 #include <quic/state/stream/StreamSendHandlers.h>
+#include <quic/state/test/MockQuicStats.h>
 #include <quic/state/test/Mocks.h>
 
 using namespace folly::test;
diff --git a/quic/server/test/QuicServerTest.cpp b/quic/server/test/QuicServerTest.cpp
index 23be2f4c2..d147a12ab 100644
--- a/quic/server/test/QuicServerTest.cpp
+++ b/quic/server/test/QuicServerTest.cpp
@@ -13,7 +13,6 @@
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 #include <quic/api/test/MockQuicSocket.h>
-#include <quic/api/test/MockQuicStats.h>
 #include <quic/api/test/Mocks.h>
 #include <quic/codec/DefaultConnectionIdAlgo.h>
 #include <quic/codec/QuicHeaderCodec.h>
@@ -21,6 +20,7 @@
 #include <quic/common/test/TestUtils.h>
 #include <quic/server/handshake/StatelessResetGenerator.h>
 #include <quic/server/test/Mocks.h>
+#include <quic/state/test/MockQuicStats.h>
 
 using namespace testing;
 using namespace folly;
diff --git a/quic/server/test/QuicServerTransportTest.cpp b/quic/server/test/QuicServerTransportTest.cpp
index 30adfb874..6a387a197 100644
--- a/quic/server/test/QuicServerTransportTest.cpp
+++ b/quic/server/test/QuicServerTransportTest.cpp
@@ -12,7 +12,6 @@
 #include <gtest/gtest.h>
 
 #include <quic/api/QuicTransportFunctions.h>
-#include <quic/api/test/MockQuicStats.h>
 #include <quic/api/test/Mocks.h>
 #include <quic/codec/DefaultConnectionIdAlgo.h>
 #include <quic/codec/QuicPacketBuilder.h>
@@ -24,6 +23,7 @@
 #include <quic/server/handshake/ServerHandshake.h>
 #include <quic/server/test/Mocks.h>
 #include <quic/state/QuicStreamFunctions.h>
+#include <quic/state/test/MockQuicStats.h>
 
 #include <folly/io/async/test/MockAsyncUDPSocket.h>
 
diff --git a/quic/api/test/MockQuicStats.h b/quic/state/test/MockQuicStats.h
similarity index 100%
rename from quic/api/test/MockQuicStats.h
rename to quic/state/test/MockQuicStats.h