diff --git a/xplat/FlipperTestLib/FlipperConnectionMock.h b/xplat/FlipperTestLib/FlipperConnectionMock.h
index ae168e27e..f1bb14b9b 100644
--- a/xplat/FlipperTestLib/FlipperConnectionMock.h
+++ b/xplat/FlipperTestLib/FlipperConnectionMock.h
@@ -1,15 +1,14 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
-
 #pragma once
 
 #include <Flipper/FlipperConnection.h>
 #include <map>
+#include <queue>
 #include <string>
 
 namespace facebook {
@@ -19,6 +18,7 @@ class FlipperConnectionMock : public FlipperConnection {
  public:
   void send(const std::string& method, const folly::dynamic& params) override {
     sent_[method] = params;
+    sent_message_history[method].push(params);
   }
 
   void receive(const std::string& method, const FlipperReceiver& receiver)
@@ -31,6 +31,8 @@ class FlipperConnectionMock : public FlipperConnection {
 
   std::map<std::string, folly::dynamic> sent_;
   std::map<std::string, FlipperReceiver> receivers_;
+
+  std::map<std::string, std::queue<folly::dynamic>> sent_message_history;
 };
 
 } // namespace flipper