diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 4bb6969f..d44eb408 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -44,16 +44,16 @@ using ::testing::Combine;
 using ::testing::Range;
 using ::testing::Values;
 using ::testing::WithParamInterface;
+using ::testing::tuple;
 using namespace std;
-using std::tr1::tuple;
 
 namespace std {  // GTest wants PrintTo to be in the std namespace.
 void PrintTo(const tuple<OEMCrypto_CENCEncryptPatternDesc, OEMCryptoCipherMode,
                          bool>& param,
              ostream* os) {
-  OEMCrypto_CENCEncryptPatternDesc pattern = std::tr1::get<0>(param);
-  OEMCryptoCipherMode mode = std::tr1::get<1>(param);
-  bool decrypt_inplace = std::tr1::get<2>(param);
+  OEMCrypto_CENCEncryptPatternDesc pattern = ::testing::get<0>(param);
+  OEMCryptoCipherMode mode = ::testing::get<1>(param);
+  bool decrypt_inplace = ::testing::get<2>(param);
   *os << ((mode == OEMCrypto_CipherMode_CTR) ? "CTR mode" : "CBC mode")
       << ", encrypt=" << pattern.encrypt << ", skip=" << pattern.skip
       << ", decrypt in place = " << (decrypt_inplace ? "true" : "false");
@@ -1657,9 +1657,9 @@ class OEMCryptoSessionTestsDecryptTests
  protected:
   virtual void SetUp() {
     OEMCryptoSessionTests::SetUp();
-    pattern_ = std::tr1::get<0>(GetParam());
-    cipher_mode_ = std::tr1::get<1>(GetParam());
-    decrypt_inplace_ = std::tr1::get<2>(GetParam());
+    pattern_ = ::testing::get<0>(GetParam());
+    cipher_mode_ = ::testing::get<1>(GetParam());
+    decrypt_inplace_ = ::testing::get<2>(GetParam());
   }
 
   void FindTotalSize() {