diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
index c8ea7f9b..60e5bb42 100644
--- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
@@ -1356,7 +1356,7 @@ TEST_P(DeviceFilesStoreTest, StoreCertificate) {
 }
 
 INSTANTIATE_TEST_CASE_P(StoreCertificate, DeviceFilesStoreTest,
-                        ::testing::Values(true, false));
+                        ::testing::Bool());
 
 TEST_F(DeviceFilesTest, ReadCertificate) {
   MockFile file;
@@ -1470,8 +1470,7 @@ TEST_P(DeviceFilesStoreTest, StoreLicense) {
       license_test_data[license_num].last_playback_time));
 }
 
-INSTANTIATE_TEST_CASE_P(StoreLicense, DeviceFilesStoreTest,
-                        ::testing::Values(true, false));
+INSTANTIATE_TEST_CASE_P(StoreLicense, DeviceFilesStoreTest, ::testing::Bool());
 
 TEST_F(DeviceFilesTest, StoreLicenses) {
   MockFile file;
@@ -1985,6 +1984,6 @@ TEST_P(DeviceFilesUsageInfoTest, DeleteAll) {
 }
 
 INSTANTIATE_TEST_CASE_P(UsageInfo, DeviceFilesUsageInfoTest,
-                        ::testing::Values(-1, 0, 1, 2, 3));
+                        ::testing::Range(-1, 4));
 
 }  // namespace wvcdm