diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index d3b40f6e..34161992 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -45,17 +45,17 @@ 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) {
+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);
   *os << ((mode == OEMCrypto_CipherMode_CTR) ? "CTR mode" : "CBC mode")
-      << ", encrypt=" << pattern.encrypt
-      << ", skip=" << pattern.skip
-      << ", decrypt in place = " << (decrypt_inplace ? "true":"false");
-}
+      << ", encrypt=" << pattern.encrypt << ", skip=" << pattern.skip
+      << ", decrypt in place = " << (decrypt_inplace ? "true" : "false");
 }
+}  // namespace std
 
 namespace wvoec {
 
@@ -5246,7 +5246,8 @@ TEST_F(UsageTableDefragTest, CreateNewHeaderWhileUsingOldOne) {
   LoadFirstLicense(&s1, 1);
   s0.open();
   ASSERT_NO_FATAL_FAILURE(s0.ReloadUsageEntry());
-  ASSERT_NO_FATAL_FAILURE(CreateUsageTableHeader(/* expect_success */ false));
+  const bool kExpectFailure = false;
+  ASSERT_NO_FATAL_FAILURE(CreateUsageTableHeader(kExpectFailure));
 }
 
 TEST_F(UsageTableDefragTest, ReloadUsageEntryWrongIndex) {