diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
index 677502a4..0cf9dae1 100644
--- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
@@ -131,7 +131,6 @@ using video_widevine::STREAMING;
 // gmock methods
 using ::testing::_;
 using ::testing::InSequence;
-using ::testing::Invoke;
 using ::testing::MockFunction;
 using ::testing::Pair;
 using ::testing::Return;
@@ -250,7 +249,7 @@ class PolicyEngineTestV16 : public PolicyEngineTest {
  protected:
   void SetUp() override {
     EXPECT_CALL(*crypto_session_, GetApiVersion(_))
-        .WillOnce(DoAll(SetArgPointee<0>(kOemCryptoV16), Return(true)));
+        .WillRepeatedly(DoAll(SetArgPointee<0>(kOemCryptoV16), Return(true)));
     PolicyEngineTest::SetUp();
   }
 };
@@ -1045,7 +1044,7 @@ TEST_F(PolicyEngineKeyAllowedUsageTest, AllowedUsageGeneric) {
 class PolicyEngineQueryTest : public PolicyEngineTestV16 {
  protected:
   void SetUp() override {
-    PolicyEngineTest::SetUp();
+    PolicyEngineTestV16::SetUp();
     policy_engine_.reset(
         new PolicyEngine(kSessionId, nullptr, crypto_session_.get()));
     InjectMockClock();