diff --git a/build/fbcode_builder/manifests/mvfst b/build/fbcode_builder/manifests/mvfst
index 4f72a919..3fe11b33 100644
--- a/build/fbcode_builder/manifests/mvfst
+++ b/build/fbcode_builder/manifests/mvfst
@@ -25,7 +25,7 @@ folly
 fizz
 
 [dependencies.all(test=on, not(os=windows))]
-googletest_1_8
+googletest
 
 [shipit.pathmap]
 fbcode/quic/public_root = .
diff --git a/build/fbcode_builder/manifests/proxygen b/build/fbcode_builder/manifests/proxygen
index 5452a245..d9d337f1 100644
--- a/build/fbcode_builder/manifests/proxygen
+++ b/build/fbcode_builder/manifests/proxygen
@@ -32,7 +32,7 @@ wangle
 mvfst
 
 [dependencies.test=on]
-googletest_1_8
+googletest
 
 [shipit.pathmap]
 fbcode/proxygen/public_tld = .
diff --git a/server/test/HaskellProcessorTest.cpp b/server/test/HaskellProcessorTest.cpp
index 29f0e8d2..a95c73e9 100644
--- a/server/test/HaskellProcessorTest.cpp
+++ b/server/test/HaskellProcessorTest.cpp
@@ -31,18 +31,19 @@ struct MockResponseChannelRequest : public ResponseChannelRequest {
     return true;
   }
 
-  MOCK_METHOD3(
+  MOCK_METHOD(
+      void,
       sendReply,
-      void(
-          ResponsePayload&&,
-          MessageChannel::SendCallback*,
-          folly::Optional<uint32_t>));
+      (ResponsePayload&&,
+       MessageChannel::SendCallback*,
+       folly::Optional<uint32_t>));
 
-  MOCK_METHOD2(
+  MOCK_METHOD(
+      void,
       sendException,
-      void(ResponsePayload&&, MessageChannel::SendCallback*));
+      (ResponsePayload&&, MessageChannel::SendCallback*));
 
-  MOCK_METHOD2(sendErrorWrapped, void(folly::exception_wrapper, std::string));
+  MOCK_METHOD(void, sendErrorWrapped, (folly::exception_wrapper, std::string));
 
   bool active;
   size_t& destroyed;