diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_registry_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_registry_test.cc
index e396538d78..b655887b50 100644
--- a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_registry_test.cc
+++ b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_registry_test.cc
@@ -33,9 +33,9 @@ namespace {
 
 class MockFactory : public TensorAggregatorFactory {
   MOCK_METHOD(StatusOr<std::unique_ptr<TensorAggregator>>, Create,
-              (const Intrinsic&), (const override));
+              (const Intrinsic&), (const, override));
   MOCK_METHOD(StatusOr<std::unique_ptr<TensorAggregator>>, Deserialize,
-              (const Intrinsic&, std::string), (const override));
+              (const Intrinsic&, std::string), (const, override));
 };
 
 REGISTER_AGGREGATOR_FACTORY("foobar", MockFactory);
diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_data_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_data_test.cc
index 59601d6afa..0ec2523b3a 100644
--- a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_data_test.cc
+++ b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_data_test.cc
@@ -33,8 +33,8 @@ class MockTensorData : public TensorData {
  public:
   MockTensorData(size_t data_pointer_offset, size_t size);
 
-  MOCK_METHOD(const void*, data, (), (const override));
-  MOCK_METHOD(size_t, byte_size, (), (const override));
+  MOCK_METHOD(const void*, data, (), (const, override));
+  MOCK_METHOD(size_t, byte_size, (), (const, override));
 };
 
 MockTensorData::MockTensorData(size_t data_pointer_offset, size_t size) {
diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc
index 7bbee8c158..6663e8504c 100644
--- a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc
+++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc
@@ -45,9 +45,9 @@ using testing::SizeIs;
 
 class MockFactory : public TensorAggregatorFactory {
   MOCK_METHOD(StatusOr<std::unique_ptr<TensorAggregator>>, Create,
-              (const Intrinsic&), (const override));
+              (const Intrinsic&), (const, override));
   MOCK_METHOD(StatusOr<std::unique_ptr<TensorAggregator>>, Deserialize,
-              (const Intrinsic&, std::string), (const override));
+              (const Intrinsic&, std::string), (const, override));
 };
 
 class ConfigConverterTest : public ::testing::Test {
diff --git a/tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h b/tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h
index ca1071d535..e80f7a3e4a 100644
--- a/tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h
+++ b/tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h
@@ -41,7 +41,7 @@ class MockCheckpointParser : public CheckpointParser {
 class MockCheckpointParserFactory : public CheckpointParserFactory {
  public:
   MOCK_METHOD(absl::StatusOr<std::unique_ptr<CheckpointParser>>, Create,
-              (const absl::Cord& serialized_checkpoint), (const override));
+              (const absl::Cord& serialized_checkpoint), (const, override));
 };
 
 class MockCheckpointBuilder : public CheckpointBuilder {
@@ -53,7 +53,8 @@ class MockCheckpointBuilder : public CheckpointBuilder {
 
 class MockCheckpointBuilderFactory : public CheckpointBuilderFactory {
  public:
-  MOCK_METHOD(std::unique_ptr<CheckpointBuilder>, Create, (), (const override));
+  MOCK_METHOD(std::unique_ptr<CheckpointBuilder>, Create, (),
+              (const, override));
 };
 
 class MockResourceResolver : public ResourceResolver {