diff --git a/components/brave_ads/core/internal/account/account_util_unittest.cc b/components/brave_ads/core/internal/account/account_util_unittest.cc
index c89c12abe329..ad1c1d036834 100644
--- a/components/brave_ads/core/internal/account/account_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/account_util_unittest.cc
@@ -7,6 +7,8 @@
 
 #include "brave/components/brave_ads/core/internal/account/account_util.h"
 
+#include <cstddef>
+
 #include "base/test/scoped_feature_list.h"
 #include "brave/components/brave_ads/core/internal/common/test/test_base.h"
 #include "brave/components/brave_ads/core/internal/settings/settings_test_util.h"
@@ -18,9 +20,9 @@ class BraveAdsAccountUtilTest : public test::TestBase {};
 
 TEST_F(BraveAdsAccountUtilTest, AlwaysAllowDepositsForRewardsUser) {
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::AdType::kMaxValue); ++i) {
-    for (int j = 0; j < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-         ++j) {
+  for (size_t i = 0; i < static_cast<size_t>(mojom::AdType::kMaxValue); ++i) {
+    for (size_t j = 0;
+         j < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++j) {
       EXPECT_TRUE(IsAllowedToDeposit(static_cast<mojom::AdType>(i),
                                      static_cast<mojom::ConfirmationType>(j)));
     }
@@ -33,8 +35,8 @@ TEST_F(BraveAdsAccountUtilTest,
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     EXPECT_TRUE(IsAllowedToDeposit(mojom::AdType::kInlineContentAd,
                                    static_cast<mojom::ConfirmationType>(i)));
   }
@@ -46,8 +48,8 @@ TEST_F(BraveAdsAccountUtilTest,
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     EXPECT_TRUE(IsAllowedToDeposit(mojom::AdType::kPromotedContentAd,
                                    static_cast<mojom::ConfirmationType>(i)));
   }
@@ -59,8 +61,8 @@ TEST_F(BraveAdsAccountUtilTest,
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     EXPECT_FALSE(IsAllowedToDeposit(mojom::AdType::kNewTabPageAd,
                                     static_cast<mojom::ConfirmationType>(i)));
   }
@@ -76,8 +78,8 @@ TEST_F(
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     EXPECT_TRUE(IsAllowedToDeposit(mojom::AdType::kNewTabPageAd,
                                    static_cast<mojom::ConfirmationType>(i)));
   }
@@ -89,8 +91,8 @@ TEST_F(BraveAdsAccountUtilTest,
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     EXPECT_FALSE(IsAllowedToDeposit(mojom::AdType::kNotificationAd,
                                     static_cast<mojom::ConfirmationType>(i)));
   }
@@ -103,8 +105,8 @@ TEST_F(
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     EXPECT_FALSE(IsAllowedToDeposit(mojom::AdType::kSearchResultAd,
                                     static_cast<mojom::ConfirmationType>(i)));
   }
@@ -120,8 +122,8 @@ TEST_F(
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     const auto confirmation_type = static_cast<mojom::ConfirmationType>(i);
 
     const bool is_allowed_to_deposit =
diff --git a/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.cc b/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.cc
index 463968e66b5d..529edd5f04fa 100644
--- a/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.cc
+++ b/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.cc
@@ -14,21 +14,21 @@ namespace brave_ads::test {
 std::vector<mojom::ConfirmationType>
 BuildConfirmationTypeForCountAndIntersperseOtherTypes(
     mojom::ConfirmationType mojom_confirmation_type,
-    int count) {
-  CHECK_GT(count, 0);
+    size_t count) {
+  CHECK_GT(count, 0U);
 
   const int confirmation_type_max_value =
-      static_cast<int>(mojom::ConfirmationType::kMaxValue);
+      static_cast<size_t>(mojom::ConfirmationType::kMaxValue);
 
   std::vector<mojom::ConfirmationType> mojom_confirmation_types;
   mojom_confirmation_types.reserve(count + confirmation_type_max_value - 1);
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     mojom_confirmation_types.push_back(mojom_confirmation_type);
   }
 
   // Sprinkle in one of each confirmation type, other than `confirmation_type`.
-  for (int i = 0; i < confirmation_type_max_value; ++i) {
+  for (size_t i = 0; i < confirmation_type_max_value; ++i) {
     const auto other_mojom_confirmation_type =
         static_cast<mojom::ConfirmationType>(i);
     if (other_mojom_confirmation_type == mojom_confirmation_type) {
diff --git a/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.h b/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.h
index 38cf92fbb349..4f6b075b4bea 100644
--- a/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.h
+++ b/components/brave_ads/core/internal/account/confirmations/confirmation_type_test_util.h
@@ -6,6 +6,7 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_CONFIRMATION_TYPE_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_CONFIRMATIONS_CONFIRMATION_TYPE_TEST_UTIL_H_
 
+#include <cstddef>
 #include <vector>
 
 #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h"
@@ -15,7 +16,7 @@ namespace brave_ads::test {
 std::vector<mojom::ConfirmationType>
 BuildConfirmationTypeForCountAndIntersperseOtherTypes(
     mojom::ConfirmationType mojom_confirmation_type,
-    int count);
+    size_t count);
 
 }  // namespace brave_ads::test
 
diff --git a/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc b/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc
index f018cd61b1e2..32bd4e9dcdc3 100644
--- a/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc
+++ b/components/brave_ads/core/internal/account/confirmations/payload/confirmation_payload_json_writer_unittest.cc
@@ -54,7 +54,7 @@ TEST_F(BraveAdsConfirmationPayloadJsonWriterTest,
                 R"(
                     {
                       "blindedPaymentTokens": [
-                        "Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q="
+                        "+qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0="
                       ],
                       "buildChannel": "release",
                       "catalog": [
@@ -66,7 +66,7 @@ TEST_F(BraveAdsConfirmationPayloadJsonWriterTest,
                       "creativeInstanceId": "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
                       "diagnosticId": "c1298fde-7fdb-401f-a3ce-0b58fe86e6e2",
                       "platform": "windows",
-                      "publicKey": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=",
+                      "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                       "rotatingHash": "jBdiJH7Hu3wj31WWNLjKV5nVxFxWSDWkYh5zXCS3rXY=",
                       "segment": "untargeted",
                       "studies": [],
diff --git a/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc
index 7830ddb420dc..f167fa6f336e 100644
--- a/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/confirmations/payload/reward_confirmation_payload_util_unittest.cc
@@ -42,9 +42,9 @@ TEST_F(BraveAdsRewardConfirmationPayloadUtilTest,
                 R"(
                     {
                       "blindedPaymentTokens": [
-                        "Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q="
+                        "+qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0="
                       ],
-                      "publicKey": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="
+                      "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="
                     })"),
             reward_confirmation_payload);
 }
diff --git a/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.cc b/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.cc
index b98522f55080..6e759b422e03 100644
--- a/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.cc
+++ b/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.cc
@@ -37,7 +37,7 @@ void SaveConfirmationQueueItems(
 }
 
 void BuildAndSaveConfirmationQueueItems(const ConfirmationInfo& confirmation,
-                                        int count) {
+                                        size_t count) {
   const ConfirmationQueueItemList confirmation_queue_items =
       BuildConfirmationQueueItems(confirmation, count);
 
diff --git a/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.h b/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.h
index 43692e38a303..51877fd64c59 100644
--- a/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.h
+++ b/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_test_util.h
@@ -24,7 +24,7 @@ void SaveConfirmationQueueItems(
     const ConfirmationQueueItemList& confirmation_queue_items);
 
 void BuildAndSaveConfirmationQueueItems(const ConfirmationInfo& confirmation,
-                                        int count);
+                                        size_t count);
 
 }  // namespace test
 
diff --git a/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_util_unittest.cc
index 9b63488862a4..1f8e1894ce24 100644
--- a/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/confirmations/queue/queue_item/confirmation_queue_item_util_unittest.cc
@@ -24,9 +24,9 @@
 
 namespace brave_ads {
 
-class BraveAdsConfirmationQueueItemDelayTest : public test::TestBase {};
+class BraveAdsConfirmationQueueItemUtilTest : public test::TestBase {};
 
-TEST_F(BraveAdsConfirmationQueueItemDelayTest,
+TEST_F(BraveAdsConfirmationQueueItemUtilTest,
        CalculateDelayBeforeProcessingConfirmationQueueItem) {
   // Arrange
   test::MockTokenGenerator(/*count=*/1);
@@ -48,7 +48,7 @@ TEST_F(BraveAdsConfirmationQueueItemDelayTest,
   EXPECT_EQ(base::Hours(1), delay_before_processing_confirmation_queue_item);
 }
 
-TEST_F(BraveAdsConfirmationQueueItemDelayTest,
+TEST_F(BraveAdsConfirmationQueueItemUtilTest,
        CalculateDelayBeforeProcessingPastDueConfirmationQueueItem) {
   // Arrange
   test::MockTokenGenerator(/*count=*/1);
@@ -71,7 +71,7 @@ TEST_F(BraveAdsConfirmationQueueItemDelayTest,
             delay_before_processing_confirmation_queue_item);
 }
 
-TEST_F(BraveAdsConfirmationQueueItemDelayTest,
+TEST_F(BraveAdsConfirmationQueueItemUtilTest,
        CalculateMinimumDelayBeforeProcessingConfirmationQueueItem) {
   // Arrange
   test::MockTokenGenerator(/*count=*/1);
@@ -95,7 +95,7 @@ TEST_F(BraveAdsConfirmationQueueItemDelayTest,
             delay_before_processing_confirmation_queue_item);
 }
 
-TEST_F(BraveAdsConfirmationQueueItemDelayTest,
+TEST_F(BraveAdsConfirmationQueueItemUtilTest,
        RebuildConfirmationWithoutDynamicUserData) {
   // Arrange
   test::MockTokenGenerator(/*count=*/1);
@@ -131,7 +131,7 @@ TEST_F(BraveAdsConfirmationQueueItemDelayTest,
                            expected_reward, expected_user_data));
 }
 
-TEST_F(BraveAdsConfirmationQueueItemDelayTest,
+TEST_F(BraveAdsConfirmationQueueItemUtilTest,
        RebuildConfirmationDynamicUserData) {
   // Arrange
   test::MockTokenGenerator(/*count=*/1);
@@ -164,6 +164,17 @@ TEST_F(BraveAdsConfirmationQueueItemDelayTest,
             "systemTimestamp": "1996-07-08T10:00:00.000Z"
           })");
 
+  EXPECT_EQ(rebuilt_confirmation.reward->blinded_token,
+            expected_reward.blinded_token);
+  EXPECT_EQ(rebuilt_confirmation.reward->unblinded_token,
+            expected_reward.unblinded_token);
+  EXPECT_EQ(rebuilt_confirmation.reward->token, expected_reward.token);
+  EXPECT_EQ(rebuilt_confirmation.reward->credential_base64url,
+            expected_reward.credential_base64url);
+  EXPECT_EQ(rebuilt_confirmation.reward->public_key,
+            expected_reward.public_key);
+  EXPECT_EQ(rebuilt_confirmation.reward->signature, expected_reward.signature);
+
   EXPECT_THAT(
       rebuilt_confirmation,
       ::testing::FieldsAre(test::kTransactionId, test::kCreativeInstanceId,
diff --git a/components/brave_ads/core/internal/account/confirmations/reward/README.md b/components/brave_ads/core/internal/account/confirmations/reward/README.md
index eb49bfaa2c1d..255237ae470f 100644
--- a/components/brave_ads/core/internal/account/confirmations/reward/README.md
+++ b/components/brave_ads/core/internal/account/confirmations/reward/README.md
@@ -9,7 +9,7 @@ Included when redeeming an anonymous confirmation token:
 | creativeInstanceId  | {"creativeInstanceId":"e4958d00-e35c-4134-a408-1fbcf274d5ae"}  | An id that references the specific ad creative that the user engaged with. This will be the same for any user that engages with this ad.  |
 | transactionId  | {"transactionId":"c14d370c-1178-4c73-8385-1cfa17200646"}  | A unique id for the transaction, which is not linkable between confirmation token redemptions.  |
 | type  | {"type":"view"}  | Action or interaction that occurred within an advertisement, such as a user clicking the ad.<br><br>Supported types:<br><br>- view<br>- click<br>- landed<br>- conversion<br>- interaction[^1]<br>- media_play[^1]<br>- media_25[^1]<br>- media_100[^1]<br>- upvote<br>- downvote<br>- flag<br>- bookmark &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  |
-| confirmation token  | {"blindedPaymentTokens": ["Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q="],<br> "publicKey": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="}  | See [security and privacy model for ad confirmations](https://github.com/brave/brave-browser/wiki/Security-and-privacy-model-for-ad-confirmations).  |
+| confirmation token  | {"blindedPaymentTokens": ["+qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0="],<br> "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="}  | See [security and privacy model for ad confirmations](https://github.com/brave/brave-browser/wiki/Security-and-privacy-model-for-ad-confirmations).  |
 | user data  | {"buildChannel":"nightly",<br>"catalog":[{"id":"29e5c8bc0ba319069980bb390d8e8f9b58c05a20"}],<br>"conversion":[{"action":"view"}],<br>"createdAtTimestamp":"2020-11-18T12:00:00.000Z",<br>"httpResponseStatus":"500",<br>"platform":"windows",<br>"rotatingHash":"I6KM54gXOrWqRHyrD518LmhePLHpIk4KSgCKOl0e3sc=",<br>"segment":"sports",<br>"studies":[{"group":"GroupA","name":"BraveAds.FooStudy"},{"group":"GroupB","name":"BraveAds.BarStudy"}],<br>"versionNumber":"1.2.3.4"}  | See [user data](../../user_data/README.md#brave-rewards-users).  |
 
 Please add to it!
diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_test_util.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_test_util.cc
index 1223306704f9..a755bf84ba96 100644
--- a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_test_util.cc
+++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_test_util.cc
@@ -43,20 +43,25 @@ std::optional<ConfirmationInfo> BuildRewardConfirmationWithoutDynamicUserData(
 RewardInfo BuildReward(const ConfirmationInfo& confirmation) {
   RewardInfo reward;
 
+  // TODO(tmancey): Decouple to cbr::test::GetToken.
   reward.token = cbr::Token(
-      R"(aXZNwft34oG2JAVBnpYh/ktTOzr2gi0lKosYNczUUz6ZS9gaDTJmU2FHFps9dIq+QoDwjSjctR5v0rRn+dYo+AHScVqFAgJ5t2s4KtSyawW10gk6hfWPQw16Q0+8u5AG)");
+      R"(/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JVkVTu9dLQdR595gZf/D4PvSuhgk5RcoBm3fSFGI4JQF)");
 
+  // TODO(tmancey): Decouple to cbr::test::GetBlindedToken.
   reward.blinded_token =
-      cbr::BlindedToken(R"(Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q=)");
+      cbr::BlindedToken(R"(+qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0=)");
 
+  // TODO(tmancey): Decouple to cbr::test::GetUnblindedToken.
   reward.unblinded_token = cbr::UnblindedToken(
-      R"(PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgC3B1+VD/uyHPfa/+bwYRrpVH5YwNSDEydVx8S4r+BYVY)");
+      R"(/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JTrpqSWv/sNVO/Pi8nHDyl3CET+S2CKkMmYlXW3DgqxW)");
 
+  // TODO(tmancey): Decouple to cbr::test::GetPublicKey.
   reward.public_key =
-      cbr::PublicKey(R"(RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=)");
+      cbr::PublicKey(R"(OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=)");
 
+  // TODO(tmancey): Decouple to cbr::test::GetVerificationSignature.
   reward.signature =
-      R"(+yxJmIDobOZ5DBncIVuzjQEZfIa0+UPrSQhzA5pwEAL9qC4UW7A1H35nKAhVLehJlXnnfMVKV02StVO3fBU5CQ==)";
+      R"(pWHhVf6jDdMbt2tKKk3E0JJAB7J5lGnJej/Vi9/UgQpdqw9kKBgvmj4ke0R2MP2n2ynhRjM1sRVZiez0G2hpCA==)";
 
   const std::optional<std::string> reward_credential_base64url =
       BuildRewardCredential(confirmation);
diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc
index 0a016b0b1aaa..4065b4a339e9 100644
--- a/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_confirmation_util_unittest.cc
@@ -53,7 +53,7 @@ TEST_F(BraveAdsRewardConfirmationUtilTest, BuildRewardCredential) {
 
   // Assert
   EXPECT_EQ(
-      R"(eyJzaWduYXR1cmUiOiJNem1obU8zak5rbDVNOHBGNG96ejJaVlMycVdKblJwaWJSR1B0UmJNMWY4NHhPZWhmQmVBdkxsbkpJSlVObStvNmtQMkxXYTF0TkFIT2VjRGF6dUlGUT09IiwidCI6IlBMb3d6MldGMmVHRDV6Zndaams5cDc2SFhCTERLTXEvM0VBWkhlRy9mRTJYR1E0OGp5dGUrVmU1MFpsYXNPdVlMNW13QThDVTJhRk1sSnJ0M0REZ0N3PT0ifQ==)",
+      R"(eyJzaWduYXR1cmUiOiIvcGR1dXhwdk5DZmUrOUorWG5xb3JnRXMxRE14WTAzRXNGZXg4S1NhczUzREh2Rm1DSlRyRW5yYVErL3lybHZyaHFXbGs5SEcyVU0rWDdVbGZZanZ4Zz09IiwidCI6Ii9tZlRBQWpIcldtQWxMaUVrdGJxTlMvZHhvTVZkbnoxZXNvVnBsUVVzN3lHL2FwQXEySzZPZVNUNmxCVEtGSm1PcTdyVjhRYlkvREYySEZSTWN6L0pRPT0ifQ==)",
       reward_credential);
 }
 
diff --git a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc
index aade4db7aad3..6b9116311b47 100644
--- a/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc
+++ b/components/brave_ads/core/internal/account/confirmations/reward/reward_credential_json_writer_unittest.cc
@@ -39,11 +39,13 @@ TEST_F(BraveAdsRewardCredentialJsonWriterTest, WriteRewardCredential) {
   ASSERT_TRUE(reward_credential);
 
   // Assert
+  // TODO(tmancey): Should signature not match
+  // challenge_bypass_ristretto_test_constants.h
   EXPECT_EQ(base::test::ParseJsonDict(
                 R"(
                     {
-                      "signature": "XsaQ/XqKiWfeTCjFDhkyldsx0086qu6tjgJDCKo+f7kA0eA+mdf3Ae+BjPcDDQ8JfVbVQkI5ub394qdTmE2bRw==",
-                      "t": "PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgCw=="
+                      "signature": "jo8LVg8FpHtLKMakT7WcfGulrCB6ttSJpAaMcD95pDKTcdBRVf1yUDEZmhLKXWTIPDCDRCPKEx3gChO4S5GtHw==",
+                      "t": "/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JQ=="
                     })"),
             base::test::ParseJsonDict(*reward_credential));
 }
diff --git a/components/brave_ads/core/internal/account/issuers/issuers_feature.h b/components/brave_ads/core/internal/account/issuers/issuers_feature.h
index 52cc71e207d5..c78ea333ddcd 100644
--- a/components/brave_ads/core/internal/account/issuers/issuers_feature.h
+++ b/components/brave_ads/core/internal/account/issuers/issuers_feature.h
@@ -13,7 +13,7 @@ namespace brave_ads {
 
 BASE_DECLARE_FEATURE(kIssuersFeature);
 
-inline constexpr base::FeatureParam<int> kMaximumTokenIssuerPublicKeys{
+inline constexpr base::FeatureParam<size_t> kMaximumTokenIssuerPublicKeys{
     &kIssuersFeature, "maximum_token_issuer_public_keys", 6};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/issuers/issuers_feature_unittest.cc b/components/brave_ads/core/internal/account/issuers/issuers_feature_unittest.cc
index 0f1ebcaae018..984c1a07a383 100644
--- a/components/brave_ads/core/internal/account/issuers/issuers_feature_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/issuers_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsIssuersFeatureTest, MaximumTokenIssuerPublicKeys) {
       kIssuersFeature, {{"maximum_token_issuer_public_keys", "1"}});
 
   // Act & Assert
-  EXPECT_EQ(1, kMaximumTokenIssuerPublicKeys.Get());
+  EXPECT_EQ(1U, kMaximumTokenIssuerPublicKeys.Get());
 }
 
 TEST(BraveAdsIssuersFeatureTest, DefaultMaximumTokenIssuerPublicKeys) {
   // Act & Assert
-  EXPECT_EQ(6, kMaximumTokenIssuerPublicKeys.Get());
+  EXPECT_EQ(6U, kMaximumTokenIssuerPublicKeys.Get());
 }
 
 TEST(BraveAdsIssuersFeatureTest,
@@ -48,7 +48,7 @@ TEST(BraveAdsIssuersFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kIssuersFeature);
 
   // Act & Assert
-  EXPECT_EQ(6, kMaximumTokenIssuerPublicKeys.Get());
+  EXPECT_EQ(6U, kMaximumTokenIssuerPublicKeys.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/issuers/issuers_test_util.cc b/components/brave_ads/core/internal/account/issuers/issuers_test_util.cc
index c1ba9a86e7a7..876bfac028a0 100644
--- a/components/brave_ads/core/internal/account/issuers/issuers_test_util.cc
+++ b/components/brave_ads/core/internal/account/issuers/issuers_test_util.cc
@@ -30,14 +30,14 @@ TokenIssuerList BuildTokenIssuers() {
   const TokenIssuerInfo confirmation_token_issuer =
       BuildTokenIssuer(TokenIssuerType::kConfirmations,
                        /*token_issuer_public_keys=*/
-                       {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+                       {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
                         {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}});
 
   const TokenIssuerInfo payment_token_issuer =
       BuildTokenIssuer(TokenIssuerType::kPayments,
                        /*token_issuer_public_keys=*/
                        {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-                        {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}});
+                        {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}});
 
   return {confirmation_token_issuer, payment_token_issuer};
 }
@@ -51,7 +51,7 @@ std::string BuildIssuersUrlResponseBody() {
             "name": "confirmations",
             "publicKeys": [
               {
-                "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=",
+                "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                 "associatedValue": ""
               },
               {
@@ -68,7 +68,7 @@ std::string BuildIssuersUrlResponseBody() {
                 "associatedValue": "0.0"
               },
               {
-                "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+                "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                 "associatedValue": "0.1"
               }
             ]
@@ -103,11 +103,11 @@ IssuersInfo BuildIssuers(
 IssuersInfo BuildIssuers() {
   return BuildIssuers(/*ping=*/7'200'000,
                       /*confirmation_token_issuer_public_keys=*/
-                      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+                      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
                        {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}},
                       /*payment_token_issuer_public_keys=*/
                       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-                       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}});
+                       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}});
 }
 
 void BuildAndSetIssuers() {
diff --git a/components/brave_ads/core/internal/account/issuers/issuers_util_unittest.cc b/components/brave_ads/core/internal/account/issuers/issuers_util_unittest.cc
index 5987dbbb3dce..fe723128ce77 100644
--- a/components/brave_ads/core/internal/account/issuers/issuers_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/issuers_util_unittest.cc
@@ -20,11 +20,11 @@ TEST_F(BraveAdsIssuersUtilTest, IsIssuersValid) {
   const IssuersInfo issuers = test::BuildIssuers(
       /*ping=*/7'200'000,
       /*confirmation_token_issuer_public_keys=*/
-      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
        {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}},
       /*payment_token_issuer_public_keys=*/
       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1},
+       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1},
        {"XovQyvVWM8ez0mAzTtfqgPIbSpH5/idv8w0KJxhirwA=", 0.1},
        {"wAcnJtb34Asykf+2jrTWrjFiaTqilklZ6bxLyR3LyFo=", 0.1},
        {"ZvzeYOT1geUQXfOsYXBxZj/H26IfiBUVodHl51j68xI=", 0.1},
@@ -40,11 +40,11 @@ TEST_F(BraveAdsIssuersUtilTest, IsIssuersInvalid) {
   const IssuersInfo issuers = test::BuildIssuers(
       /*ping=*/7'200'000,
       /*confirmation_token_issuer_public_keys=*/
-      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
        {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}},
       /*payment_token_issuer_public_keys=*/
       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1},
+       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1},
        {"XovQyvVWM8ez0mAzTtfqgPIbSpH5/idv8w0KJxhirwA=", 0.1},
        {"wAcnJtb34Asykf+2jrTWrjFiaTqilklZ6bxLyR3LyFo=", 0.1},
        {"ZvzeYOT1geUQXfOsYXBxZj/H26IfiBUVodHl51j68xI=", 0.1},
@@ -109,11 +109,11 @@ TEST_F(BraveAdsIssuersUtilTest, HasIssuersNotChanged) {
   const IssuersInfo issuers = test::BuildIssuers(
       /*ping=*/7'200'000,
       /*confirmation_token_issuer_public_keys=*/
-      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
        {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}},
       /*payment_token_issuer_public_keys=*/
       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}});
+       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}});
 
   // Act & Assert
   EXPECT_FALSE(HasIssuersChanged(issuers));
diff --git a/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util.cc b/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util.cc
index f48b98ad84b2..775deeb7ff12 100644
--- a/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util.cc
+++ b/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util.cc
@@ -25,7 +25,7 @@ bool IsConfirmationTokenIssuerValid(const IssuersInfo& issuers) {
   }
 
   return token_issuer->public_keys.size() <=
-         static_cast<size_t>(kMaximumTokenIssuerPublicKeys.Get());
+         kMaximumTokenIssuerPublicKeys.Get();
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util_unittest.cc b/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util_unittest.cc
index 2a57cc0fae15..6c91bb02cf57 100644
--- a/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/token_issuers/confirmation_token_issuer_util_unittest.cc
@@ -22,7 +22,7 @@ TEST_F(BraveAdsConfirmationsIssuerUtilTest, IsConfirmationTokenIssuerValid) {
   TokenIssuerInfo token_issuer;
   token_issuer.type = TokenIssuerType::kConfirmations;
 
-  for (int i = 0; i < kMaximumTokenIssuerPublicKeys.Get(); ++i) {
+  for (size_t i = 0; i < kMaximumTokenIssuerPublicKeys.Get(); ++i) {
     token_issuer.public_keys.insert(
         {/*public_key=*/base::Uuid::GenerateRandomV4().AsLowercaseString(),
          /*associated_value=*/0.1});
@@ -40,7 +40,7 @@ TEST_F(BraveAdsConfirmationsIssuerUtilTest, IsConfirmationTokenIssuerInvalid) {
   TokenIssuerInfo token_issuer;
   token_issuer.type = TokenIssuerType::kConfirmations;
 
-  for (int i = 0; i < kMaximumTokenIssuerPublicKeys.Get() + 1; ++i) {
+  for (size_t i = 0; i < kMaximumTokenIssuerPublicKeys.Get() + 1; ++i) {
     token_issuer.public_keys.insert(
         {/*public_key=*/base::Uuid::GenerateRandomV4().AsLowercaseString(),
          /*associated_value=*/0.1});
diff --git a/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util.cc b/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util.cc
index 3dc9a82599ab..12521b1447cd 100644
--- a/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util.cc
+++ b/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util.cc
@@ -24,10 +24,10 @@ bool IsPaymentTokenIssuerValid(const IssuersInfo& issuers) {
     return false;
   }
 
-  const int maximum_token_issuer_public_keys =
+  const size_t maximum_token_issuer_public_keys =
       kMaximumTokenIssuerPublicKeys.Get();
 
-  base::flat_map<double, int> buckets;
+  base::flat_map<double, size_t> buckets;
   for (const auto& [_, associated_value] : payment_token_issuer->public_keys) {
     ++buckets[associated_value];
     if (buckets[associated_value] > maximum_token_issuer_public_keys) {
diff --git a/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util_unittest.cc b/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util_unittest.cc
index 8b3cc857cff4..323a48fdd12d 100644
--- a/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/token_issuers/payment_token_issuer_util_unittest.cc
@@ -22,7 +22,7 @@ TEST_F(BraveAdsPaymentsIssuerUtilTest, IsPaymentTokenIssuerValid) {
   TokenIssuerInfo token_issuer;
   token_issuer.type = TokenIssuerType::kPayments;
 
-  for (int i = 0; i < kMaximumTokenIssuerPublicKeys.Get(); ++i) {
+  for (size_t i = 0; i < kMaximumTokenIssuerPublicKeys.Get(); ++i) {
     token_issuer.public_keys.insert(
         {/*public_key=*/base::Uuid::GenerateRandomV4().AsLowercaseString(),
          /*associated_value=*/0.1});
@@ -40,7 +40,7 @@ TEST_F(BraveAdsPaymentsIssuerUtilTest, IsPaymentTokenIssuerInvalid) {
   TokenIssuerInfo token_issuer;
   token_issuer.type = TokenIssuerType::kPayments;
 
-  for (int i = 0; i < kMaximumTokenIssuerPublicKeys.Get() + 1; ++i) {
+  for (size_t i = 0; i < kMaximumTokenIssuerPublicKeys.Get() + 1; ++i) {
     token_issuer.public_keys.insert(
         {/*public_key=*/base::Uuid::GenerateRandomV4().AsLowercaseString(),
          /*associated_value=*/0.1});
diff --git a/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_util_unittest.cc b/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_util_unittest.cc
index d1ac76fbcc63..ece5a069572f 100644
--- a/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_util_unittest.cc
@@ -32,7 +32,7 @@ TEST_F(BraveAdsTokenIssuerUtilTest,
       /*ping=*/7'200'000, /*confirmation_token_issuer_public_keys=*/{},
       /*payment_token_issuer_public_keys=*/
       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}});
+       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}});
 
   SetIssuers(issuers);
 
@@ -53,7 +53,7 @@ TEST_F(BraveAdsTokenIssuerUtilTest, TokenIssuerDoesNotExistForPaymentsType) {
   const IssuersInfo issuers = test::BuildIssuers(
       /*ping=*/7'200'000,
       /*confirmation_token_issuer_public_keys=*/
-      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
        {"cKo0rk1iS8Obgyni0X3RRoydDIGHsivTkfX/TM1Xl24=", 0.0}},
       /*payment_token_issuer_public_keys=*/{});
 
@@ -92,7 +92,8 @@ TEST_F(BraveAdsTokenIssuerUtilTest, TokenIssuerPublicKeyExistsForPaymentsType) {
   // Act & Assert
   EXPECT_TRUE(TokenIssuerPublicKeyExistsForType(
       TokenIssuerType::kPayments,
-      cbr::PublicKey("bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=")));
+      // TODO(tmancey): Decouple to cbr::test::GetPublicKey.
+      cbr::PublicKey("OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=")));
 }
 
 TEST_F(BraveAdsTokenIssuerUtilTest,
@@ -111,11 +112,11 @@ TEST_F(BraveAdsTokenIssuerUtilTest, GetTokenIssuerForType) {
   const IssuersInfo issuers = test::BuildIssuers(
       /*ping=*/7'200'000,
       /*confirmation_token_issuer_public_keys=*/
-      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
        {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}},
       /*payment_token_issuer_public_keys=*/
       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}});
+       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}});
 
   // Act
   const std::optional<TokenIssuerInfo> token_issuer =
@@ -128,7 +129,7 @@ TEST_F(BraveAdsTokenIssuerUtilTest, GetTokenIssuerForType) {
                   TokenIssuerType::kPayments,
                   TokenIssuerPublicKeyMap{
                       {"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-                      {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}}));
+                      {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}}));
 }
 
 TEST_F(BraveAdsTokenIssuerUtilTest, DoNotGetTokenIssuerForMissingType) {
@@ -136,7 +137,7 @@ TEST_F(BraveAdsTokenIssuerUtilTest, DoNotGetTokenIssuerForMissingType) {
   const IssuersInfo issuers = test::BuildIssuers(
       /*ping=*/7'200'000,
       /*confirmation_token_issuer_public_keys=*/
-      {{"bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=", 0.0},
+      {{"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.0},
        {"QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=", 0.0}},
       /*payment_token_issuer_public_keys=*/{});
 
diff --git a/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_value_util_unittest.cc b/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_value_util_unittest.cc
index 097a9ea99880..fd706958a3ec 100644
--- a/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_value_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/token_issuers/token_issuer_value_util_unittest.cc
@@ -22,11 +22,11 @@ constexpr char kTokenIssuersAsJson[] = R"(
       "name": "confirmations",
       "publicKeys": [
         {
-          "publicKey": "QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=",
+          "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
           "associatedValue": "0"
         },
         {
-          "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=",
+          "publicKey": "QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g=",
           "associatedValue": "0"
         }
       ]
@@ -39,7 +39,7 @@ constexpr char kTokenIssuersAsJson[] = R"(
           "associatedValue": "0"
         },
         {
-          "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+          "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
           "associatedValue": "0.1"
         }
       ]
diff --git a/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_unittest.cc b/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_unittest.cc
index 811d9e0abc7c..5e3868cb72d9 100644
--- a/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_unittest.cc
@@ -28,7 +28,7 @@ TEST(BraveAdsSubdivisionUrlRequestJsonReaderUtilTest, ReadIssuers) {
           "name": "confirmations",
           "publicKeys": [
             {
-              "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=",
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
               "associatedValue": ""
             },
             {
@@ -45,7 +45,7 @@ TEST(BraveAdsSubdivisionUrlRequestJsonReaderUtilTest, ReadIssuers) {
               "associatedValue": "0.0"
             },
             {
-              "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
               "associatedValue": "0.1"
             }
           ]
@@ -70,7 +70,7 @@ TEST(BraveAdsSubdivisionUrlRequestJsonReaderUtilTest,
           "name": "confirmations",
           "publicKeys": [
             {
-              "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=",
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
               "associatedValue": ""
             },
             {
@@ -87,7 +87,7 @@ TEST(BraveAdsSubdivisionUrlRequestJsonReaderUtilTest,
               "associatedValue": "0.0"
             },
             {
-              "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
               "associatedValue": "0.1"
             }
           ]
diff --git a/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_util_unittest.cc b/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_util_unittest.cc
index e7f6815ed92a..f105da057cb2 100644
--- a/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request_json_reader_util_unittest.cc
@@ -42,7 +42,7 @@ TEST_F(BraveAdsIssuersUrlRequestJsonReaderUtilTest, ParseTokenIssuers) {
           "name": "confirmations",
           "publicKeys": [
             {
-              "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=",
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
               "associatedValue": ""
             },
             {
@@ -59,7 +59,7 @@ TEST_F(BraveAdsIssuersUrlRequestJsonReaderUtilTest, ParseTokenIssuers) {
               "associatedValue": "0.0"
             },
             {
-              "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
               "associatedValue": "0.1"
             }
           ]
diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.cc b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.cc
index 9ad4c3ad5d6e..89730cba9f51 100644
--- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.cc
+++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.cc
@@ -3,38 +3,91 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+#include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h"
+
 #include <cstddef>
 #include <optional>
 #include <string>
-#include <vector>
 
 #include "base/check_op.h"
 #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens.h"
-#include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h"
 #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_util.h"
 #include "brave/components/brave_ads/core/internal/account/wallet/wallet_info.h"
 #include "brave/components/brave_ads/core/internal/account/wallet/wallet_test_util.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signing_key_test_util.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.h"
 #include "brave/components/brave_ads/core/internal/common/crypto/crypto_util.h"
 
 namespace brave_ads::test {
 
 namespace {
 
+// TODO(tmancey): Decouple to challenge_bypass_ristretto_test_util.cc
+std::optional<cbr::UnblindedTokenList> GenerateUnblindedTokens(size_t count) {
+  // The server generates a random signing key.
+  cbr::SigningKey signing_key = cbr::test::GetSigningKey();
+  const std::optional<cbr::PublicKey> public_key = signing_key.GetPublicKey();
+  CHECK(public_key);
+
+  // The client generates random tokens.
+  cbr::TokenList tokens(count);
+
+  // The client blinds the tokens using a blinding scalar. Blinding ensures that
+  // the tokens are not recognizable or linkable to the original value until
+  // they are unblinded.
+  cbr::BlindedTokenList blinded_tokens;
+  for (auto& token : tokens) {
+    const std::optional<cbr::BlindedToken> blinded_token = token.Blind();
+    CHECK(blinded_token);
+    blinded_tokens.push_back(*blinded_token);
+  }
+
+  // The server signs the blinded tokens using its signing key. This signature
+  // proves the server’s endorsement of the tokens.
+  cbr::SignedTokenList signed_tokens;
+  for (const auto& blinded_token : blinded_tokens) {
+    const std::optional<cbr::SignedToken> signed_token =
+        signing_key.Sign(blinded_token);
+    CHECK(signed_token);
+    signed_tokens.push_back(*signed_token);
+  }
+
+  // The client verifies the batch DLEQ proof using the public key provided by
+  // the server. This step confirms that the signatures are valid and correspond
+  // to the public key.
+  cbr::BatchDLEQProof batch_dleq_proof(blinded_tokens, signed_tokens,
+                                       signing_key);
+  CHECK(batch_dleq_proof.has_value());
+  CHECK(batch_dleq_proof.Verify(blinded_tokens, signed_tokens, *public_key));
+
+  // The client unblinds the signed tokens using the blinding scalar.
+  return batch_dleq_proof.VerifyAndUnblind(tokens, blinded_tokens,
+                                           signed_tokens, *public_key);
+}
+
 ConfirmationTokenInfo BuildConfirmationToken(
-    const std::string& unblinded_token_base64,
+    const cbr::UnblindedToken& unblinded_token,
     const WalletInfo& wallet) {
   ConfirmationTokenInfo confirmation_token;
 
-  confirmation_token.unblinded_token =
-      cbr::UnblindedToken(unblinded_token_base64);
+  confirmation_token.unblinded_token = unblinded_token;
+  const std::optional<std::string> unblinded_token_base64 =
+      unblinded_token.EncodeBase64();
+  CHECK(unblinded_token_base64);
 
+  // TODO(tmancey): Decouple to cbr::test::GetPublicKey.
   confirmation_token.public_key =
-      cbr::PublicKey("RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=");
+      cbr::PublicKey("OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=");
 
   const std::optional<std::string> signature_base64 =
-      crypto::Sign(unblinded_token_base64, wallet.secret_key_base64);
+      crypto::Sign(*unblinded_token_base64, wallet.secret_key_base64);
   CHECK(signature_base64);
   confirmation_token.signature_base64 = *signature_base64;
 
@@ -45,48 +98,58 @@ ConfirmationTokenInfo BuildConfirmationToken(
 
 }  // namespace
 
-ConfirmationTokenList RefillConfirmationTokens(int count) {
-  CHECK_GT(count, 0);
+ConfirmationTokenList RefillRandomConfirmationTokens(size_t count) {
+  CHECK_GT(count, 0U);
+
+  const std::optional<cbr::UnblindedTokenList> unblinded_tokens =
+      GenerateUnblindedTokens(count);
+
+  const WalletInfo wallet = Wallet();
+
+  ConfirmationTokenList confirmation_tokens;
+  for (const auto& unblinded_token : *unblinded_tokens) {
+    const ConfirmationTokenInfo confirmation_token =
+        BuildConfirmationToken(unblinded_token, wallet);
+    confirmation_tokens.push_back(confirmation_token);
+  }
+
+  GetConfirmationTokens().Add(confirmation_tokens);
 
-  ConfirmationTokenList confirmation_tokens = BuildConfirmationTokens(count);
-  GetConfirmationTokens().Set(confirmation_tokens);
   return confirmation_tokens;
 }
 
-ConfirmationTokenInfo BuildConfirmationToken() {
-  const ConfirmationTokenList confirmation_tokens =
-      BuildConfirmationTokens(/*count=*/1);
-  CHECK(!confirmation_tokens.empty());
-  return confirmation_tokens.front();
+ConfirmationTokenList RefillConfirmationTokens(size_t count) {
+  CHECK_GT(count, 0U);
+
+  ConfirmationTokenList confirmation_tokens = BuildConfirmationTokens(count);
+  GetConfirmationTokens().Add(confirmation_tokens);
+
+  return confirmation_tokens;
 }
 
-ConfirmationTokenList BuildConfirmationTokens(int count) {
-  CHECK_GT(count, 0);
+ConfirmationTokenInfo BuildConfirmationToken() {
+  const cbr::UnblindedToken unblinded_token =
+      cbr::test::UnblindedTokens().front();
 
   const WalletInfo wallet = Wallet();
 
-  const std::vector<std::string> unblinded_tokens_base64 = {
-      R"(PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgC3B1+VD/uyHPfa/+bwYRrpVH5YwNSDEydVx8S4r+BYVY)",
-      R"(hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfXbBA023DYvGMHoKm15NP/nWnZ1V3iLkgOOHZuk80Z4K)",
-      R"(bbpQ1DcxfDA+ycNg9WZvIwinjO0GKnCon1UFxDLoDOLZVnKG3ufruNZi/n8dO+G2AkTiWkUKbi78xCyKsqsXnGYUlA/6MMEOzmR67rZhMwdJHr14Fu+TCI9JscDlWepa)",
-      R"(OlDIXpWRR1/B+1pjPbLyc5sx0V+d7QzQb4NDGUI6F676jy8tL++u57SF4DQhvdEpBrKID+j27RLrbjsecXSjR5oieuH4Bx5mHqTb/rAPI6RpaAXtfXYrCYbf7EPwHTMU)",
-      R"(Y579V5BUcCzAFj6qNX7YnIr+DvH0mugb/nnY5UINdjxziyDJlejJwi0kPaRGmqbVT3+B51lpErt8e66z0jTbAxBfhtXKARFKtGH8WccB6NfCa85XHBmlcuv1+zcFPDJi)",
-      R"(+MPQfSo6UcaZNWtfmbd5je9UIr+FVrCWHl6I5C1ZFD7y7bjP/yz7flTjV+l5mKulbCvsRna7++MhbBz6iC0FvVZGYXLeLn2HSAM7cDgqyW6SEuPzlDeZT6kkTNI7JcQm)",
-      R"(CRXUzo7S0X//u0RGsO534vCoIbrsXgbzLfWw8CLML0CkgMltEGxM6XwBTICl4dqqfhIcLhD0f1WFod7JpuEkj5pW/rg7nl48EX6nmekgd3D2Hz8JgJnSarzP/8+3l+MW)",
-      R"(hQ+6+jh5DUUBFhhGn7bPLDjqrUIKNi/T8QDt1x01bcW9PLADg6aS73dzrVBsHav44+4q1QhFE/93u0KHVtZ1RPKMqkt8MIiC6RG575102nGRTJDA2kSOgUM75hjDsI8z)",
-      R"(6tKJHOtQqpNzFjLGT0gvXlCF0GGKrqQlK82e2tc7gJvQkorg60Y21jEAg8JHbU8D3mBK/riZCILoi1cPCiBDAdhWJNVm003mZ0ShjmbESnKhL/NxRv/0/PB3GQ5iydoc)",
-      R"(ujGlRHnz+UF0h8i6gYDnfeZDUj7qZZz6o29ZJFa3XN2g+yVXgRTws1yv6RAtLCr39OQso6FAT12o8GAvHVEzmRqyzm2XU9gMK5WrNtT/fhr8gQ9RvupdznGKOqmVbuIc)"};
+  return BuildConfirmationToken(unblinded_token, wallet);
+}
 
-  const size_t modulo = unblinded_tokens_base64.size();
+ConfirmationTokenList BuildConfirmationTokens(size_t count) {
+  CHECK_GT(count, 0U);
+  CHECK_LE(count, 50U);
+
+  const WalletInfo wallet = Wallet();
 
   ConfirmationTokenList confirmation_tokens;
 
-  for (int i = 0; i < count; ++i) {
-    const std::string& unblinded_token_base64 =
-        unblinded_tokens_base64.at(i % modulo);
-    const ConfirmationTokenInfo confirmation_token =
-        BuildConfirmationToken(unblinded_token_base64, wallet);
+  for (size_t i = 0; i < count; ++i) {
+    const cbr::UnblindedToken unblinded_token =
+        cbr::test::UnblindedTokens().at(i);
 
+    const ConfirmationTokenInfo confirmation_token =
+        BuildConfirmationToken(unblinded_token, wallet);
     confirmation_tokens.push_back(confirmation_token);
   }
 
diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h
index 81ca2225d1fc..e5036d91e210 100644
--- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h
+++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h
@@ -6,22 +6,29 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_CONFIRMATION_TOKENS_CONFIRMATION_TOKENS_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_CONFIRMATION_TOKENS_CONFIRMATION_TOKENS_TEST_UTIL_H_
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_token_info.h"
 
 namespace brave_ads {
 
 class ConfirmationTokens;
+struct WalletInfo;
 
 namespace test {
 
+// Call this function to refill confirmation tokens for testing purposes with
+// random unblinded tokens.
+ConfirmationTokenList RefillRandomConfirmationTokens(size_t count);
+
 // Call this function to refill confirmation tokens for testing purposes if
 // code paths call `Confirmations::Confirm`, `MaybeGetConfirmationToken`, or
 // `BuildReward`. If code paths call `RefillConfirmationTokens::MaybeRefill`,
 // call `MockTokenGenerator` instead and do not call this function.
-ConfirmationTokenList RefillConfirmationTokens(int count);
+ConfirmationTokenList RefillConfirmationTokens(size_t count);
 
 ConfirmationTokenInfo BuildConfirmationToken();
-ConfirmationTokenList BuildConfirmationTokens(int count);
+ConfirmationTokenList BuildConfirmationTokens(size_t count);
 
 }  // namespace test
 
diff --git a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util_unittest.cc b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util_unittest.cc
index 2170b63d8307..5ac874a5880b 100644
--- a/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_value_util_unittest.cc
@@ -20,14 +20,14 @@ constexpr char kConfirmationTokensAsJson[] =
     R"(
         [
           {
-            "public_key": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=",
-            "signature": "+yxJmIDobOZ5DBncIVuzjQEZfIa0+UPrSQhzA5pwEAL9qC4UW7A1H35nKAhVLehJlXnnfMVKV02StVO3fBU5CQ==",
-            "unblinded_token": "PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgC3B1+VD/uyHPfa/+bwYRrpVH5YwNSDEydVx8S4r+BYVY"
+            "public_key": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+            "signature": "pWHhVf6jDdMbt2tKKk3E0JJAB7J5lGnJej/Vi9/UgQpdqw9kKBgvmj4ke0R2MP2n2ynhRjM1sRVZiez0G2hpCA==",
+            "unblinded_token": "/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JTrpqSWv/sNVO/Pi8nHDyl3CET+S2CKkMmYlXW3DgqxW"
           },
           {
-            "public_key": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=",
-            "signature": "WeBTGGAvueivHOo33UKGTgDRw7fF/Hp9+tNZYDlUjc9CIKt/+ksh4X+mVxSMXc2E1chUWqUDME7DFFuDhasmCg==",
-            "unblinded_token": "hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfXbBA023DYvGMHoKm15NP/nWnZ1V3iLkgOOHZuk80Z4K"
+            "public_key": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+            "signature": "4gR1GFr60vt8qJhZtuKHwJsysnH42dqD6lCt9f12krhXnAPKxZwwQXM583bH38vBooEG5sKkRaPPQltP5/c5AQ==",
+            "unblinded_token": "8o+uKml91AthZzZgdH0iVGtZHfK2lAmPFdlhfF8rXnF67OtwnzHntFOimAmE73L7d9zh2sl0TJMv0mYwFf3zfsLb7m0IE1e3UqGPVaKP3B+rLmCjbSau+mfzjqQ8OQMS"
           }
         ])";
 
@@ -65,6 +65,8 @@ TEST_F(BraveAdsConfirmationTokenValueUtilTest, ConfirmationTokensFromValue) {
       ConfirmationTokensFromValue(list);
 
   // Assert
+  const ConfirmationTokenList expected_confirmation_tokens =
+      test::BuildConfirmationTokens(/*count=*/2);
   EXPECT_EQ(test::BuildConfirmationTokens(/*count=*/2), confirmation_tokens);
 }
 
diff --git a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util_unittest.cc b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util_unittest.cc
index 404c15be95d3..0ef27911fb88 100644
--- a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_value_util_unittest.cc
@@ -22,14 +22,14 @@ constexpr char kPaymentTokensAsJson[] =
           {
             "ad_type": "ad_notification",
             "confirmation_type": "view",
-            "public_key": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=",
+            "public_key": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
             "transaction_id": "8b742869-6e4a-490c-ac31-31b49130098a",
             "unblinded_token": "PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgC3B1+VD/uyHPfa/+bwYRrpVH5YwNSDEydVx8S4r+BYVY"
           },
           {
             "ad_type": "ad_notification",
             "confirmation_type": "view",
-            "public_key": "RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=",
+            "public_key": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
             "transaction_id": "8b742869-6e4a-490c-ac31-31b49130098a",
             "unblinded_token": "hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfXbBA023DYvGMHoKm15NP/nWnZ1V3iLkgOOHZuk80Z4K"
           }
diff --git a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.cc b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.cc
index 9b5436abab24..7b876c634340 100644
--- a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.cc
+++ b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.cc
@@ -28,8 +28,9 @@ PaymentTokenInfo BuildPaymentToken(const std::string& payment_token_base64) {
   payment_token.unblinded_token = cbr::UnblindedToken(payment_token_base64);
   CHECK(payment_token.unblinded_token.has_value());
 
+  // TODO(tmancey): Decouple to cbr::test::GetPublicKey.
   payment_token.public_key =
-      cbr::PublicKey("RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=");
+      cbr::PublicKey("OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=");
   CHECK(payment_token.public_key.has_value());
 
   payment_token.confirmation_type = mojom::ConfirmationType::kViewedImpression;
@@ -45,8 +46,8 @@ PaymentTokens& GetPaymentTokens() {
   return ConfirmationStateManager::GetInstance().GetPaymentTokens();
 }
 
-PaymentTokenList SetPaymentTokens(int count) {
-  CHECK_GT(count, 0);
+PaymentTokenList SetPaymentTokens(size_t count) {
+  CHECK_GT(count, 0U);
 
   PaymentTokenList payment_tokens = BuildPaymentTokens(count);
   GetPaymentTokens().SetTokens(payment_tokens);
@@ -72,9 +73,13 @@ PaymentTokenInfo BuildPaymentToken() {
   return payment_tokens.front();
 }
 
-PaymentTokenList BuildPaymentTokens(int count) {
-  CHECK_GT(count, 0);
+PaymentTokenList BuildPaymentTokens(size_t count) {
+  CHECK_GT(count, 0U);
+  CHECK_LE(count, 50U);
 
+  // TODO(tmancey): Decouple and Generate new tokens using
+  // challenge_bypass_ristretto_test_util.cc. The public key will need adding to
+  // the payment token issuers.
   const std::vector<std::string> payment_tokens_base64 = {
       R"(PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgC3B1+VD/uyHPfa/+bwYRrpVH5YwNSDEydVx8S4r+BYVY)",
       R"(hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfXbBA023DYvGMHoKm15NP/nWnZ1V3iLkgOOHZuk80Z4K)",
@@ -91,7 +96,7 @@ PaymentTokenList BuildPaymentTokens(int count) {
 
   PaymentTokenList payment_tokens;
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     const std::string& payment_token_base64 =
         payment_tokens_base64.at(i % modulo);
     const PaymentTokenInfo payment_token =
diff --git a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.h b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.h
index f1c83ae6c4a3..1f5aac1fa5f0 100644
--- a/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.h
+++ b/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_tokens_test_util.h
@@ -6,6 +6,8 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_PAYMENT_TOKENS_PAYMENT_TOKENS_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_TOKENS_PAYMENT_TOKENS_PAYMENT_TOKENS_TEST_UTIL_H_
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/account/tokens/payment_tokens/payment_token_info.h"
 #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h"
 
@@ -16,13 +18,13 @@ class PaymentTokens;
 namespace test {
 
 PaymentTokens& GetPaymentTokens();
-PaymentTokenList SetPaymentTokens(int count);
+PaymentTokenList SetPaymentTokens(size_t count);
 
 PaymentTokenInfo BuildPaymentToken(
     mojom::ConfirmationType mojom_confirmation_type,
     mojom::AdType mojom_ad_type);
 PaymentTokenInfo BuildPaymentToken();
-PaymentTokenList BuildPaymentTokens(int count);
+PaymentTokenList BuildPaymentTokens(size_t count);
 
 }  // namespace test
 
diff --git a/components/brave_ads/core/internal/account/tokens/token_generator_test_util.cc b/components/brave_ads/core/internal/account/tokens/token_generator_test_util.cc
index 916a6b5b6dab..c41749cf8394 100644
--- a/components/brave_ads/core/internal/account/tokens/token_generator_test_util.cc
+++ b/components/brave_ads/core/internal/account/tokens/token_generator_test_util.cc
@@ -5,143 +5,15 @@
 
 #include "brave/components/brave_ads/core/internal/account/tokens/token_generator_test_util.h"
 
-#include <string>
-#include <vector>
-
 #include "base/check_op.h"
-#include "base/no_destructor.h"
 #include "brave/components/brave_ads/core/internal/account/tokens/token_generator_mock.h"
 #include "brave/components/brave_ads/core/internal/ads_core/ads_core_util.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace brave_ads::test {
 
-// Signing Key:
-//   p9d55MfQAPcFDoc57gratS4ZwP7eqSFR9EzQ0LjdrwU=
-
-// Public Key:
-//   bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=
-
-// Blinded Tokens:
-//   Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q=
-//   shDzMRNpQKrQAfRctVm4l0Ulaoek0spX8iabH1+Vx00=
-//   kMI3fgomSSNcT1N8d3b+AlZXybqA3st3Ks6XhwaSRF4=
-//   HNC7QMQWzzf+Oh95u0dCanUC9jfE+Um6dSqfV/etGmA=
-//   Bip78zU1Onnv4SAWNf983PKOc+4Z674cjpWFCkOQWl8=
-//   JOzzftwNy6L/DZks/h1IxGrujCwGlmmtf3XI1Rskojc=
-//   KN9qaHJoFsG4WlS0wqrrFvtH9lK+0dJAP1rxHVWA3mY=
-//   TrMU/qRrpMUXlMHd2Lv3qctyrJylw2Dww573dKjnmDQ=
-//   KrrcgMH/8dNp4SMQV6UO4HAJJ1UkHvyn5nriwXB9DQU=
-//   6vJAxVLmyX6f15roPvlfVunFRxgzdMNUVaW2URUVyl8=
-//   bn9Flqbtx1+cMe+1zxg2YBwir5SG5iBGcHHsy1ov9io=
-//   ZJgRVfnllv0cZsIY6vCIBDBfj0MH79O9iIAjE2tgcx8=
-//   8A/l2Jyb/PbAbqottQBvMH3PjXpo/BsNLcrO9XA5Zh0=
-//   vo1vTg5P4aZrCqa8XQlD9HDd7I9CwpoLTM+OenyQAxs=
-//   Cgzf7OBQ0MFgCUAHDIkbRA9VWWRftWY5ryR71YDMmyM=
-//   rPT6t6nB7gyIkMIRPWmrFKRsUiEQXMAJv1BwVo5h/wM=
-//   UA0ww/Rp0c/wjnuxwNClApgKJitVv/8AzfSXUzDwPB8=
-//   aCrGBtAfRYIdVSiZC/b+CxDpHpmuZZsPDZ4+wCTtgxs=
-//   jFcgvwkDg73uEm0FIkXynfXKRIqmiCYocNrXR99Lczs=
-//   zKid4BTQH4L0vQAB5eSaQZpDV2++vN/TzGo+2xNYMBw=
-//   FO0eQe97EurA0gfZMmPPQOtaHL36Oe0ppsEcou/DPGk=
-//   VBgsBQQuWz4rGRt0Np/C9DQCs1W6P5IDotymec5rHSc=
-//   0g4u7LXsz3xYu6AUvl4Nyc0noKA4oEgUmaoR/Eq6SUI=
-//   fsSAPvpcItEYlyP8cTPvtHJXetnyNrzFpH06IDl/T1Y=
-//   IryYkPpzqEWOJ2/L4y9Aq1RivBrhhqqj5WXg31sVYQs=
-//   eFwVmfeqjjGNRG94C3EGFvs6jJdiPI2JQoaylrf9Slk=
-//   dFz8S5yoZtpfIjQ8/VOAIJ1E2sNe5tWs81DVjHdOSlU=
-//   rjvZluoYh9qznp+s0aLfY5DN7fzRajqX2zBhzE/F/A4=
-//   KH+KBkDLSTmJ7oWoDZoM2uYwLagb1vp1Nv6RVzCnzVw=
-//   Ck0B8iyefPM3iCS37Wrwto88aGMaZnI70LJ/t4V0Nmg=
-//   UEUQyHa1SL9nbVHc/s5dAri0ffKc05N3UaTziBXUz0s=
-//   OEq8huSJaHCyQ0GD1ndGN3HmbxqLqFrxRYu4rRcoU0o=
-//   eo47t0y9YnhUq9E6USpSrRsKVDnKwE42Oj+2BuzM2Hs=
-//   5j3feCuFYFbtbQDWrVqjavZgNVJRfe5Ye56qZ/cpKWs=
-//   pHAeQZeGjmevJ3ANuSyKyva8BqZ7Qb5Nkk1QBJrAKBU=
-//   mMKgzasY/a8WatViT0jBIAnYBVani9KNw4cDgZSyAyU=
-//   KuCv8htyq/3uBNQXvsNRRiIzJrwOsd/IlUngMa8wUQM=
-//   /CwA7TJsUMxuS9xvQs4fB2MJGwY9wGYbaCOswX6XNVk=
-//   HjM5bebKsjgDfFxRN9+reqYHSHK1iIh2+vjUXhJh3xw=
-//   ctSqv2QNEiGOcySJ9Uq3uIbTXoFGQIVMZJA/jZT7eBA=
-//   fptOBB4M0fhYoT+qnclj7JXZwpQiLxMnZTosDfR1qxg=
-//   OIGR9QZOgeZceOrq0ZxM8hj1qTp78GjlSKzw2JgMZiw=
-//   Jvnj0RDBUgBsUmRkqL9BxlcjGg4g/aFaX039uaMzsVY=
-//   HNXIIRwYTc1ERgBVBrb4ZYN9lKn4wSqaaaysrQi+rUs=
-//   CvXEEsP6ltCSeQ2a5hmPA2SxBHPdEk6MLz9NW+qDKAA=
-//   4rN6kq7bP46W5C5jCBoFXhaSyAqt+G1YQEgvVwlUsCU=
-//   WMLVtZYQ50Z3UwVRbYVDCX/RaKgUyvhAdOOlYZAopzI=
-//   2qOMS1Utn2dWYK7+qxsycgPvPhUgBN4mH+BvyBDM9kw=
-//   YhojWF9EONUBPW6+VuvrsMt0MvVrX8MNK5OMb3f74lQ=
-//   8s+alELEHHB0MugTqobAd1o/oM4148iQmsicOuImWx8=
-
-// Signed Tokens:
-//   DA+IEWxDIW91q3JItW8D3xIYMgO0TDyP/TKXFQExLEs=
-//   3KQ0o6IgVLHpKLzH01cGxA89om8CvOrW+anxorhJISk=
-//   XlzLlvOPl3XqQAYF19ly95wnAu0IA5GNk9IIUVsen0Q=
-//   VIAZP4U2QYJt/uUHLf0rfTVmMqTbytvqEGWx5eZLYDs=
-//   rk+ollPWD+y8NlqiftGmr/riBJfsg34DM/M3Fi9BFA0=
-//   xn/IDC6/wUuag5XIHR34lnnMRTi1GDVb96MYmUBUgmo=
-//   iibC1sEFbkOqGvZuQgYG1vdr6QMfLYfvFWbybmo8Myo=
-//   GAw6J637OVCz7iKN1WSg5LbLem/CMGcIz/iqmcVEvBc=
-//   Vvr5eN/Wtk5papD2urom0iOZtInck8MCBFPKKn2yuEc=
-//   1unbpoVjusErAw5cM03aBAtVUS1rKz21Z+/qro4fKjY=
-//   /Efsmh2qQNviLW47/F7wjMYnvXsS3sNvoShIxg7tsCM=
-//   VrWO44mtMyBHi3vwG9WFJcnJAueZtqCcUsnMnaH8x38=
-//   yvr5gFkC70TOQuoPdc+1UUpL8TDvKgTHNIpIBqSVcic=
-//   EsbmSuk0n/bNwwg9w09+vcABAXyJWOJHllEJam0li1I=
-//   kpyU2LZomANA/sSiAmlhITmaSnUCF4k3ZbL8tC8bCBs=
-//   snY5KcxsrH4YtPtuATwrqFEsI8s41CwFwzD9NQPRYDM=
-//   Os0UZsMkLd2zjSvtlZXNONoC9lW88ub/am/m6M5JyA0=
-//   yhgSTuGXe/7rEOn71eJFsIs2yenE4yAqqQLTxZvj9AE=
-//   hswDh0BfDSFVC5IgVRo48u4DmNoVGXBguN0MvOcxFwQ=
-//   WKkneVbAf05kwIWiH8wN3jhNjwyJLYi9zH+wkNBo5nw=
-//   HH26LkAhxJxIFthoLyKD/OA67AzmyPW59ady3nYcnj4=
-//   5EPMh4OW09U3M4d8oPYv4OPtOZPiN0+cLTWIRc486lw=
-//   lhYrEba/qFw6hKUOhBJO6KVRUj4yQwXNhkhdNWvAFjg=
-//   XKkrY+E8P2c3vBLa2967Q1uP3o0bsz6ElDbetbiPuUE=
-//   /GgluIwAIj2zfuiY4YpfF+cLTByPNM37DBlld746bxY=
-//   dMwnd60OVo3jF/DkkZIO9Y68vvGoL0yfO9qlLsdTfwo=
-//   op4WXEs052uAvEvqvGWkr7PATcigxwwKExuIqMUoVQ4=
-//   VJrlz3pP+VNeBivSYUYOLqKEP2x9vr75AUkBcazpMhg=
-//   UJuKnh5+jVwrRctKm29v4FBLoLqy7Hq4ddr7Ci9o6X0=
-//   pEQVS63QXhWHHOIClAxKJFevczY2YcTnS5SnzxX/AAE=
-//   bjAvdetnrggnuQ4nUAG+SCUpMRhsnstXW/m9kIVwUys=
-//   tNcuHnWkzovoG/CQ/Uz8LwqojM9se+WxfdArBrMEjTE=
-//   lDT++JAPo/S5R4S9R9c/WBnrNq/qznsb121cybxDcFI=
-//   yIRJoQT0DErGmFNLt2DraTRqbiScbAh07TsAqHLAzlk=
-//   Vtt/1xciT3GzPVEqWS321kcD37JPW/gfA0i5A4jHSFA=
-//   WF1TDYuaZaah9xuS0PRonsMtwS/YYATyzrsB525OpEw=
-//   yq2LhUEeBFD2eaKu7Wmjyb1W2OyB482PwPKj7HjUaWg=
-//   JNbzAbJS/LWdUdWbd/epPHy935mpeo+1yBZrPQuH4k0=
-//   PPucf/FQzL7mU6Ec8gUtOiO+1V1sabDX76rqv/XjkFk=
-//   dH/pwaRwwyg9kSDUmGyfRSV94slSYXIbrl8ZhGkGiBQ=
-//   dj45NGx3tM2/t5hfu7shUxPKd1XmKpucopYBooxR/SE=
-//   emn0UWvwqfSZeR8uBqjT629UeP+7PXyfg4WXYIIk9BM=
-//   Gpiwdsv6YlBqgcWCA1oenPaX8VkvT2eXxvGC60SUC08=
-//   0m4tWlAVWh7OA1scMdbbXRLGM2ui72DbiSh3tgZ56Xk=
-//   uCYqm0IjumhZH7yBzZl+W2FbHwq3Qc0tV0CQTnJSV04=
-//   8OJEKXDcCoDEnzggFHaQpemkfPmHJ5u+isQzE8wnXkE=
-//   hHJHWTpnWUexvq8J218KqBqmblpimQR021/GbPFKT1Q=
-//   +MZDcE6B+WykiTN4ArTMQob21auW8/6PVAc4O62fq2s=
-//   MNm3EDUMslVioVqCDb5PkW8op+cHFyw8qo3BKxVZLF4=
-//   2LEoAWcTHMMFFV+/BYOGjPhdAtNL8asRwdliyaGQnRA=
-
-// Batch DLEQ Proof:
-//   gCF+6wrxT9bRFX+yjbdwPeWNZ8/wuDg6uZPy0Ea0yA2cfq5yEMpMfYMoH4BHW6EBbWR5QaOo1mVg+O9syYD3CA==
-
-namespace {
-
-const std::vector<std::string>& Tokens() {
-  static base::NoDestructor<std::vector<std::string>>
-      tokens({R"(aXZNwft34oG2JAVBnpYh/ktTOzr2gi0lKosYNczUUz6ZS9gaDTJmU2FHFps9dIq+QoDwjSjctR5v0rRn+dYo+AHScVqFAgJ5t2s4KtSyawW10gk6hfWPQw16Q0+8u5AG)", R"(SIXXr9oqmgiM3kFc/dfowJm+XZFkJRzIK4K8rpummrbYqTb/LOD73S037olwc0O/amQG7wEvs7NI3L+WUI0Qcgi+E6lT+smuWPXgQEvCZUUK6KYbDjCSvu0ZaO340+8I)", R"(xaU6n7xHrHu2SmO0KMyxgSlizSuzfycBgEx60aWDGWr7bXFERMCbpuMZlDj5f0NZ5afzCVR/IkytDpT62JQ6krKWX2wbmle/+Z/bh+DyrVEAVDWictj+YgXANF1ZnBIJ)", R"(AE+DFMLLmoj2r6VqC0HiFB8UQW5bfeqSw3DEBAEZX4D+AnUuIUgUNMxsyi7ZHcGmN8OrmwN1qbZQ6lyIvhSy63nv5tckQchU9XFWulcoVeBM8L7VRK69gHpzmWnq7scH)", R"(mO1Z9CIXTuvoGI/XNAb0EWLZf+2J+ALkrogJw7Y0FIODh2L6SImbRCLE+fasKyCiJwdzlRfylDv8ePPDtm4RWZ01SWP7m2ESfbkwPWeh9Gr0Xulg55dwXAKzhUB7vCcB)", R"(CiMm8C+ZNgmOuEi/nwrv0oR6B84l0iJtGeI0FRepz+mCxIx/wE0maXIwAJpjapo4zKjSB9wFhgdVjUzy/wv73o48wz/bBpPC1A+1d7dZeE2mLnYNXqZS+6DwOvSQqUcL)", R"(jEwqECOC+p9wKz21qYH4YFoY1GfzBO8NFiTq46RFLGs7tv5x4cM/ll2Wcr1SltGGvQ8GC4fonm/6V+O4I3AEBy2DGsjmnVUF0OuDeoq6qE48stC0hVipOZoAL+clxH0D)", R"(t48lP8F37p/dxTjkn9UmBRMiaWLE6mmcWn1LIwKTUz5iTB/gBmrTvCiSlxs8ggBV2oc0C/GxprAFLK3zPNKZVG+YdQZIhc+0Px1+Z/9SUupHqOhW3UnktAzblYmzcdEE)", R"(I2c7jiD41RS87xHPf1DXbHJ17PQ+8Tjo262y+ZpFadcJc5Mb/lVACVuJtmvQL5zZKHXePyU8ja/va4IIhDsDq+nKOBTUhfWllcycB++vZMYpAQ9tu7NApxB3rEwIZcoM)", R"(4tpgGG5F2vfzKgwa1zVzleow1ZuVbs6MbHgwnrqIRiC3dnbhDgqpdFQp/TDCxHbWSSKXcKClduu0VzMRdSkc/K26AZ1gPSYua3nHW2QQC016StGGp6bc2erCPiNLFzMP)", R"(LMf4p1jgLl1iSHAXg0E0jlBNQuvfjb7ijhSMnoVGKejnQIpyOJWDyxGJ9aoX0kNhu0SL+vJPtshkzHbp/+rK/p7W+1LY6oEUBRTB94AGZCzjneLxlc5skd7h9w9HHc8N)", R"(mgoPfFvPF/7kFUyYFfLbowW0NteiQnwphdK1kDNMFcEZD7ynXXGXEKDeNiYqBHItJc7BJvx1cCH+9CJfNn2SGbWvhJ8Y+snREgDwgEo7MGkTUFEm9l6S4psiVYpO20UL)", R"(KKiLhNB3O5oPGOztJUdAvq+bPJamKvcT74uyhmpg8qC46OwBsg7R0lxxistpqIkvpxFkTpCQvVtxAmzwLRxAx+SESEjdU+ehw6uXDlPTiD3GkWd7O1bGfzsNQKPRACgA)", R"(V+5MAR7zP6NpiDJqcpL6JCPxCsTIzFfsFwoZoJ3EYpTrfikcR9pJNtajnhIjbxrn99acocksuJDnvwptyqfyY7Zay07dZ+V3SZ+mlwnJMGAp19y7rObC2pN8E/2pC1UP)", R"(H5R6i2tirFKculydzNe2o06diEVrbvgUrXNtvsUBUgn3KF7Byq040yTCQIIlr+8IBbv8APl4AxDw8MILKylN6aUcbTnplp/pXKrQOb2ZTKt8WJTFL85Wv6Hhfr02+TQC)", R"(jSuz7mY/Q9oE9xSV7dy6XNa4g2DGVr7ZjZlyXg5paO3CFm1e9WvFlWbL3G3/N2ajNtRo5l37QSMXUOyRW0AY3IFFL44hZ/9Iy4Xct6lXHae5JLTWwr9JBe7ZberWK6AI)", R"(IrE4XOLAEwzpM9pmay3P7F9QsjciZIx1KfYpSUP2h8xeEMOwA7Tipqk8Xm4NzA6OdioAKlxf47PlbxeaEoVnoSkGL2fJn6RIcb0GxUg4t4KAA3D8rf0Wg5YW8YeGp+QJ)", R"(zO1nsI/DvPeMrPC9aPpHJsBWioVkD0RDSoVaa4yhCPXGrQN1bdKhpLZGriJyH7mQbtqm0MGKVelRC0alTSjsOsYdpz/BY64GutmZBITb9vaoSAparGP7ROqfVYJ5jZYL)", R"(9H/18LRQXRpARudmkiLe7Wvaq4twWq1MROc3Wt0PxT8kq85tLnvz7RXe7NRtKdnCyyvPHTs1hffixXuBJt8IIxE1OKYoqsiplMDGZZF2JqmP+m+EPhA0JnRSIJv3wy4B)", R"(j+D7QBcWiF5MmPOBpnCgLpgK9CbtIsKiGLoTqIHcqFs3Dki2dVfoj7tiEZEb81l5NLts5E+cNMU58S7/3BSRt0L92qx5oFreA1Z47UKqApPft/mDwzpkz4h4Escve2AI)", R"(BQ0u0OSkYiUbl3tiIOs4QHU/Odi2Cqt2oWZfCVAdH0tY6c6NEOkJx0nSoQifnuFsTYGKF+JEJTGiqYFHj8GxsOaspfsYVX4Qbx78Rdc2wMbIu4KbCaOl5Mm7N2uD43EL)", R"(y2kdqj1nDkNQobOmh/ODJ0h6Y15Zec11F16OGA5xOKNGDYUTgkKdCjl98i3nkfbctECkwNtgJ0RMMf2Ry42jnuxdhASRqKkpWJRhcaT0nCoJbDwXJUMSDMrOKq3ph78G)", R"(Zh4ZWKAyW9siFmQtKfA38Y7s714vU+R3r75D69h0cqXXe/rF+zjlGxDkhGSjgRwolkyE4sGHonMo44trpnnKsN+dPIlt12ynJXZ9UCIIbj7c+ZVSyK1ZhAN8mSdJqd0L)", R"(A1F0VCfTLHLN6ccYvHsL+9RjH3F8mA0ywplwOfGM3BzQRKq5acd6dbkks69hJnAtlaE/Clv/XMDxW06U5CY3CyLieu6ZGHReQ/ps9i4x3LZDhfB4Utg2jRG9oxNZkpkJ)", R"(pgIzidhnQC2PcoLqUzDF/T/1TVOPyGwYU5ywvIH5mamMOhE/7rxzFPKE0gNUpgsC/CEfht578yauLdU8LZWFZXgMwMCHoBZi1zBpEVGi/fW/79oeiUzOrFCiyFekbZQP)", R"(eiu1XoT/apSgB0klucjwEukgUt6+Xn8tBqXPFV7kJHaYoKXcC+gkdjhUTQlVQfufrauC1yHo3OVayo77YL8jN4sEB7tNMqc8Gx133YVPr/fx5za7rJ6zbFZAeKiI3hQF)", R"(x6/nCOpvodymKMF988O548b+dK9vUHXZEAuEH4o4P/2p1WwWuKuVXqyOIooCXTERb1a3Ti7amLu+utqgkRevL7by9+hiiSngnmOMcIE9awF0cSAKqKr5aPpYcFwmVIcO)", R"(m3TDBqsqauy3Kwuk3/WZaLB0Se//fGM+jS3Y5ZSylnC4osWwk1cz+C9Ee7Z9XjhTmAm3kmCyswI1f2RZXVScGkvImgJTtVLxAVQGCq6Lm2j0rFhqwz9IBMjjMjf/2aAK)", R"(WQRkd4GwN3BITmrHThH63vZsF5SmxPOnqd+evDDRtuaZRkUJQz443KA+EBTehcZGKodrDasKPTuAdCN/3pHESZUXV2xzrFbUA921XwlT3ZnDroUPgzqbLL+aToXFJn4L)", R"(4rCEOvy7x+nQOMMEttNsKo1wt5fCCWlyKTqy29LTcUrycHGV8pBZ6zegd52rhH1JkHWn8ikD9TE9sJ3+QMBHx0+/wVxy6eEIsVF25xLJidn7aChVyeMxKUve4lejgJQC)", R"(BvFJm+A7zKnNekfQwkfxhT5F8cC6f3GSavQqpAdtiJwq6FnIM7nVubXUdpQ8yQ24YGTH706j3Uyt6bodM4jVlk6EifHNJoK91eQzjT5zKylvda/JGoRyRH3VARCZkGMK)", R"(tiPYfNtyvCfSIDuFRVCZmal5SLvXunHUGji9OkJQywVrcpYwfq5EOkRFZ/QG8tRerCcR8pdr56Lt5OFaXRqRcaRMFxq6r/7wPqBGKQ06ib3KlZf8EF7TFFxQt7JE5PsP)", R"(GN4SMp4eVswnHxMnMv9rJSI8qAuN6PvosSV9vGUQdSFgLXx6MOZlHdsBwJtjLbHosLxLNbqIV/yyYULvU+uSptylVPjcSuFsOH9+e4N3ftyJV648M4nXRXNY8RwFcygG)", R"(iQoAmRHO28LLbdVJS+xYmyryE416dIJnF/8Ak9PaB8YAXOxog39kIj2K8nFUCnCQj30MXINBani6621nVAzcHpWQLP/0xmJd750LWMLi6FEKQVJ0vQdh+fqB2mhZrR0F)", R"(E7ksbu5grsY/axGwiee0l1PzFezAxxXDaakfzcMdM0KETswMr61xvZLpLqhmhLJ3RZ36xfs/nZJKr/OtyfVdoyGw+w5FZzx0HsOeBGgWj9i/oiO4sUTVzW9YK+KGLzwK)", R"(18P5NEgI8POskp+IX6dwdw2X9+fc8C4ffcYrEXcsqSDUOga60Au7pS+jqIWgLTjKzh5dvsxVPibQQEraAB/6/y6FWqmR8Er01WXd1rei/GwMHujnhWeuXBOsiKNJELED)", R"(Tya9Amnkf2bc3d3Eittou6EWfKaYko1zWepKAqZVPcl6gaHsrF2RPg9pO06a2N3DcER0USq/c5I+Z9LUz7amsuMztKoH1F+P/PpAEVJvT20Wlh4T5n1AWqSl8xHdnSgJ)", R"(1IIpZk5QuZCN5/ZFECV8YRCM936tfEPv78nTlVw59nw6n0BjkWBtLqk79S7pSkDaDnuXkmCOIVYRlvyduYpNdOgfDQEcuUEAgQZSimjw4DAHUvXOI/aDY2TJt1KqNwsK)", R"(7zLuE9ZorFPLCXRnl1NuU0f7tG3O1wthMDD3QfNi3iXp12DM+1ca5F3mq6/6eGl4uh1sIn6CgWiApHdUjmrNshMDikziuTTrW+ESaQJ+NLygWeNkv1nX0EcMv713mHAK)", R"(G+bzX+UaUOUBkdZ2NFBaFLN9cV7WyqDp9LLqhcvCtuMXM47CPAC7psvnx9vhQFd4H/km4FQDF2ACNfaMRQpwauIyce6b1VCCuPEu/bk3Tc6AKELazXObg5JWKmE+IBoM)", R"(3zZ5qq0Q+fT0tg1xIA1JPvclnTalTownxM9D5CPyguRuvnKYL1AkpqpHrlrW3aHPvumjJHmfoK8aGd+qDEokMKPAumkzLIKjGJBsQSwtTZ9mBIacHNZ2zcnK3NJUxsIK)", R"(EDvcX938qjWeXUBWdkUchcvRihQgMTedu+Xj3qUAyDI5t6pp9riJacYejKHDNKlN/Ihv6WmSv2ly7J0IdfUaXxozKdCgIswfP8yMrYlSNNLsAvufcEroSAJ1gyPIyt0G)", R"(d3P9GWd5jsWcKHWFeJXhHpi1dUFRH4Yi1re+6J60b+4Fekdos7fd6Nc98CZZr25gSv0we2LOWgDHfzKewDf+jOewiCHKTS2d4dqRCkShdSQFGxOh5NXwQ3suVWPpPTQO)", R"(w9Yr9tE37qHBEQllAHSFqxVJec9xNxVGz+YKXA5oiSVcfacXSgiOHnTVDCgAt7s2IIPFPAlBbWIMTwRZV9YXpZElMbsra7KcCTMT/JfHo5FinoGDnoI70hL6Rh81s24K)", R"(yY/f2PcUXbbpdbLMPfn+xzcZA7+WGqUV7KA89tD9zyfIv8BvavaUwcRo3E/lK9BzlwoFhS3qh2NGhqPZvNL1XbuFe3FS0eymQ2b9IVW9m7tmsEmMebSq/2XoqzpW0hoA)", R"(ss8UWBCNtn6+G6YfKd4CfsyPZaSQKo+ALkADAB3ZvnRhWp6SIII/Yj4Im5/OmTqhttaU9cA213HaOLGILh7RENT/Gu4i5ynwD+ZLoOlMVOjXoqFChYlv4F74GdTHWSAK)", R"(8PJB4cRDBZ5hd38nuiN+Zk9Blmi+EYhe0ioki+6VPeP4SfYHhokGmIh8d9+X6VMztfAlJKjIBNVrsHIFkP9soTXzJ9qkWJRc70ck6liAscFRaUHLfPx7Pqxax1nI0eoJ)", R"(G3DfPEcEMNntEGh2aURY4DY3cuxedEOVwy1zgM+10Do8Ro3mAc0jcdt5ObjmuiwjA5LWbFOaWxO2nLfqfSJSNBsj7sY/XEzFDweDz0+uTHolKfOdT9c/sIIs5/YZw78H)", R"(5OC85vTcMLhhQOlps973ITOzvU396bs0WH/RL1to2YCn7Nq5Jwi8a6j+o4LKJ6QxAk23Mb69lL213CgpJwidbj2zhyjcyHv0SmlsEWSc8wWqRB3W5xyKpQeaH5idIbkG)", R"(QD2dDacXv6U/Ng7QpMme8EwRTXBtEjbbkd8sesX/dobz1VmCyyuaW1iFpzkkg+1RXfUquyueiN/FjU77an3GyBiU1auMY++XVn2pEm6Nzu0ippW757AjLSw2jkEzC8UN)"});
-  return *tokens;
-}
-
-}  // namespace
-
 void MockTokenGenerator(size_t count) {
-  CHECK_GT(count, 0U);
-
   const auto* const token_generator_mock =
       static_cast<const TokenGeneratorMock*>(GetTokenGenerator());
   ON_CALL(*token_generator_mock, Generate(count))
@@ -150,14 +22,11 @@ void MockTokenGenerator(size_t count) {
 
 cbr::TokenList BuildTokens(size_t count) {
   CHECK_GT(count, 0U);
-
-  const size_t modulo = Tokens().size();
+  CHECK_LE(count, 50U);
 
   cbr::TokenList tokens;
-
   for (size_t i = 0; i < count; ++i) {
-    const std::string& token_base64 = Tokens().at(i % modulo);
-    const cbr::Token token = cbr::Token(token_base64);
+    const cbr::Token token = cbr::test::Tokens().at(i);
     CHECK(token.has_value());
 
     tokens.push_back(token);
diff --git a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc
index a5a06b1115bd..d1aef5ee00b7 100644
--- a/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc
+++ b/components/brave_ads/core/internal/account/user_data/fixed/rotating_hash_user_data_util.cc
@@ -29,10 +29,13 @@ std::optional<std::string> BuildRotatingHash(
   const std::string hours = base::NumberToString(
       base::Time::Now().ToDeltaSinceWindowsEpoch().InHours());
 
-  const std::vector<uint8_t> rotating_hash = crypto::Sha256(
-      base::StrCat({device_id, transaction.creative_instance_id, hours}));
+  const std::string rotating_hash =
+      base::StrCat({device_id, transaction.creative_instance_id, hours});
 
-  return base::Base64Encode(rotating_hash);
+  const std::vector<uint8_t> rotating_hash_sha256 =
+      crypto::Sha256(rotating_hash);
+
+  return base::Base64Encode(rotating_hash_sha256);
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/user_rewards/user_rewards.cc b/components/brave_ads/core/internal/account/user_rewards/user_rewards.cc
index c673617912df..d8490594ee07 100644
--- a/components/brave_ads/core/internal/account/user_rewards/user_rewards.cc
+++ b/components/brave_ads/core/internal/account/user_rewards/user_rewards.cc
@@ -82,8 +82,8 @@ void UserRewards::OnDidRedeemPaymentTokens(
       }));
 }
 
-void UserRewards::OnWillRefillConfirmationTokens() {
-  BLOG(1, "Refill confirmation tokens");
+void UserRewards::OnWillRefillConfirmationTokens(size_t count) {
+  BLOG(1, "Refill " << count << " confirmation tokens");
 }
 
 void UserRewards::OnDidRefillConfirmationTokens() {
diff --git a/components/brave_ads/core/internal/account/user_rewards/user_rewards.h b/components/brave_ads/core/internal/account/user_rewards/user_rewards.h
index 7634dbbbdf7c..d0c17222ed7b 100644
--- a/components/brave_ads/core/internal/account/user_rewards/user_rewards.h
+++ b/components/brave_ads/core/internal/account/user_rewards/user_rewards.h
@@ -6,6 +6,7 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_USER_REWARDS_USER_REWARDS_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_USER_REWARDS_USER_REWARDS_H_
 
+#include <cstddef>
 #include <string>
 
 #include "brave/components/brave_ads/core/internal/account/issuers/url_request/issuers_url_request.h"
@@ -53,7 +54,7 @@ class UserRewards final : public AdsClientNotifierObserver,
       const PaymentTokenList& payment_tokens) override;
 
   // RefillConfirmationTokensDelegate:
-  void OnWillRefillConfirmationTokens() override;
+  void OnWillRefillConfirmationTokens(size_t count) override;
   void OnDidRefillConfirmationTokens() override;
   void OnFailedToRefillConfirmationTokens() override;
   void OnWillRetryRefillingConfirmationTokens(base::Time retry_at) override;
diff --git a/components/brave_ads/core/internal/account/user_rewards/user_rewards_unittest.cc b/components/brave_ads/core/internal/account/user_rewards/user_rewards_unittest.cc
index 1eedfc438893..ee18f2e5cb03 100644
--- a/components/brave_ads/core/internal/account/user_rewards/user_rewards_unittest.cc
+++ b/components/brave_ads/core/internal/account/user_rewards/user_rewards_unittest.cc
@@ -75,7 +75,7 @@ TEST_F(BraveAdsUserRewardsTest, DoNotFetchInvalidIssuers) {
                 "name": "confirmations",
                 "publicKeys": [
                   {
-                    "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg=",
+                    "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                     "associatedValue": ""
                   },
                   {
@@ -112,7 +112,7 @@ TEST_F(BraveAdsUserRewardsTest, DoNotFetchInvalidIssuers) {
                     "associatedValue": "0.0"
                   },
                   {
-                    "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+                    "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                     "associatedValue": "0.1"
                   },
                   {
diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_test_util.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_test_util.cc
index 88dbef8e8f78..d08fcdd0e04e 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_test_util.cc
+++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_test_util.cc
@@ -27,10 +27,10 @@ std::string BuildFetchPaymentTokenUrlResponseBody() {
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw==",
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })";
diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc
index 7a566bddbe2a..18720931838f 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/redeem_reward_confirmation_unittest.cc
@@ -311,10 +311,10 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw==",
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -359,10 +359,10 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw==",
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -448,9 +448,9 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw==",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -496,9 +496,9 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
                 "publicKey" : "INVALID",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw==",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -543,9 +543,9 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "paymentToken" : {
                 "publicKey" : "Si61i/8huYsx01ED6SZIOvDuD6GQV5LAi2CMu3NAVCQ=",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw==",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -590,9 +590,9 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -637,10 +637,10 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                 "batchProof" : "INVALID",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
@@ -685,8 +685,8 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw=="
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg=="
               }
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
@@ -730,8 +730,11 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
-                "batchProof" : "FWTZ5fOYITYlMWMYaxg254QWs+Pmd0dHzoor0mzIlQ8tWHagc7jm7UVJykqIo+ZSM+iK29mPuWJxPHpG4HypBw=="
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
+                "batchProof" : "6bAH3z5sAoLdtM5tDrSJkhcYi4lp3GY+jh/ubSxTnQCgfkmKve/7s1bcIzvjsLvvPDuWABRZyBml6IzeG86ICg==",
+                "signedTokens" : [
+                  "INVALID"
+                ]
               }
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
@@ -775,10 +778,10 @@ TEST_F(BraveAdsRedeemRewardConfirmationTest,
               "modifiedAt" : "2020-04-20T10:27:11.736Z",
               "creativeInstanceId" : "546fe7b0-5047-4f28-a11c-81f14edcf0f6",
               "paymentToken" : {
-                "publicKey" : "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=",
+                "publicKey" : "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=",
                 "batchProof" : "INVALID",
                 "signedTokens" : [
-                  "DHe4S37Cn1WaTbCC+ytiNTB2s5H0vcLzVcRgzRoO3lU="
+                  "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs="
                 ]
               }
             })"}}}};
diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_test_constants.h b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_test_constants.h
index f04d87715765..263bf4594e62 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_test_constants.h
+++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_test_constants.h
@@ -9,7 +9,7 @@
 namespace brave_ads::test {
 
 inline constexpr char kCredentialBase64Url[] =
-    R"(eyJwYXlsb2FkIjoie1wiYmxpbmRlZFBheW1lbnRUb2tlbnNcIjpbXCJOSktBRFZNTlphZkEyVUFDTlkyVGxSZWFDSG43cW5mWndLZEdrd3dtSzBFPVwiXSxcImJ1aWxkQ2hhbm5lbFwiOlwicmVsZWFzZVwiLFwiY291bnRyeUNvZGVcIjpcIlVTXCIsXCJjcmVhdGl2ZUluc3RhbmNlSWRcIjpcIjQ4OWIxZGNjLWQ5MzgtNDFjZi05MmE4LWJhY2VhMGFiYjQ5MFwiLFwicGF5bG9hZFwiOnt9LFwicGxhdGZvcm1cIjpcIndpbmRvd3NcIixcInB1YmxpY0tleVwiOlwiTEFxSnhmeVhnV241MlhRQXFxRVhPMFAvVjQ2dVpjU0kvb1hMZFp3ekFnRT1cIixcInN0dWRpZXNcIjpbe1wiZ3JvdXBcIjpcIkV4Y2x1ZGVBZElmV2l0aGluVGltZVdpbmRvdz0waFwiLFwibmFtZVwiOlwiQnJhdmVBZHMuRnJlcXVlbmN5Q2FwcGluZ1N0dWR5XCJ9LHtcImdyb3VwXCI6XCJUcmlnZ2Vycz1FTVBUWS9UaHJlc2hvbGQ9MC4wL0lkbGVUaW1lVGhyZXNob2xkPTVcIixcIm5hbWVcIjpcIkJyYXZlQWRzLlVzZXJBY3Rpdml0eVN0dWR5XCJ9XSxcInR5cGVcIjpcImRpc21pc3NcIn0iLCJzaWduYXR1cmUiOiJlU3RqbkMzamVUWVBsSXJmb2JSdnBiL05oVCtZQmc1YlllVHlLN3NUcHd3em1pc0FOY0FUU2NSMXRYQkwzOTdFY1NXdVJ5ZHhwQk9ReFF5a0VHQUwrQT09IiwidCI6IlN4UllQVTJVamFNVjhhanV4QmVQRGlCWStsQXM3VHdIc2pubzVHYUJhc2hlZ1BZMmkyUGtTbSswWUIzT0toQ2hlTmVSNWNrYmMvRmREbnFqVktxMW1BPT0ifQ==)";
+    R"(eyJzaWduYXR1cmUiOiJkaXZoV2dkM2w0TVpZeG9NV1VwL096RnRnc1VBdXlxcEo4R0J5emp2TFBFWkMzUGo3alhucWFXUmVWbU83cU5FNzNkWThaSk5ZQVBCaTZFV2pGMWpFZz09IiwidCI6Ii9tZlRBQWpIcldtQWxMaUVrdGJxTlMvZHhvTVZkbnoxZXNvVnBsUVVzN3lHL2FwQXEySzZPZVNUNmxCVEtGSm1PcTdyVjhRYlkvREYySEZSTWN6L0pRPT0ifQ==)";
 
 }  // namespace brave_ads::test
 
diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc
index 07c0799d6183..b0ab9f7fe196 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_unittest.cc
@@ -55,10 +55,10 @@ TEST_F(BraveAdsCreateRewardConfirmationUrlRequestBuilderTest, BuildUrl) {
   const mojom::UrlRequestInfoPtr expected_mojom_url_request =
       mojom::UrlRequestInfo::New();
   expected_mojom_url_request->url = GURL(
-      R"(https://anonymous.ads.bravesoftware.com/v3/confirmation/8b742869-6e4a-490c-ac31-31b49130098a/eyJzaWduYXR1cmUiOiIxVGlxd3czcCtRSG9Ca1RLQUQ4UXdlOXFoVE12eDlMWnBzWFRtaDMwR1Y0QjFtRzRWUjEwT1VUOFFjS3VPQlJnZk1KeS9HSGN5bi9OOXhnNHBrMHh5QT09IiwidCI6IlBMb3d6MldGMmVHRDV6Zndaams5cDc2SFhCTERLTXEvM0VBWkhlRy9mRTJYR1E0OGp5dGUrVmU1MFpsYXNPdVlMNW13QThDVTJhRk1sSnJ0M0REZ0N3PT0ifQ==)");
+      R"(https://anonymous.ads.bravesoftware.com/v3/confirmation/8b742869-6e4a-490c-ac31-31b49130098a/eyJzaWduYXR1cmUiOiJCNWduZUhtbjBsUnRmaHEvZURVNVdueDFkTC9ZbEE1dGkybTZmMW1RM0h5ZDFVb3lYTGtQdGJFS0xFeXpKbW5ORE1JaGtRZTNTYlptWEVlM1JtU0RBQT09IiwidCI6Ii9tZlRBQWpIcldtQWxMaUVrdGJxTlMvZHhvTVZkbnoxZXNvVnBsUVVzN3lHL2FwQXEySzZPZVNUNmxCVEtGSm1PcTdyVjhRYlkvREYySEZSTWN6L0pRPT0ifQ==)");
   expected_mojom_url_request->headers = {"accept: application/json"};
   expected_mojom_url_request->content =
-      R"({"blindedPaymentTokens":["Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q="],"buildChannel":"nightly","catalog":[{"id":"29e5c8bc0ba319069980bb390d8e8f9b58c05a20"}],"createdAtTimestamp":"1996-07-08T09:00:00.000Z","creativeInstanceId":"546fe7b0-5047-4f28-a11c-81f14edcf0f6","diagnosticId":"c1298fde-7fdb-401f-a3ce-0b58fe86e6e2","platform":"windows","publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk=","rotatingHash":"jBdiJH7Hu3wj31WWNLjKV5nVxFxWSDWkYh5zXCS3rXY=","segment":"untargeted","studies":[],"systemTimestamp":"1996-07-08T09:00:00.000Z","transactionId":"8b742869-6e4a-490c-ac31-31b49130098a","type":"view","versionNumber":"1.2.3.4"})";
+      R"({"blindedPaymentTokens":["+qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0="],"buildChannel":"nightly","catalog":[{"id":"29e5c8bc0ba319069980bb390d8e8f9b58c05a20"}],"createdAtTimestamp":"1996-07-08T09:00:00.000Z","creativeInstanceId":"546fe7b0-5047-4f28-a11c-81f14edcf0f6","diagnosticId":"c1298fde-7fdb-401f-a3ce-0b58fe86e6e2","platform":"windows","publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=","rotatingHash":"jBdiJH7Hu3wj31WWNLjKV5nVxFxWSDWkYh5zXCS3rXY=","segment":"untargeted","studies":[],"systemTimestamp":"1996-07-08T09:00:00.000Z","transactionId":"8b742869-6e4a-490c-ac31-31b49130098a","type":"view","versionNumber":"1.2.3.4"})";
   expected_mojom_url_request->content_type = "application/json";
   expected_mojom_url_request->method = mojom::UrlRequestMethodType::kPost;
   EXPECT_EQ(expected_mojom_url_request, mojom_url_request);
diff --git a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_util_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_util_unittest.cc
index 6ce56058828c..426c53b8bb0b 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/redeem_confirmation/reward/url_request_builders/create_reward_confirmation_url_request_builder_util_unittest.cc
@@ -16,7 +16,7 @@ namespace brave_ads {
 TEST(BraveAdsCreateRewardConfirmationUrlRequestBuilderUtilTest, GetPath) {
   // Act & Assert
   EXPECT_EQ(
-      R"(/v3/confirmation/8b742869-6e4a-490c-ac31-31b49130098a/eyJwYXlsb2FkIjoie1wiYmxpbmRlZFBheW1lbnRUb2tlbnNcIjpbXCJOSktBRFZNTlphZkEyVUFDTlkyVGxSZWFDSG43cW5mWndLZEdrd3dtSzBFPVwiXSxcImJ1aWxkQ2hhbm5lbFwiOlwicmVsZWFzZVwiLFwiY291bnRyeUNvZGVcIjpcIlVTXCIsXCJjcmVhdGl2ZUluc3RhbmNlSWRcIjpcIjQ4OWIxZGNjLWQ5MzgtNDFjZi05MmE4LWJhY2VhMGFiYjQ5MFwiLFwicGF5bG9hZFwiOnt9LFwicGxhdGZvcm1cIjpcIndpbmRvd3NcIixcInB1YmxpY0tleVwiOlwiTEFxSnhmeVhnV241MlhRQXFxRVhPMFAvVjQ2dVpjU0kvb1hMZFp3ekFnRT1cIixcInN0dWRpZXNcIjpbe1wiZ3JvdXBcIjpcIkV4Y2x1ZGVBZElmV2l0aGluVGltZVdpbmRvdz0waFwiLFwibmFtZVwiOlwiQnJhdmVBZHMuRnJlcXVlbmN5Q2FwcGluZ1N0dWR5XCJ9LHtcImdyb3VwXCI6XCJUcmlnZ2Vycz1FTVBUWS9UaHJlc2hvbGQ9MC4wL0lkbGVUaW1lVGhyZXNob2xkPTVcIixcIm5hbWVcIjpcIkJyYXZlQWRzLlVzZXJBY3Rpdml0eVN0dWR5XCJ9XSxcInR5cGVcIjpcImRpc21pc3NcIn0iLCJzaWduYXR1cmUiOiJlU3RqbkMzamVUWVBsSXJmb2JSdnBiL05oVCtZQmc1YlllVHlLN3NUcHd3em1pc0FOY0FUU2NSMXRYQkwzOTdFY1NXdVJ5ZHhwQk9ReFF5a0VHQUwrQT09IiwidCI6IlN4UllQVTJVamFNVjhhanV4QmVQRGlCWStsQXM3VHdIc2pubzVHYUJhc2hlZ1BZMmkyUGtTbSswWUIzT0toQ2hlTmVSNWNrYmMvRmREbnFqVktxMW1BPT0ifQ==)",
+      R"(/v3/confirmation/8b742869-6e4a-490c-ac31-31b49130098a/eyJzaWduYXR1cmUiOiJkaXZoV2dkM2w0TVpZeG9NV1VwL096RnRnc1VBdXlxcEo4R0J5emp2TFBFWkMzUGo3alhucWFXUmVWbU83cU5FNzNkWThaSk5ZQVBCaTZFV2pGMWpFZz09IiwidCI6Ii9tZlRBQWpIcldtQWxMaUVrdGJxTlMvZHhvTVZkbnoxZXNvVnBsUVVzN3lHL2FwQXEySzZPZVNUNmxCVEtGSm1PcTdyVjhRYlkvREYySEZSTWN6L0pRPT0ifQ==)",
       BuildCreateRewardConfirmationUrlPath(test::kTransactionId,
                                            test::kCredentialBase64Url));
 }
diff --git a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/README.md b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/README.md
index 25636049dbde..5763bcf1b655 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/README.md
+++ b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/README.md
@@ -11,7 +11,7 @@ The request body includes the following:
 | key  | example  | description  |
 |---|---|---|
 | payload   | {"paymentId":"27a39b2f-9b2e-4eb0-bbb2-2f84447496e7"}  | Rewards payment id, which can be found at [brave://rewards-internals](brave://rewards-internals).  |
-| paymentCredentials  | {"paymentCredentials":[<br>{"confirmationType":"view","credential":{"signature":"H9HPNdEVJBvc9d8RZig/Gihlrcgug/n/rRaAJzeZI20gKPCivIj9Ig8StvqMSc5GfgLrBaJDibwBghnhRhqYRQ==",<br>"t":"PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgCw=="},<br>"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},<br>{"confirmationType":"click","credential":{"signature":"mfv+HJP5K/q9ogcGwD4uqOd98sb2fx96h+QnsdtGwJ4wdZfvrukbP4whyz46Ro3gm2FIMhPWZ5wM2Hhg9OGPtg==",<br>"t":"hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfQ=="},<br>"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="}]}  | A collection of payment credentials corresponding to each payment token.  |
+| paymentCredentials  | {"paymentCredentials":[<br>{"confirmationType":"view","credential":{"signature":"H9HPNdEVJBvc9d8RZig/Gihlrcgug/n/rRaAJzeZI20gKPCivIj9Ig8StvqMSc5GfgLrBaJDibwBghnhRhqYRQ==",<br>"t":"PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgCw=="},<br>"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},<br>{"confirmationType":"click","credential":{"signature":"mfv+HJP5K/q9ogcGwD4uqOd98sb2fx96h+QnsdtGwJ4wdZfvrukbP4whyz46Ro3gm2FIMhPWZ5wM2Hhg9OGPtg==",<br>"t":"hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfQ=="},<br>"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="}]}  | A collection of payment credentials corresponding to each payment token.  |
 | platform  | {"platform": "android"}  | Operating system. See [user data](../../user_data/README.md#user-data-submitted-when-redeeming-identifiable-payment-tokens).  |
 | summary  | {"totals":[{"ad_format":"ad_notification","view":1,"click":1}]}  | Summary of payment tokens for each creative. See [user data](../../user_data/README.md#user-data-submitted-when-redeeming-identifiable-payment-tokens).  |
 
diff --git a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/redeem_payment_tokens_test_util.cc b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/redeem_payment_tokens_test_util.cc
index a8ae0f1bca46..5ae9d9c11cde 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/redeem_payment_tokens_test_util.cc
+++ b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/redeem_payment_tokens_test_util.cc
@@ -17,7 +17,7 @@ std::string BuildRedeemPaymentTokensUrlResponseBody() {
                     "signature": "J6Lnoz1Ho5P4YDkcufA+WKUdR4C4f8QJARaT3Cko8RZ6dc777od9NQEaetU+xK3LXmQtmA6jfIUcLR3SCIJl0g==",
                     "t": "Z0GXil+GIQLOSSLHJV78jUE8cMxtwXtoROmv3uW8Qecpvx7L076GNI3TN44uF4uleOo2ZTpeKHzM2eeFHO2K6w=="
                   },
-                  "publicKey": "bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU="
+                  "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="
                 }
               ]
             })";
diff --git a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder_unittest.cc b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder_unittest.cc
index 014a7d955d48..c41823714477 100644
--- a/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/redeem_payment_tokens/url_request_builders/redeem_payment_tokens_url_request_builder_unittest.cc
@@ -20,7 +20,7 @@ namespace brave_ads {
 namespace {
 
 constexpr char kExpectedUrlRequestContent[] =
-    R"({"payload":"{\"paymentId\":\"27a39b2f-9b2e-4eb0-bbb2-2f84447496e7\"}","paymentCredentials":[{"confirmationType":"view","credential":{"signature":"H9HPNdEVJBvc9d8RZig/Gihlrcgug/n/rRaAJzeZI20gKPCivIj9Ig8StvqMSc5GfgLrBaJDibwBghnhRhqYRQ==","t":"PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgCw=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},{"confirmationType":"view","credential":{"signature":"mfv+HJP5K/q9ogcGwD4uqOd98sb2fx96h+QnsdtGwJ4wdZfvrukbP4whyz46Ro3gm2FIMhPWZ5wM2Hhg9OGPtg==","t":"hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfQ=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},{"confirmationType":"view","credential":{"signature":"acj3J7aaf/rN/uleCnaGTOzNceo9m9Dz/2D1+NDIVN4MnZG2BF1hYl5qHY/VRZNh5/uhnRbqgsuPn6SXvaTXVA==","t":"bbpQ1DcxfDA+ycNg9WZvIwinjO0GKnCon1UFxDLoDOLZVnKG3ufruNZi/n8dO+G2AkTiWkUKbi78xCyKsqsXnA=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},{"confirmationType":"view","credential":{"signature":"zETc7kPZQhzNaufsUiBHiBtnwEhk3oQYUh5HZeNbTOiHvm5pAzNl/TuR/fjQcusN5EqH7e1B+ycsO5CeF5FmAw==","t":"OlDIXpWRR1/B+1pjPbLyc5sx0V+d7QzQb4NDGUI6F676jy8tL++u57SF4DQhvdEpBrKID+j27RLrbjsecXSjRw=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},{"confirmationType":"view","credential":{"signature":"d1oVe9XnwRs7bNcMzxp+/q7zL5hDHLD13f4tazz79a+ImszJfVRYIcf1fxvc7d2Pstciu1i11jRYGUWIDttYVg==","t":"Y579V5BUcCzAFj6qNX7YnIr+DvH0mugb/nnY5UINdjxziyDJlejJwi0kPaRGmqbVT3+B51lpErt8e66z0jTbAw=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},{"confirmationType":"view","credential":{"signature":"rQkn3xdJu/GFfkGUREqvV69lQNQWsa5a9RQIXaig7CQtlS/PVLsUvM6plG4IeboK0E6gR8Do5Gg40OK59/ZyUQ==","t":"+MPQfSo6UcaZNWtfmbd5je9UIr+FVrCWHl6I5C1ZFD7y7bjP/yz7flTjV+l5mKulbCvsRna7++MhbBz6iC0FvQ=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="},{"confirmationType":"view","credential":{"signature":"GohmRsNFp8Vd47PB5MzgFvM7o/8XjkY+9gjCOJY/MAcpmLBgoS6v373A0Tvkq3T/t0z9GYM0yrs6LikJggwnmg==","t":"CRXUzo7S0X//u0RGsO534vCoIbrsXgbzLfWw8CLML0CkgMltEGxM6XwBTICl4dqqfhIcLhD0f1WFod7JpuEkjw=="},"publicKey":"RJ2i/o/pZkrH+i0aGEMY1G9FXtd7Q7gfRi3YdNRnDDk="}],"platform":"windows","totals":[{"ad_format":"ad_notification","view":7}]})";
+    R"({"payload":"{\"paymentId\":\"27a39b2f-9b2e-4eb0-bbb2-2f84447496e7\"}","paymentCredentials":[{"confirmationType":"view","credential":{"signature":"H9HPNdEVJBvc9d8RZig/Gihlrcgug/n/rRaAJzeZI20gKPCivIj9Ig8StvqMSc5GfgLrBaJDibwBghnhRhqYRQ==","t":"PLowz2WF2eGD5zfwZjk9p76HXBLDKMq/3EAZHeG/fE2XGQ48jyte+Ve50ZlasOuYL5mwA8CU2aFMlJrt3DDgCw=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},{"confirmationType":"view","credential":{"signature":"mfv+HJP5K/q9ogcGwD4uqOd98sb2fx96h+QnsdtGwJ4wdZfvrukbP4whyz46Ro3gm2FIMhPWZ5wM2Hhg9OGPtg==","t":"hfrMEltWLuzbKQ02Qixh5C/DWiJbdOoaGaidKZ7Mv+cRq5fyxJqemE/MPlARPhl6NgXPHUeyaxzd6/Lk6YHlfQ=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},{"confirmationType":"view","credential":{"signature":"acj3J7aaf/rN/uleCnaGTOzNceo9m9Dz/2D1+NDIVN4MnZG2BF1hYl5qHY/VRZNh5/uhnRbqgsuPn6SXvaTXVA==","t":"bbpQ1DcxfDA+ycNg9WZvIwinjO0GKnCon1UFxDLoDOLZVnKG3ufruNZi/n8dO+G2AkTiWkUKbi78xCyKsqsXnA=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},{"confirmationType":"view","credential":{"signature":"zETc7kPZQhzNaufsUiBHiBtnwEhk3oQYUh5HZeNbTOiHvm5pAzNl/TuR/fjQcusN5EqH7e1B+ycsO5CeF5FmAw==","t":"OlDIXpWRR1/B+1pjPbLyc5sx0V+d7QzQb4NDGUI6F676jy8tL++u57SF4DQhvdEpBrKID+j27RLrbjsecXSjRw=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},{"confirmationType":"view","credential":{"signature":"d1oVe9XnwRs7bNcMzxp+/q7zL5hDHLD13f4tazz79a+ImszJfVRYIcf1fxvc7d2Pstciu1i11jRYGUWIDttYVg==","t":"Y579V5BUcCzAFj6qNX7YnIr+DvH0mugb/nnY5UINdjxziyDJlejJwi0kPaRGmqbVT3+B51lpErt8e66z0jTbAw=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},{"confirmationType":"view","credential":{"signature":"rQkn3xdJu/GFfkGUREqvV69lQNQWsa5a9RQIXaig7CQtlS/PVLsUvM6plG4IeboK0E6gR8Do5Gg40OK59/ZyUQ==","t":"+MPQfSo6UcaZNWtfmbd5je9UIr+FVrCWHl6I5C1ZFD7y7bjP/yz7flTjV+l5mKulbCvsRna7++MhbBz6iC0FvQ=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="},{"confirmationType":"view","credential":{"signature":"GohmRsNFp8Vd47PB5MzgFvM7o/8XjkY+9gjCOJY/MAcpmLBgoS6v373A0Tvkq3T/t0z9GYM0yrs6LikJggwnmg==","t":"CRXUzo7S0X//u0RGsO534vCoIbrsXgbzLfWw8CLML0CkgMltEGxM6XwBTICl4dqqfhIcLhD0f1WFod7JpuEkjw=="},"publicKey":"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="}],"platform":"windows","totals":[{"ad_format":"ad_notification","view":7}]})";
 
 }  // namespace
 
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc
index 75b39652499e..0358ce14b962 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.cc
@@ -80,7 +80,8 @@ void RefillConfirmationTokens::Refill() {
 
   is_refilling_ = true;
 
-  NotifyWillRefillConfirmationTokens();
+  NotifyWillRefillConfirmationTokens(
+      /*count=*/CalculateAmountOfConfirmationTokensToRefill());
 
   GenerateTokens();
 
@@ -330,9 +331,10 @@ void RefillConfirmationTokens::Reset() {
   is_refilling_ = false;
 }
 
-void RefillConfirmationTokens::NotifyWillRefillConfirmationTokens() const {
+void RefillConfirmationTokens::NotifyWillRefillConfirmationTokens(
+    size_t count) const {
   if (delegate_) {
-    delegate_->OnWillRefillConfirmationTokens();
+    delegate_->OnWillRefillConfirmationTokens(count);
   }
 }
 
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h
index 2f74e341a657..6d83b1f0da84 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens.h
@@ -6,6 +6,7 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_H_
 
+#include <cstddef>
 #include <optional>
 #include <string>
 #include <tuple>
@@ -70,7 +71,7 @@ class RefillConfirmationTokens final {
 
   void Reset();
 
-  void NotifyWillRefillConfirmationTokens() const;
+  void NotifyWillRefillConfirmationTokens(size_t count) const;
   void NotifyCaptchaRequiredToRefillConfirmationTokens(
       const std::string& captcha_id) const;
   void NotifyDidRefillConfirmationTokens() const;
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate.h b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate.h
index 55d00d77c601..84031414cfa9 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate.h
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate.h
@@ -6,6 +6,7 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_DELEGATE_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_DELEGATE_H_
 
+#include <cstddef>
 #include <string>
 
 #include "base/time/time.h"
@@ -15,7 +16,7 @@ namespace brave_ads {
 class RefillConfirmationTokensDelegate {
  public:
   // Invoked to tell the delegate we will refill confirmation tokens.
-  virtual void OnWillRefillConfirmationTokens() {}
+  virtual void OnWillRefillConfirmationTokens(size_t count) {}
 
   // Invoked to tell the delegate we successfully refilled the confirmation
   // tokens.
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate_mock.h b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate_mock.h
index f38fbd2144f5..cece34245608 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate_mock.h
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate_mock.h
@@ -6,6 +6,7 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_DELEGATE_MOCK_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_ACCOUNT_UTILITY_REFILL_CONFIRMATION_TOKENS_REFILL_CONFIRMATION_TOKENS_DELEGATE_MOCK_H_
 
+#include <cstddef>
 #include <string>
 
 #include "brave/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_delegate.h"
@@ -25,6 +26,7 @@ class RefillConfirmationTokensDelegateMock
 
   ~RefillConfirmationTokensDelegateMock() override;
 
+  MOCK_METHOD(void, OnWillRefillConfirmationTokens, (size_t count));
   MOCK_METHOD(void, OnDidRefillConfirmationTokens, ());
 
   MOCK_METHOD(void, OnFailedToRefillConfirmationTokens, ());
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_test_util.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_test_util.cc
index 14e546cd2e49..d4fd98b26615 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_test_util.cc
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_test_util.cc
@@ -17,60 +17,60 @@ std::string BuildRequestSignedTokensUrlResponseBody() {
 std::string BuildGetSignedTokensUrlResponseBody() {
   return R"(
       {
-        "batchProof": "nZBm4sojuuKV91w9/Hcevh3r0SSmx7Cu26oeUko7hwIXYQJXjuFabmJ40nNToVm7UAkiaQvoKDFViqfpHcwxAA==",
+        "batchProof": "zFKE/klGjgSJjgrc74uzy2cdc0dXPD3WTIbxraoQegTVi+Q0/YpI1olCDXoLf6FPMPwktEt1e3YWaMFlXn0vCw==",
         "signedTokens": [
-          "DA+IEWxDIW91q3JItW8D3xIYMgO0TDyP/TKXFQExLEs=",
-          "3KQ0o6IgVLHpKLzH01cGxA89om8CvOrW+anxorhJISk=",
-          "XlzLlvOPl3XqQAYF19ly95wnAu0IA5GNk9IIUVsen0Q=",
-          "VIAZP4U2QYJt/uUHLf0rfTVmMqTbytvqEGWx5eZLYDs=",
-          "rk+ollPWD+y8NlqiftGmr/riBJfsg34DM/M3Fi9BFA0=",
-          "xn/IDC6/wUuag5XIHR34lnnMRTi1GDVb96MYmUBUgmo=",
-          "iibC1sEFbkOqGvZuQgYG1vdr6QMfLYfvFWbybmo8Myo=",
-          "GAw6J637OVCz7iKN1WSg5LbLem/CMGcIz/iqmcVEvBc=",
-          "Vvr5eN/Wtk5papD2urom0iOZtInck8MCBFPKKn2yuEc=",
-          "1unbpoVjusErAw5cM03aBAtVUS1rKz21Z+/qro4fKjY=",
-          "/Efsmh2qQNviLW47/F7wjMYnvXsS3sNvoShIxg7tsCM=",
-          "VrWO44mtMyBHi3vwG9WFJcnJAueZtqCcUsnMnaH8x38=",
-          "yvr5gFkC70TOQuoPdc+1UUpL8TDvKgTHNIpIBqSVcic=",
-          "EsbmSuk0n/bNwwg9w09+vcABAXyJWOJHllEJam0li1I=",
-          "kpyU2LZomANA/sSiAmlhITmaSnUCF4k3ZbL8tC8bCBs=",
-          "snY5KcxsrH4YtPtuATwrqFEsI8s41CwFwzD9NQPRYDM=",
-          "Os0UZsMkLd2zjSvtlZXNONoC9lW88ub/am/m6M5JyA0=",
-          "yhgSTuGXe/7rEOn71eJFsIs2yenE4yAqqQLTxZvj9AE=",
-          "hswDh0BfDSFVC5IgVRo48u4DmNoVGXBguN0MvOcxFwQ=",
-          "WKkneVbAf05kwIWiH8wN3jhNjwyJLYi9zH+wkNBo5nw=",
-          "HH26LkAhxJxIFthoLyKD/OA67AzmyPW59ady3nYcnj4=",
-          "5EPMh4OW09U3M4d8oPYv4OPtOZPiN0+cLTWIRc486lw=",
-          "lhYrEba/qFw6hKUOhBJO6KVRUj4yQwXNhkhdNWvAFjg=",
-          "XKkrY+E8P2c3vBLa2967Q1uP3o0bsz6ElDbetbiPuUE=",
-          "/GgluIwAIj2zfuiY4YpfF+cLTByPNM37DBlld746bxY=",
-          "dMwnd60OVo3jF/DkkZIO9Y68vvGoL0yfO9qlLsdTfwo=",
-          "op4WXEs052uAvEvqvGWkr7PATcigxwwKExuIqMUoVQ4=",
-          "VJrlz3pP+VNeBivSYUYOLqKEP2x9vr75AUkBcazpMhg=",
-          "UJuKnh5+jVwrRctKm29v4FBLoLqy7Hq4ddr7Ci9o6X0=",
-          "pEQVS63QXhWHHOIClAxKJFevczY2YcTnS5SnzxX/AAE=",
-          "bjAvdetnrggnuQ4nUAG+SCUpMRhsnstXW/m9kIVwUys=",
-          "tNcuHnWkzovoG/CQ/Uz8LwqojM9se+WxfdArBrMEjTE=",
-          "lDT++JAPo/S5R4S9R9c/WBnrNq/qznsb121cybxDcFI=",
-          "yIRJoQT0DErGmFNLt2DraTRqbiScbAh07TsAqHLAzlk=",
-          "Vtt/1xciT3GzPVEqWS321kcD37JPW/gfA0i5A4jHSFA=",
-          "WF1TDYuaZaah9xuS0PRonsMtwS/YYATyzrsB525OpEw=",
-          "yq2LhUEeBFD2eaKu7Wmjyb1W2OyB482PwPKj7HjUaWg=",
-          "JNbzAbJS/LWdUdWbd/epPHy935mpeo+1yBZrPQuH4k0=",
-          "PPucf/FQzL7mU6Ec8gUtOiO+1V1sabDX76rqv/XjkFk=",
-          "dH/pwaRwwyg9kSDUmGyfRSV94slSYXIbrl8ZhGkGiBQ=",
-          "dj45NGx3tM2/t5hfu7shUxPKd1XmKpucopYBooxR/SE=",
-          "emn0UWvwqfSZeR8uBqjT629UeP+7PXyfg4WXYIIk9BM=",
-          "Gpiwdsv6YlBqgcWCA1oenPaX8VkvT2eXxvGC60SUC08=",
-          "0m4tWlAVWh7OA1scMdbbXRLGM2ui72DbiSh3tgZ56Xk=",
-          "uCYqm0IjumhZH7yBzZl+W2FbHwq3Qc0tV0CQTnJSV04=",
-          "8OJEKXDcCoDEnzggFHaQpemkfPmHJ5u+isQzE8wnXkE=",
-          "hHJHWTpnWUexvq8J218KqBqmblpimQR021/GbPFKT1Q=",
-          "+MZDcE6B+WykiTN4ArTMQob21auW8/6PVAc4O62fq2s=",
-          "MNm3EDUMslVioVqCDb5PkW8op+cHFyw8qo3BKxVZLF4=",
-          "2LEoAWcTHMMFFV+/BYOGjPhdAtNL8asRwdliyaGQnRA="
+          "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs=",
+          "Mv5M6UhufCEmF7u9pBaGQJAckuwpkSpOJvJq1F+y9VE=",
+          "MpysVJMYUI4n0NcY2CdZyZxQxADOHJal1pZI2uPiqWs=",
+          "5stC+5v3eo3tADEkTtxESlCBIkoYI8aRDLJ8VVtcLyE=",
+          "MBSxmUfpp5p8FI+86A4+0zFYw5dPhre1YYw+sRFWkTs=",
+          "TPtzCHdDbaW3vAApNFc6nyC806fmdNqG9HaoZMQWGx8=",
+          "dt0Xmblg7vU0TEzE4yaBtNnQ8igZJcdlNj1CDVxXVHA=",
+          "RBJGJT9Pf2T2yzi+hfPXnXIjxZ6WbJ7UhZ1f1BGDpHc=",
+          "NN/FZ/sbjvhGAKzBQdtUrbjkDuCKbpwNCT3cKURvzB8=",
+          "BCoCHDIFRVyZqgGfB1SJpTsHa8tJ9VFOq0PUPubLBk8=",
+          "EAjQxthZt6mR2+wgMV35B4Bq61e16PCyX5JkhRwdxXM=",
+          "3LPp0kUrPjeKVkBFJSOL9b7/qjfUCc8ylqZyjcSFhVs=",
+          "zpjmculV506uDhkXJ4k6lCCFhVja5EkA2uXkefE3ZlY=",
+          "nEzbQkRVPl6H9+AF/OBcfLf61o1xO/jbB+7a1amJ3Eg=",
+          "NgSQDmucmraSK8QZve64DvMv1l01jQEpK9RjSR7J91Q=",
+          "vCB5ksvHTXCYtbCdBe+xynPo3T6ybVgLfHf0Od8PEEQ=",
+          "PlkLA8DFzpMQQaCsKICK7zxDRJ10YEdFGvFFfx9Fn08=",
+          "jm2usDGsU+/KSy2+6Q8X5cwhFr7pZ+tJ6GRCue2ywl0=",
+          "SD8rfdIV3Hp3PbiQ29KmNN4eYd0kMA6fVr4ZKb6McRg=",
+          "DKPADls0HZ0m0MtQb2qk5A/w/bUWAgf5gQI+F/9JMQQ=",
+          "5phPdMP/HWQCMGkXvgW8BDLgKZRTni2eQft8oDOlUhY=",
+          "LDkKHokr0ydfPuj3cFaXsI1Il1pFEZUrX3G2IM30Il8=",
+          "FFbRg7fgraPLTOBKkiepCl0ukp6fYHrh/E715Gsxn0Q=",
+          "aNBW1Qn9y0WejDJJzU/4FmfBnfOipeDOD0qo2u8u2xQ=",
+          "KGIhrGVhTah7Liwgphh6EidivlOVKbnWMQRrKItcnVY=",
+          "Ag+u6UoZ/AJnVmLH659K8zLlaFVgEV4TSWiCIo/1RGk=",
+          "Bjsr97vTdcPRFb8rVZ96yGKGEWqBRobalK09hSjnckk=",
+          "TLdnTFqBqDBI4LhGQrQLFIP9hYBXjvRIAj58YuCkrG8=",
+          "nLTmiuYHyKudXYxXSwT5fOLmIJOiuB5nsrvzRr+STlI=",
+          "sBYEmkom7ay5PR0JI4J9pohdAsT00BneDcBlk9XJAXc=",
+          "loZ/wr35u1XaMQXPi2KDCXbMoqCR4qSrihf8hGFGFnk=",
+          "Ethq6jJOlvciMq9CxnvCvPiS6dpQTSJAfGG3JAMTcn0=",
+          "uKGcjL8+ja5g+kg1GXmoKqB1UxsJjHFYyJsErIxRTDI=",
+          "zGNHYNpUX9fdDENSlT5a0MFzssn9nJwRs9Fh5NM1GDw=",
+          "xHnOdiSKGvOr7qzIXgP0epsFPy0STQy2+6nd6NZEeXo=",
+          "wuFVfI9geQ+U+R7LxM+SFiz15Fj7rpIRMOMNSt43PAM=",
+          "agMSIk+buHMb4qUc0veGzAUXdcVkHqc+Oy+Zt7IOKzA=",
+          "mj7RPYebPDz859w61Ce5HEQh3NGQ1xYyp5xthZtpym8=",
+          "jkmYEUw+dU8ypn03nXl6Fj+OzctOLlG8CSYEI15zNAg=",
+          "UAuc8dnFor4mva7EGD5bV/nqZz8wq2/RAte8r0iuNUY=",
+          "9OxHQt1/VR9JpMB4XrC0Yf7MScmHANkpSzcb1XujtkM=",
+          "Mv5V7+I0BBwNrVYf/012S+esEnqh3gAXZtlE8ClbOg0=",
+          "doMba7NOQ+4doCwCQdBGWbvI+qofpgNr1VHqrM8vMCw=",
+          "QIl+CO4G3g6Tbfre2g6TOkKOgZ4TgIoXeOoRqSV4jGU=",
+          "LBjAPlawmwRldmRDpKk0wJRQBpkNqhzDiDNBNYmzg1E=",
+          "QlKUaOO/znQjVtwXNGiwUDrV+GW3/a9wZXvvjvib+3I=",
+          "CAHB+5LsyE/ntr8d4Ll1eFnowotytI+ZksaSdiiIa00=",
+          "PorTCjYCypszf7/fs4eXgrgV4yi/3qIEmffYmaJ9hXI=",
+          "Gt95JWkzrdcSw41DCdoTs8umsC7CzH1y0rJ7m/2vGX4=",
+          "IjtwdzooaSvEr/V+e5vESRhUoJgvLnaqdbTL+dnKyR4="
         ],
-        "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg="
+        "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="
       })";
 }
 
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_unittest.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_unittest.cc
index 7d7144d7024c..0b54542fbc20 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_unittest.cc
@@ -67,7 +67,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, RefillConfirmationTokens) {
 }
 
 TEST_F(BraveAdsRefillConfirmationTokensTest,
-       RefillConfirmationTokensCaptchaRequired) {
+       DoNotRefillConfirmationTokensIfCaptchaIsRequired) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -100,7 +100,8 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
   EXPECT_EQ(0U, ConfirmationTokenCount());
 }
 
-TEST_F(BraveAdsRefillConfirmationTokensTest, IssuersPublicKeyMismatch) {
+TEST_F(BraveAdsRefillConfirmationTokensTest,
+       DoNotRefillConfirmationTokensIfMismatchedIssuersPublicKey) {
   // Arrange
   test::MockTokenGenerator(/*count=*/50);
 
@@ -119,7 +120,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, IssuersPublicKeyMismatch) {
        {"hKjGQd7WAXs0lcdf+SCHCTKsBLWtKaEubwlK4YA1NkA=", 0.0}},
       /*payment_token_issuer_public_keys=*/
       {{"JiwFR2EU/Adf1lgox+xqOVPuc6a/rxdy/LguFG5eaXg=", 0.0},
-       {"bPE1QE65mkIgytffeu7STOfly+x10BXCGuk5pVlOHQU=", 0.1}});
+       {"OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=", 0.1}});
 
   SetIssuers(issuers);
 
@@ -165,7 +166,8 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
   EXPECT_EQ(50U, ConfirmationTokenCount());
 }
 
-TEST_F(BraveAdsRefillConfirmationTokensTest, RequestSignedTokensMissingNonce) {
+TEST_F(BraveAdsRefillConfirmationTokensTest,
+       DoNotRefillConfirmationTokensIfRequestSignedTokensIsMissingNonce) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -221,7 +223,8 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
   EXPECT_EQ(50U, ConfirmationTokenCount());
 }
 
-TEST_F(BraveAdsRefillConfirmationTokensTest, GetSignedTokensInvalidResponse) {
+TEST_F(BraveAdsRefillConfirmationTokensTest,
+       DoNotRefillConfirmationTokensIfGetSignedTokensReturnsAnInvalidResponse) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -247,7 +250,8 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, GetSignedTokensInvalidResponse) {
   EXPECT_EQ(0U, ConfirmationTokenCount());
 }
 
-TEST_F(BraveAdsRefillConfirmationTokensTest, GetSignedTokensMissingPublicKey) {
+TEST_F(BraveAdsRefillConfirmationTokensTest,
+       DoNotRefillConfirmationTokensIfGetSignedTokensIsMissingPublicKey) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -260,58 +264,58 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, GetSignedTokensMissingPublicKey) {
                                    test::kRequestSignedTokensNonce),
        {{net::HTTP_OK, /*response_body=*/R"(
             {
-              "batchProof": "nZBm4sojuuKV91w9/Hcevh3r0SSmx7Cu26oeUko7hwIXYQJXjuFabmJ40nNToVm7UAkiaQvoKDFViqfpHcwxAA==",
+              "batchProof": "zFKE/klGjgSJjgrc74uzy2cdc0dXPD3WTIbxraoQegTVi+Q0/YpI1olCDXoLf6FPMPwktEt1e3YWaMFlXn0vCw==",
               "signedTokens": [
-                "DA+IEWxDIW91q3JItW8D3xIYMgO0TDyP/TKXFQExLEs=",
-                "3KQ0o6IgVLHpKLzH01cGxA89om8CvOrW+anxorhJISk=",
-                "XlzLlvOPl3XqQAYF19ly95wnAu0IA5GNk9IIUVsen0Q=",
-                "VIAZP4U2QYJt/uUHLf0rfTVmMqTbytvqEGWx5eZLYDs=",
-                "rk+ollPWD+y8NlqiftGmr/riBJfsg34DM/M3Fi9BFA0=",
-                "xn/IDC6/wUuag5XIHR34lnnMRTi1GDVb96MYmUBUgmo=",
-                "iibC1sEFbkOqGvZuQgYG1vdr6QMfLYfvFWbybmo8Myo=",
-                "GAw6J637OVCz7iKN1WSg5LbLem/CMGcIz/iqmcVEvBc=",
-                "Vvr5eN/Wtk5papD2urom0iOZtInck8MCBFPKKn2yuEc=",
-                "1unbpoVjusErAw5cM03aBAtVUS1rKz21Z+/qro4fKjY=",
-                "/Efsmh2qQNviLW47/F7wjMYnvXsS3sNvoShIxg7tsCM=",
-                "VrWO44mtMyBHi3vwG9WFJcnJAueZtqCcUsnMnaH8x38=",
-                "yvr5gFkC70TOQuoPdc+1UUpL8TDvKgTHNIpIBqSVcic=",
-                "EsbmSuk0n/bNwwg9w09+vcABAXyJWOJHllEJam0li1I=",
-                "kpyU2LZomANA/sSiAmlhITmaSnUCF4k3ZbL8tC8bCBs=",
-                "snY5KcxsrH4YtPtuATwrqFEsI8s41CwFwzD9NQPRYDM=",
-                "Os0UZsMkLd2zjSvtlZXNONoC9lW88ub/am/m6M5JyA0=",
-                "yhgSTuGXe/7rEOn71eJFsIs2yenE4yAqqQLTxZvj9AE=",
-                "hswDh0BfDSFVC5IgVRo48u4DmNoVGXBguN0MvOcxFwQ=",
-                "WKkneVbAf05kwIWiH8wN3jhNjwyJLYi9zH+wkNBo5nw=",
-                "HH26LkAhxJxIFthoLyKD/OA67AzmyPW59ady3nYcnj4=",
-                "5EPMh4OW09U3M4d8oPYv4OPtOZPiN0+cLTWIRc486lw=",
-                "lhYrEba/qFw6hKUOhBJO6KVRUj4yQwXNhkhdNWvAFjg=",
-                "XKkrY+E8P2c3vBLa2967Q1uP3o0bsz6ElDbetbiPuUE=",
-                "/GgluIwAIj2zfuiY4YpfF+cLTByPNM37DBlld746bxY=",
-                "dMwnd60OVo3jF/DkkZIO9Y68vvGoL0yfO9qlLsdTfwo=",
-                "op4WXEs052uAvEvqvGWkr7PATcigxwwKExuIqMUoVQ4=",
-                "VJrlz3pP+VNeBivSYUYOLqKEP2x9vr75AUkBcazpMhg=",
-                "UJuKnh5+jVwrRctKm29v4FBLoLqy7Hq4ddr7Ci9o6X0=",
-                "pEQVS63QXhWHHOIClAxKJFevczY2YcTnS5SnzxX/AAE=",
-                "bjAvdetnrggnuQ4nUAG+SCUpMRhsnstXW/m9kIVwUys=",
-                "tNcuHnWkzovoG/CQ/Uz8LwqojM9se+WxfdArBrMEjTE=",
-                "lDT++JAPo/S5R4S9R9c/WBnrNq/qznsb121cybxDcFI=",
-                "yIRJoQT0DErGmFNLt2DraTRqbiScbAh07TsAqHLAzlk=",
-                "Vtt/1xciT3GzPVEqWS321kcD37JPW/gfA0i5A4jHSFA=",
-                "WF1TDYuaZaah9xuS0PRonsMtwS/YYATyzrsB525OpEw=",
-                "yq2LhUEeBFD2eaKu7Wmjyb1W2OyB482PwPKj7HjUaWg=",
-                "JNbzAbJS/LWdUdWbd/epPHy935mpeo+1yBZrPQuH4k0=",
-                "PPucf/FQzL7mU6Ec8gUtOiO+1V1sabDX76rqv/XjkFk=",
-                "dH/pwaRwwyg9kSDUmGyfRSV94slSYXIbrl8ZhGkGiBQ=",
-                "dj45NGx3tM2/t5hfu7shUxPKd1XmKpucopYBooxR/SE=",
-                "emn0UWvwqfSZeR8uBqjT629UeP+7PXyfg4WXYIIk9BM=",
-                "Gpiwdsv6YlBqgcWCA1oenPaX8VkvT2eXxvGC60SUC08=",
-                "0m4tWlAVWh7OA1scMdbbXRLGM2ui72DbiSh3tgZ56Xk=",
-                "uCYqm0IjumhZH7yBzZl+W2FbHwq3Qc0tV0CQTnJSV04=",
-                "8OJEKXDcCoDEnzggFHaQpemkfPmHJ5u+isQzE8wnXkE=",
-                "hHJHWTpnWUexvq8J218KqBqmblpimQR021/GbPFKT1Q=",
-                "+MZDcE6B+WykiTN4ArTMQob21auW8/6PVAc4O62fq2s=",
-                "MNm3EDUMslVioVqCDb5PkW8op+cHFyw8qo3BKxVZLF4=",
-                "2LEoAWcTHMMFFV+/BYOGjPhdAtNL8asRwdliyaGQnRA="
+                "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs=",
+                "Mv5M6UhufCEmF7u9pBaGQJAckuwpkSpOJvJq1F+y9VE=",
+                "MpysVJMYUI4n0NcY2CdZyZxQxADOHJal1pZI2uPiqWs=",
+                "5stC+5v3eo3tADEkTtxESlCBIkoYI8aRDLJ8VVtcLyE=",
+                "MBSxmUfpp5p8FI+86A4+0zFYw5dPhre1YYw+sRFWkTs=",
+                "TPtzCHdDbaW3vAApNFc6nyC806fmdNqG9HaoZMQWGx8=",
+                "dt0Xmblg7vU0TEzE4yaBtNnQ8igZJcdlNj1CDVxXVHA=",
+                "RBJGJT9Pf2T2yzi+hfPXnXIjxZ6WbJ7UhZ1f1BGDpHc=",
+                "NN/FZ/sbjvhGAKzBQdtUrbjkDuCKbpwNCT3cKURvzB8=",
+                "BCoCHDIFRVyZqgGfB1SJpTsHa8tJ9VFOq0PUPubLBk8=",
+                "EAjQxthZt6mR2+wgMV35B4Bq61e16PCyX5JkhRwdxXM=",
+                "3LPp0kUrPjeKVkBFJSOL9b7/qjfUCc8ylqZyjcSFhVs=",
+                "zpjmculV506uDhkXJ4k6lCCFhVja5EkA2uXkefE3ZlY=",
+                "nEzbQkRVPl6H9+AF/OBcfLf61o1xO/jbB+7a1amJ3Eg=",
+                "NgSQDmucmraSK8QZve64DvMv1l01jQEpK9RjSR7J91Q=",
+                "vCB5ksvHTXCYtbCdBe+xynPo3T6ybVgLfHf0Od8PEEQ=",
+                "PlkLA8DFzpMQQaCsKICK7zxDRJ10YEdFGvFFfx9Fn08=",
+                "jm2usDGsU+/KSy2+6Q8X5cwhFr7pZ+tJ6GRCue2ywl0=",
+                "SD8rfdIV3Hp3PbiQ29KmNN4eYd0kMA6fVr4ZKb6McRg=",
+                "DKPADls0HZ0m0MtQb2qk5A/w/bUWAgf5gQI+F/9JMQQ=",
+                "5phPdMP/HWQCMGkXvgW8BDLgKZRTni2eQft8oDOlUhY=",
+                "LDkKHokr0ydfPuj3cFaXsI1Il1pFEZUrX3G2IM30Il8=",
+                "FFbRg7fgraPLTOBKkiepCl0ukp6fYHrh/E715Gsxn0Q=",
+                "aNBW1Qn9y0WejDJJzU/4FmfBnfOipeDOD0qo2u8u2xQ=",
+                "KGIhrGVhTah7Liwgphh6EidivlOVKbnWMQRrKItcnVY=",
+                "Ag+u6UoZ/AJnVmLH659K8zLlaFVgEV4TSWiCIo/1RGk=",
+                "Bjsr97vTdcPRFb8rVZ96yGKGEWqBRobalK09hSjnckk=",
+                "TLdnTFqBqDBI4LhGQrQLFIP9hYBXjvRIAj58YuCkrG8=",
+                "nLTmiuYHyKudXYxXSwT5fOLmIJOiuB5nsrvzRr+STlI=",
+                "sBYEmkom7ay5PR0JI4J9pohdAsT00BneDcBlk9XJAXc=",
+                "loZ/wr35u1XaMQXPi2KDCXbMoqCR4qSrihf8hGFGFnk=",
+                "Ethq6jJOlvciMq9CxnvCvPiS6dpQTSJAfGG3JAMTcn0=",
+                "uKGcjL8+ja5g+kg1GXmoKqB1UxsJjHFYyJsErIxRTDI=",
+                "zGNHYNpUX9fdDENSlT5a0MFzssn9nJwRs9Fh5NM1GDw=",
+                "xHnOdiSKGvOr7qzIXgP0epsFPy0STQy2+6nd6NZEeXo=",
+                "wuFVfI9geQ+U+R7LxM+SFiz15Fj7rpIRMOMNSt43PAM=",
+                "agMSIk+buHMb4qUc0veGzAUXdcVkHqc+Oy+Zt7IOKzA=",
+                "mj7RPYebPDz859w61Ce5HEQh3NGQ1xYyp5xthZtpym8=",
+                "jkmYEUw+dU8ypn03nXl6Fj+OzctOLlG8CSYEI15zNAg=",
+                "UAuc8dnFor4mva7EGD5bV/nqZz8wq2/RAte8r0iuNUY=",
+                "9OxHQt1/VR9JpMB4XrC0Yf7MScmHANkpSzcb1XujtkM=",
+                "Mv5V7+I0BBwNrVYf/012S+esEnqh3gAXZtlE8ClbOg0=",
+                "doMba7NOQ+4doCwCQdBGWbvI+qofpgNr1VHqrM8vMCw=",
+                "QIl+CO4G3g6Tbfre2g6TOkKOgZ4TgIoXeOoRqSV4jGU=",
+                "LBjAPlawmwRldmRDpKk0wJRQBpkNqhzDiDNBNYmzg1E=",
+                "QlKUaOO/znQjVtwXNGiwUDrV+GW3/a9wZXvvjvib+3I=",
+                "CAHB+5LsyE/ntr8d4Ll1eFnowotytI+ZksaSdiiIa00=",
+                "PorTCjYCypszf7/fs4eXgrgV4yi/3qIEmffYmaJ9hXI=",
+                "Gt95JWkzrdcSw41DCdoTs8umsC7CzH1y0rJ7m/2vGX4=",
+                "IjtwdzooaSvEr/V+e5vESRhUoJgvLnaqdbTL+dnKyR4="
               ]
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
@@ -329,7 +333,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, GetSignedTokensMissingPublicKey) {
 }
 
 TEST_F(BraveAdsRefillConfirmationTokensTest,
-       GetSignedTokensMissingBatchProofDleq) {
+       DoNotRefillConfirmationTokensIfGetSignedTokensIsMissingBatchProofDleq) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -343,57 +347,58 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
        {{net::HTTP_OK, /*response_body=*/R"(
             {
               "signedTokens": [
-                "3KQ0o6IgVLHpKLzH01cGxA89om8CvOrW+anxorhJISk=",
-                "XlzLlvOPl3XqQAYF19ly95wnAu0IA5GNk9IIUVsen0Q=",
-                "VIAZP4U2QYJt/uUHLf0rfTVmMqTbytvqEGWx5eZLYDs=",
-                "rk+ollPWD+y8NlqiftGmr/riBJfsg34DM/M3Fi9BFA0=",
-                "xn/IDC6/wUuag5XIHR34lnnMRTi1GDVb96MYmUBUgmo=",
-                "iibC1sEFbkOqGvZuQgYG1vdr6QMfLYfvFWbybmo8Myo=",
-                "GAw6J637OVCz7iKN1WSg5LbLem/CMGcIz/iqmcVEvBc=",
-                "Vvr5eN/Wtk5papD2urom0iOZtInck8MCBFPKKn2yuEc=",
-                "1unbpoVjusErAw5cM03aBAtVUS1rKz21Z+/qro4fKjY=",
-                "/Efsmh2qQNviLW47/F7wjMYnvXsS3sNvoShIxg7tsCM=",
-                "VrWO44mtMyBHi3vwG9WFJcnJAueZtqCcUsnMnaH8x38=",
-                "yvr5gFkC70TOQuoPdc+1UUpL8TDvKgTHNIpIBqSVcic=",
-                "EsbmSuk0n/bNwwg9w09+vcABAXyJWOJHllEJam0li1I=",
-                "kpyU2LZomANA/sSiAmlhITmaSnUCF4k3ZbL8tC8bCBs=",
-                "snY5KcxsrH4YtPtuATwrqFEsI8s41CwFwzD9NQPRYDM=",
-                "Os0UZsMkLd2zjSvtlZXNONoC9lW88ub/am/m6M5JyA0=",
-                "yhgSTuGXe/7rEOn71eJFsIs2yenE4yAqqQLTxZvj9AE=",
-                "hswDh0BfDSFVC5IgVRo48u4DmNoVGXBguN0MvOcxFwQ=",
-                "WKkneVbAf05kwIWiH8wN3jhNjwyJLYi9zH+wkNBo5nw=",
-                "HH26LkAhxJxIFthoLyKD/OA67AzmyPW59ady3nYcnj4=",
-                "5EPMh4OW09U3M4d8oPYv4OPtOZPiN0+cLTWIRc486lw=",
-                "lhYrEba/qFw6hKUOhBJO6KVRUj4yQwXNhkhdNWvAFjg=",
-                "XKkrY+E8P2c3vBLa2967Q1uP3o0bsz6ElDbetbiPuUE=",
-                "/GgluIwAIj2zfuiY4YpfF+cLTByPNM37DBlld746bxY=",
-                "dMwnd60OVo3jF/DkkZIO9Y68vvGoL0yfO9qlLsdTfwo=",
-                "op4WXEs052uAvEvqvGWkr7PATcigxwwKExuIqMUoVQ4=",
-                "VJrlz3pP+VNeBivSYUYOLqKEP2x9vr75AUkBcazpMhg=",
-                "UJuKnh5+jVwrRctKm29v4FBLoLqy7Hq4ddr7Ci9o6X0=",
-                "pEQVS63QXhWHHOIClAxKJFevczY2YcTnS5SnzxX/AAE=",
-                "bjAvdetnrggnuQ4nUAG+SCUpMRhsnstXW/m9kIVwUys=",
-                "tNcuHnWkzovoG/CQ/Uz8LwqojM9se+WxfdArBrMEjTE=",
-                "lDT++JAPo/S5R4S9R9c/WBnrNq/qznsb121cybxDcFI=",
-                "yIRJoQT0DErGmFNLt2DraTRqbiScbAh07TsAqHLAzlk=",
-                "Vtt/1xciT3GzPVEqWS321kcD37JPW/gfA0i5A4jHSFA=",
-                "WF1TDYuaZaah9xuS0PRonsMtwS/YYATyzrsB525OpEw=",
-                "yq2LhUEeBFD2eaKu7Wmjyb1W2OyB482PwPKj7HjUaWg=",
-                "JNbzAbJS/LWdUdWbd/epPHy935mpeo+1yBZrPQuH4k0=",
-                "PPucf/FQzL7mU6Ec8gUtOiO+1V1sabDX76rqv/XjkFk=",
-                "dH/pwaRwwyg9kSDUmGyfRSV94slSYXIbrl8ZhGkGiBQ=",
-                "dj45NGx3tM2/t5hfu7shUxPKd1XmKpucopYBooxR/SE=",
-                "emn0UWvwqfSZeR8uBqjT629UeP+7PXyfg4WXYIIk9BM=",
-                "Gpiwdsv6YlBqgcWCA1oenPaX8VkvT2eXxvGC60SUC08=",
-                "0m4tWlAVWh7OA1scMdbbXRLGM2ui72DbiSh3tgZ56Xk=",
-                "uCYqm0IjumhZH7yBzZl+W2FbHwq3Qc0tV0CQTnJSV04=",
-                "8OJEKXDcCoDEnzggFHaQpemkfPmHJ5u+isQzE8wnXkE=",
-                "hHJHWTpnWUexvq8J218KqBqmblpimQR021/GbPFKT1Q=",
-                "+MZDcE6B+WykiTN4ArTMQob21auW8/6PVAc4O62fq2s=",
-                "MNm3EDUMslVioVqCDb5PkW8op+cHFyw8qo3BKxVZLF4=",
-                "2LEoAWcTHMMFFV+/BYOGjPhdAtNL8asRwdliyaGQnRA="
+                "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs=",
+                "Mv5M6UhufCEmF7u9pBaGQJAckuwpkSpOJvJq1F+y9VE=",
+                "MpysVJMYUI4n0NcY2CdZyZxQxADOHJal1pZI2uPiqWs=",
+                "5stC+5v3eo3tADEkTtxESlCBIkoYI8aRDLJ8VVtcLyE=",
+                "MBSxmUfpp5p8FI+86A4+0zFYw5dPhre1YYw+sRFWkTs=",
+                "TPtzCHdDbaW3vAApNFc6nyC806fmdNqG9HaoZMQWGx8=",
+                "dt0Xmblg7vU0TEzE4yaBtNnQ8igZJcdlNj1CDVxXVHA=",
+                "RBJGJT9Pf2T2yzi+hfPXnXIjxZ6WbJ7UhZ1f1BGDpHc=",
+                "NN/FZ/sbjvhGAKzBQdtUrbjkDuCKbpwNCT3cKURvzB8=",
+                "BCoCHDIFRVyZqgGfB1SJpTsHa8tJ9VFOq0PUPubLBk8=",
+                "EAjQxthZt6mR2+wgMV35B4Bq61e16PCyX5JkhRwdxXM=",
+                "3LPp0kUrPjeKVkBFJSOL9b7/qjfUCc8ylqZyjcSFhVs=",
+                "zpjmculV506uDhkXJ4k6lCCFhVja5EkA2uXkefE3ZlY=",
+                "nEzbQkRVPl6H9+AF/OBcfLf61o1xO/jbB+7a1amJ3Eg=",
+                "NgSQDmucmraSK8QZve64DvMv1l01jQEpK9RjSR7J91Q=",
+                "vCB5ksvHTXCYtbCdBe+xynPo3T6ybVgLfHf0Od8PEEQ=",
+                "PlkLA8DFzpMQQaCsKICK7zxDRJ10YEdFGvFFfx9Fn08=",
+                "jm2usDGsU+/KSy2+6Q8X5cwhFr7pZ+tJ6GRCue2ywl0=",
+                "SD8rfdIV3Hp3PbiQ29KmNN4eYd0kMA6fVr4ZKb6McRg=",
+                "DKPADls0HZ0m0MtQb2qk5A/w/bUWAgf5gQI+F/9JMQQ=",
+                "5phPdMP/HWQCMGkXvgW8BDLgKZRTni2eQft8oDOlUhY=",
+                "LDkKHokr0ydfPuj3cFaXsI1Il1pFEZUrX3G2IM30Il8=",
+                "FFbRg7fgraPLTOBKkiepCl0ukp6fYHrh/E715Gsxn0Q=",
+                "aNBW1Qn9y0WejDJJzU/4FmfBnfOipeDOD0qo2u8u2xQ=",
+                "KGIhrGVhTah7Liwgphh6EidivlOVKbnWMQRrKItcnVY=",
+                "Ag+u6UoZ/AJnVmLH659K8zLlaFVgEV4TSWiCIo/1RGk=",
+                "Bjsr97vTdcPRFb8rVZ96yGKGEWqBRobalK09hSjnckk=",
+                "TLdnTFqBqDBI4LhGQrQLFIP9hYBXjvRIAj58YuCkrG8=",
+                "nLTmiuYHyKudXYxXSwT5fOLmIJOiuB5nsrvzRr+STlI=",
+                "sBYEmkom7ay5PR0JI4J9pohdAsT00BneDcBlk9XJAXc=",
+                "loZ/wr35u1XaMQXPi2KDCXbMoqCR4qSrihf8hGFGFnk=",
+                "Ethq6jJOlvciMq9CxnvCvPiS6dpQTSJAfGG3JAMTcn0=",
+                "uKGcjL8+ja5g+kg1GXmoKqB1UxsJjHFYyJsErIxRTDI=",
+                "zGNHYNpUX9fdDENSlT5a0MFzssn9nJwRs9Fh5NM1GDw=",
+                "xHnOdiSKGvOr7qzIXgP0epsFPy0STQy2+6nd6NZEeXo=",
+                "wuFVfI9geQ+U+R7LxM+SFiz15Fj7rpIRMOMNSt43PAM=",
+                "agMSIk+buHMb4qUc0veGzAUXdcVkHqc+Oy+Zt7IOKzA=",
+                "mj7RPYebPDz859w61Ce5HEQh3NGQ1xYyp5xthZtpym8=",
+                "jkmYEUw+dU8ypn03nXl6Fj+OzctOLlG8CSYEI15zNAg=",
+                "UAuc8dnFor4mva7EGD5bV/nqZz8wq2/RAte8r0iuNUY=",
+                "9OxHQt1/VR9JpMB4XrC0Yf7MScmHANkpSzcb1XujtkM=",
+                "Mv5V7+I0BBwNrVYf/012S+esEnqh3gAXZtlE8ClbOg0=",
+                "doMba7NOQ+4doCwCQdBGWbvI+qofpgNr1VHqrM8vMCw=",
+                "QIl+CO4G3g6Tbfre2g6TOkKOgZ4TgIoXeOoRqSV4jGU=",
+                "LBjAPlawmwRldmRDpKk0wJRQBpkNqhzDiDNBNYmzg1E=",
+                "QlKUaOO/znQjVtwXNGiwUDrV+GW3/a9wZXvvjvib+3I=",
+                "CAHB+5LsyE/ntr8d4Ll1eFnowotytI+ZksaSdiiIa00=",
+                "PorTCjYCypszf7/fs4eXgrgV4yi/3qIEmffYmaJ9hXI=",
+                "Gt95JWkzrdcSw41DCdoTs8umsC7CzH1y0rJ7m/2vGX4=",
+                "IjtwdzooaSvEr/V+e5vESRhUoJgvLnaqdbTL+dnKyR4="
               ],
-              "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg="
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
 
@@ -410,7 +415,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
 }
 
 TEST_F(BraveAdsRefillConfirmationTokensTest,
-       GetSignedTokensMissingSignedTokens) {
+       DoNotRefillConfirmationTokensIfGetSignedTokensIsMissingSignedTokens) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -423,7 +428,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
                                    test::kRequestSignedTokensNonce),
        {{net::HTTP_OK, /*response_body=*/R"(
             {
-              "batchProof": "emZH1a/Y+Q/ub1n7FuWZdkS/989iw4wNl2AnSNMmCQgy4f4ocjDJbHsWMnXWJUAIDPMHilVNJ1SXVctZ8TleBw==",
+              "batchProof": "zFKE/klGjgSJjgrc74uzy2cdc0dXPD3WTIbxraoQegTVi+Q0/YpI1olCDXoLf6FPMPwktEt1e3YWaMFlXn0vCw==",
               "publicKey": "QnShwT9vRebch3WDu28nqlTaNCU5MaOF1n4VV4Q3K1g="
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
@@ -440,7 +445,8 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
   EXPECT_EQ(0U, ConfirmationTokenCount());
 }
 
-TEST_F(BraveAdsRefillConfirmationTokensTest, GetInvalidSignedTokens) {
+TEST_F(BraveAdsRefillConfirmationTokensTest,
+       DoNotRefillConfirmationTokensIfGetSignedTokensAreInvalid) {
   // Arrange
   test::BuildAndSetIssuers();
 
@@ -454,7 +460,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, GetInvalidSignedTokens) {
        {{net::HTTP_OK, /*response_body=*/R"(
             {
             {
-              "batchProof": "nZBm4sojuuKV91w9/Hcevh3r0SSmx7Cu26oeUko7hwIXYQJXjuFabmJ40nNToVm7UAkiaQvoKDFViqfpHcwxAA==",
+              "batchProof": "zFKE/klGjgSJjgrc74uzy2cdc0dXPD3WTIbxraoQegTVi+Q0/YpI1olCDXoLf6FPMPwktEt1e3YWaMFlXn0vCw==",
               "signedTokens": [
                 "gD5YfqudgGrfn+oHpwPsF7COcPrCTLsYX70wa+EE+gg=",
                 "OOPCQu4K+hfE7YaYnI4SyNI1KTIfNR71rIuZKs/9rE8=",
@@ -507,7 +513,7 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, GetInvalidSignedTokens) {
                 "tlX/IqPpfSvJfwCZzIZonVx3hln15RZpsifkiMxr53s=",
                 "mML4eqBLA9XjZTqhoxVA6lVbMcjL54GqluGGPmMhWQA="
               ],
-              "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg="
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
 
@@ -524,11 +530,11 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, GetInvalidSignedTokens) {
 }
 
 TEST_F(BraveAdsRefillConfirmationTokensTest,
-       DoNotRefillIfAboveTheMinimumThreshold) {
+       DoNotRefillConfirmationTokensIfAboveTheMinimumThreshold) {
   // Arrange
   test::BuildAndSetIssuers();
 
-  test::RefillConfirmationTokens(/*count=*/50);
+  test::RefillConfirmationTokens(/*count=*/20);
 
   const WalletInfo wallet = test::Wallet();
 
@@ -539,15 +545,15 @@ TEST_F(BraveAdsRefillConfirmationTokensTest,
   EXPECT_CALL(delegate_mock_, OnDidRetryRefillingConfirmationTokens).Times(0);
   refill_confirmation_tokens_.MaybeRefill(wallet);
 
-  EXPECT_EQ(50U, ConfirmationTokenCount());
+  EXPECT_EQ(20U, ConfirmationTokenCount());
 }
 
-TEST_F(BraveAdsRefillConfirmationTokensTest, RefillIfBelowTheMinimumThreshold) {
+TEST_F(BraveAdsRefillConfirmationTokensTest,
+       RefillConfirmationTokensIfBelowTheMinimumThreshold) {
   // Arrange
   test::BuildAndSetIssuers();
 
-  test::MockTokenGenerator(/*count=*/19);
-  test::RefillConfirmationTokens(/*count=*/19);
+  test::RefillRandomConfirmationTokens(/*count=*/19);
 
   test::MockTokenGenerator(/*count=*/31);
 
@@ -558,41 +564,41 @@ TEST_F(BraveAdsRefillConfirmationTokensTest, RefillIfBelowTheMinimumThreshold) {
                                    test::kRequestSignedTokensNonce),
        {{net::HTTP_OK, /*response_body=*/R"(
             {
-              "batchProof": "gCF+6wrxT9bRFX+yjbdwPeWNZ8/wuDg6uZPy0Ea0yA2cfq5yEMpMfYMoH4BHW6EBbWR5QaOo1mVg+O9syYD3CA==",
+              "batchProof": "9YSTyoJ64yGBkMUfhr9AHNOHWVUsInyBTTrfdgfUCwyLTHE/TbPc/uwbGbVX0Y84QnOx/2dLXszDn3srCJMlCQ==",
               "signedTokens": [
-                "DA+IEWxDIW91q3JItW8D3xIYMgO0TDyP/TKXFQExLEs=",
-                "3KQ0o6IgVLHpKLzH01cGxA89om8CvOrW+anxorhJISk=",
-                "XlzLlvOPl3XqQAYF19ly95wnAu0IA5GNk9IIUVsen0Q=",
-                "VIAZP4U2QYJt/uUHLf0rfTVmMqTbytvqEGWx5eZLYDs=",
-                "rk+ollPWD+y8NlqiftGmr/riBJfsg34DM/M3Fi9BFA0=",
-                "xn/IDC6/wUuag5XIHR34lnnMRTi1GDVb96MYmUBUgmo=",
-                "iibC1sEFbkOqGvZuQgYG1vdr6QMfLYfvFWbybmo8Myo=",
-                "GAw6J637OVCz7iKN1WSg5LbLem/CMGcIz/iqmcVEvBc=",
-                "Vvr5eN/Wtk5papD2urom0iOZtInck8MCBFPKKn2yuEc=",
-                "1unbpoVjusErAw5cM03aBAtVUS1rKz21Z+/qro4fKjY=",
-                "/Efsmh2qQNviLW47/F7wjMYnvXsS3sNvoShIxg7tsCM=",
-                "VrWO44mtMyBHi3vwG9WFJcnJAueZtqCcUsnMnaH8x38=",
-                "yvr5gFkC70TOQuoPdc+1UUpL8TDvKgTHNIpIBqSVcic=",
-                "EsbmSuk0n/bNwwg9w09+vcABAXyJWOJHllEJam0li1I=",
-                "kpyU2LZomANA/sSiAmlhITmaSnUCF4k3ZbL8tC8bCBs=",
-                "snY5KcxsrH4YtPtuATwrqFEsI8s41CwFwzD9NQPRYDM=",
-                "Os0UZsMkLd2zjSvtlZXNONoC9lW88ub/am/m6M5JyA0=",
-                "yhgSTuGXe/7rEOn71eJFsIs2yenE4yAqqQLTxZvj9AE=",
-                "hswDh0BfDSFVC5IgVRo48u4DmNoVGXBguN0MvOcxFwQ=",
-                "WKkneVbAf05kwIWiH8wN3jhNjwyJLYi9zH+wkNBo5nw=",
-                "HH26LkAhxJxIFthoLyKD/OA67AzmyPW59ady3nYcnj4=",
-                "5EPMh4OW09U3M4d8oPYv4OPtOZPiN0+cLTWIRc486lw=",
-                "lhYrEba/qFw6hKUOhBJO6KVRUj4yQwXNhkhdNWvAFjg=",
-                "XKkrY+E8P2c3vBLa2967Q1uP3o0bsz6ElDbetbiPuUE=",
-                "/GgluIwAIj2zfuiY4YpfF+cLTByPNM37DBlld746bxY=",
-                "dMwnd60OVo3jF/DkkZIO9Y68vvGoL0yfO9qlLsdTfwo=",
-                "op4WXEs052uAvEvqvGWkr7PATcigxwwKExuIqMUoVQ4=",
-                "VJrlz3pP+VNeBivSYUYOLqKEP2x9vr75AUkBcazpMhg=",
-                "UJuKnh5+jVwrRctKm29v4FBLoLqy7Hq4ddr7Ci9o6X0=",
-                "pEQVS63QXhWHHOIClAxKJFevczY2YcTnS5SnzxX/AAE=",
-                "bjAvdetnrggnuQ4nUAG+SCUpMRhsnstXW/m9kIVwUys="
+                "Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs=",
+                "Mv5M6UhufCEmF7u9pBaGQJAckuwpkSpOJvJq1F+y9VE=",
+                "MpysVJMYUI4n0NcY2CdZyZxQxADOHJal1pZI2uPiqWs=",
+                "5stC+5v3eo3tADEkTtxESlCBIkoYI8aRDLJ8VVtcLyE=",
+                "MBSxmUfpp5p8FI+86A4+0zFYw5dPhre1YYw+sRFWkTs=",
+                "TPtzCHdDbaW3vAApNFc6nyC806fmdNqG9HaoZMQWGx8=",
+                "dt0Xmblg7vU0TEzE4yaBtNnQ8igZJcdlNj1CDVxXVHA=",
+                "RBJGJT9Pf2T2yzi+hfPXnXIjxZ6WbJ7UhZ1f1BGDpHc=",
+                "NN/FZ/sbjvhGAKzBQdtUrbjkDuCKbpwNCT3cKURvzB8=",
+                "BCoCHDIFRVyZqgGfB1SJpTsHa8tJ9VFOq0PUPubLBk8=",
+                "EAjQxthZt6mR2+wgMV35B4Bq61e16PCyX5JkhRwdxXM=",
+                "3LPp0kUrPjeKVkBFJSOL9b7/qjfUCc8ylqZyjcSFhVs=",
+                "zpjmculV506uDhkXJ4k6lCCFhVja5EkA2uXkefE3ZlY=",
+                "nEzbQkRVPl6H9+AF/OBcfLf61o1xO/jbB+7a1amJ3Eg=",
+                "NgSQDmucmraSK8QZve64DvMv1l01jQEpK9RjSR7J91Q=",
+                "vCB5ksvHTXCYtbCdBe+xynPo3T6ybVgLfHf0Od8PEEQ=",
+                "PlkLA8DFzpMQQaCsKICK7zxDRJ10YEdFGvFFfx9Fn08=",
+                "jm2usDGsU+/KSy2+6Q8X5cwhFr7pZ+tJ6GRCue2ywl0=",
+                "SD8rfdIV3Hp3PbiQ29KmNN4eYd0kMA6fVr4ZKb6McRg=",
+                "DKPADls0HZ0m0MtQb2qk5A/w/bUWAgf5gQI+F/9JMQQ=",
+                "5phPdMP/HWQCMGkXvgW8BDLgKZRTni2eQft8oDOlUhY=",
+                "LDkKHokr0ydfPuj3cFaXsI1Il1pFEZUrX3G2IM30Il8=",
+                "FFbRg7fgraPLTOBKkiepCl0ukp6fYHrh/E715Gsxn0Q=",
+                "aNBW1Qn9y0WejDJJzU/4FmfBnfOipeDOD0qo2u8u2xQ=",
+                "KGIhrGVhTah7Liwgphh6EidivlOVKbnWMQRrKItcnVY=",
+                "Ag+u6UoZ/AJnVmLH659K8zLlaFVgEV4TSWiCIo/1RGk=",
+                "Bjsr97vTdcPRFb8rVZ96yGKGEWqBRobalK09hSjnckk=",
+                "TLdnTFqBqDBI4LhGQrQLFIP9hYBXjvRIAj58YuCkrG8=",
+                "nLTmiuYHyKudXYxXSwT5fOLmIJOiuB5nsrvzRr+STlI=",
+                "sBYEmkom7ay5PR0JI4J9pohdAsT00BneDcBlk9XJAXc=",
+                "loZ/wr35u1XaMQXPi2KDCXbMoqCR4qSrihf8hGFGFnk="
               ],
-              "publicKey": "bCKwI6tx5LWrZKxWbW5CxaVIGe2N0qGYLfFE+38urCg="
+              "publicKey": "OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM="
             })"}}}};
   test::MockUrlResponses(ads_client_mock_, url_responses);
 
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util.cc
index 6ef603e256a3..3a77a32b2f03 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util.cc
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util.cc
@@ -11,13 +11,11 @@
 namespace brave_ads {
 
 bool ShouldRefillConfirmationTokens() {
-  return ConfirmationTokenCount() <
-         static_cast<size_t>(kMinConfirmationTokens.Get());
+  return ConfirmationTokenCount() < kMinConfirmationTokens.Get();
 }
 
 size_t CalculateAmountOfConfirmationTokensToRefill() {
-  return static_cast<size_t>(kMaxConfirmationTokens.Get()) -
-         ConfirmationTokenCount();
+  return kMaxConfirmationTokens.Get() - ConfirmationTokenCount();
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util_unittest.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util_unittest.cc
index cacedf5318f3..5e75dea3ed23 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util_unittest.cc
@@ -5,6 +5,8 @@
 
 #include "brave/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/refill_confirmation_tokens_util.h"
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/account/tokens/confirmation_tokens/confirmation_tokens_test_util.h"
 #include "brave/components/brave_ads/core/internal/account/utility/tokens_feature.h"
 #include "brave/components/brave_ads/core/internal/common/test/test_base.h"
@@ -18,7 +20,7 @@ class BraveAdsRefillConfirmationTokensUtilTest : public test::TestBase {};
 TEST_F(BraveAdsRefillConfirmationTokensUtilTest,
        ShouldRefillConfirmationTokens) {
   // Arrange
-  const int count = kMinConfirmationTokens.Get() - 1;
+  const size_t count = kMinConfirmationTokens.Get() - 1;
   test::RefillConfirmationTokens(count);
 
   // Act & Assert
@@ -28,7 +30,7 @@ TEST_F(BraveAdsRefillConfirmationTokensUtilTest,
 TEST_F(BraveAdsRefillConfirmationTokensUtilTest,
        ShouldNotRefillConfirmationTokens) {
   // Arrange
-  const int count = kMinConfirmationTokens.Get();
+  const size_t count = kMinConfirmationTokens.Get();
   test::RefillConfirmationTokens(count);
 
   // Act & Assert
@@ -42,7 +44,7 @@ TEST_F(BraveAdsRefillConfirmationTokensUtilTest,
 
   // Act & Assert
   EXPECT_EQ(kMaxConfirmationTokens.Get() - 10,
-            static_cast<int>(CalculateAmountOfConfirmationTokensToRefill()));
+            CalculateAmountOfConfirmationTokensToRefill());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder_unittest.cc b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder_unittest.cc
index 1bbf51637090..a89c556eb60b 100644
--- a/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/refill_confirmation_tokens/url_requests/request_signed_tokens/request_signed_tokens_url_request_builder_unittest.cc
@@ -37,11 +37,11 @@ TEST_F(BraveAdsRequestSignedTokensUrlRequestBuilderTest, BuildUrl) {
   expected_mojom_url_request->url = GURL(
       R"(https://mywallet.ads.bravesoftware.com/v3/confirmation/token/27a39b2f-9b2e-4eb0-bbb2-2f84447496e7)");
   expected_mojom_url_request->headers = {
-      "digest: SHA-256=dbSPIf2biUcc5mfr0b3dlYtVqnyelAFh1LBD6TjnXZc=",
-      R"(signature: keyId="primary",algorithm="ed25519",headers="digest",signature="lyFlFeZ4+u1DnQSbf2rijak+ezjJzpcZbA9c0uiUcz1t9rSgVwQvBnRRyju+jj5ysFcdNSWjj5csJ0vCbNlGAQ==")",
+      "digest: SHA-256=6vJaxnB5ipkIXjrPAgf3+2+lgtNYrjYuySqPDS72azI=",
+      R"(signature: keyId="primary",algorithm="ed25519",headers="digest",signature="7Nwtj+0lxBgRnA2ewJfZBU+s3yo5NlESR6XExLfeQh10vKdrPw6RWcuNLfxj7i5M/V1SNwRAIm9oEOD3xjoGCA==")",
       "content-type: application/json", "accept: application/json"};
   expected_mojom_url_request->content =
-      R"({"blindedTokens":["Ev5JE4/9TZI/5TqyN9JWfJ1To0HBwQw2rWeAPcdjX3Q=","shDzMRNpQKrQAfRctVm4l0Ulaoek0spX8iabH1+Vx00=","kMI3fgomSSNcT1N8d3b+AlZXybqA3st3Ks6XhwaSRF4="]})";
+      R"({"blindedTokens":["+qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0=","qJRP/aub7Io1osPghMfENIAZ8ImOH7D/tLzuokEHgQQ=","Rpubvx6PW1Emd4MLEUEvcilslF9IXH4rOf6M/DIw0RQ="]})";
   expected_mojom_url_request->content_type = "application/json";
   expected_mojom_url_request->method = mojom::UrlRequestMethodType::kPost;
   EXPECT_EQ(expected_mojom_url_request, mojom_url_request);
diff --git a/components/brave_ads/core/internal/account/utility/tokens_feature.h b/components/brave_ads/core/internal/account/utility/tokens_feature.h
index abc04c50e404..8957957a44a6 100644
--- a/components/brave_ads/core/internal/account/utility/tokens_feature.h
+++ b/components/brave_ads/core/internal/account/utility/tokens_feature.h
@@ -13,10 +13,10 @@ namespace brave_ads {
 
 BASE_DECLARE_FEATURE(kAccountTokensFeature);
 
-inline constexpr base::FeatureParam<int> kMinConfirmationTokens{
+inline constexpr base::FeatureParam<size_t> kMinConfirmationTokens{
     &kAccountTokensFeature, "minimum_confirmation_tokens", 20};
 
-inline constexpr base::FeatureParam<int> kMaxConfirmationTokens{
+inline constexpr base::FeatureParam<size_t> kMaxConfirmationTokens{
     &kAccountTokensFeature, "maximum_confirmation_tokens", 50};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/utility/tokens_feature_unittest.cc b/components/brave_ads/core/internal/account/utility/tokens_feature_unittest.cc
index ed8b99dfb16c..7e226c138909 100644
--- a/components/brave_ads/core/internal/account/utility/tokens_feature_unittest.cc
+++ b/components/brave_ads/core/internal/account/utility/tokens_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsTokensFeatureTest, MinConfirmationTokens) {
       kAccountTokensFeature, {{"minimum_confirmation_tokens", "7"}});
 
   // Act & Assert
-  EXPECT_EQ(7, kMinConfirmationTokens.Get());
+  EXPECT_EQ(7U, kMinConfirmationTokens.Get());
 }
 
 TEST(BraveAdsTokensFeatureTest, DefaultMinConfirmationTokens) {
   // Act & Assert
-  EXPECT_EQ(20, kMinConfirmationTokens.Get());
+  EXPECT_EQ(20U, kMinConfirmationTokens.Get());
 }
 
 TEST(BraveAdsTokensFeatureTest, DefaultMinConfirmationTokensWhenDisabled) {
@@ -47,7 +47,7 @@ TEST(BraveAdsTokensFeatureTest, DefaultMinConfirmationTokensWhenDisabled) {
   scoped_feature_list.InitAndDisableFeature(kAccountTokensFeature);
 
   // Act & Assert
-  EXPECT_EQ(20, kMinConfirmationTokens.Get());
+  EXPECT_EQ(20U, kMinConfirmationTokens.Get());
 }
 
 TEST(BraveAdsTokensFeatureTest, MaxConfirmationTokens) {
@@ -57,12 +57,12 @@ TEST(BraveAdsTokensFeatureTest, MaxConfirmationTokens) {
       kAccountTokensFeature, {{"maximum_confirmation_tokens", "21"}});
 
   // Act & Assert
-  EXPECT_EQ(21, kMaxConfirmationTokens.Get());
+  EXPECT_EQ(21U, kMaxConfirmationTokens.Get());
 }
 
 TEST(BraveAdsTokensFeatureTest, DefaultMaxConfirmationTokens) {
   // Act & Assert
-  EXPECT_EQ(50, kMaxConfirmationTokens.Get());
+  EXPECT_EQ(50U, kMaxConfirmationTokens.Get());
 }
 
 TEST(BraveAdsTokensFeatureTest, DefaultMaxConfirmationTokensWhenDisabled) {
@@ -71,7 +71,7 @@ TEST(BraveAdsTokensFeatureTest, DefaultMaxConfirmationTokensWhenDisabled) {
   scoped_feature_list.InitAndDisableFeature(kAccountTokensFeature);
 
   // Act & Assert
-  EXPECT_EQ(50, kMaxConfirmationTokens.Get());
+  EXPECT_EQ(50U, kMaxConfirmationTokens.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/account/utility/tokens_util.cc b/components/brave_ads/core/internal/account/utility/tokens_util.cc
index 7efec1604e7b..c6d14cd6bea3 100644
--- a/components/brave_ads/core/internal/account/utility/tokens_util.cc
+++ b/components/brave_ads/core/internal/account/utility/tokens_util.cc
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/public_key.h"
 #include "brave/components/brave_ads/core/internal/common/logging_util.h"
 
diff --git a/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature.h b/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature.h
index 8fb5521f47e1..71f6532268ff 100644
--- a/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature.h
+++ b/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature.h
@@ -14,11 +14,11 @@ namespace brave_ads {
 BASE_DECLARE_FEATURE(kInlineContentAdFeature);
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumInlineContentAdsPerHour{
+inline constexpr base::FeatureParam<size_t> kMaximumInlineContentAdsPerHour{
     &kInlineContentAdFeature, "maximum_ads_per_hour", 6};
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumInlineContentAdsPerDay{
+inline constexpr base::FeatureParam<size_t> kMaximumInlineContentAdsPerDay{
     &kInlineContentAdFeature, "maximum_ads_per_day", 20};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature_unittest.cc b/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature_unittest.cc
index be68c409ed74..9fb7686b46c8 100644
--- a/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature_unittest.cc
+++ b/components/brave_ads/core/internal/ad_units/inline_content_ad/inline_content_ad_feature_unittest.cc
@@ -33,13 +33,13 @@ TEST(BraveAdsInlineContentAdFeatureTest, MaximumInlineContentAdsPerHour) {
       kInlineContentAdFeature, {{"maximum_ads_per_hour", "42"}});
 
   // Act & Assert
-  EXPECT_EQ(42, kMaximumInlineContentAdsPerHour.Get());
+  EXPECT_EQ(42U, kMaximumInlineContentAdsPerHour.Get());
 }
 
 TEST(BraveAdsInlineContentAdFeatureTest,
      DefaultMaximumInlineContentAdsPerHour) {
   // Act & Assert
-  EXPECT_EQ(6, kMaximumInlineContentAdsPerHour.Get());
+  EXPECT_EQ(6U, kMaximumInlineContentAdsPerHour.Get());
 }
 
 TEST(BraveAdsInlineContentAdFeatureTest,
@@ -49,7 +49,7 @@ TEST(BraveAdsInlineContentAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kInlineContentAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(6, kMaximumInlineContentAdsPerHour.Get());
+  EXPECT_EQ(6U, kMaximumInlineContentAdsPerHour.Get());
 }
 
 TEST(BraveAdsInlineContentAdFeatureTest, MaximumInlineContentAdsPerDay) {
@@ -59,12 +59,12 @@ TEST(BraveAdsInlineContentAdFeatureTest, MaximumInlineContentAdsPerDay) {
       kInlineContentAdFeature, {{"maximum_ads_per_day", "24"}});
 
   // Act & Assert
-  EXPECT_EQ(24, kMaximumInlineContentAdsPerDay.Get());
+  EXPECT_EQ(24U, kMaximumInlineContentAdsPerDay.Get());
 }
 
 TEST(BraveAdsInlineContentAdFeatureTest, DefaultMaximumInlineContentAdsPerDay) {
   // Act & Assert
-  EXPECT_EQ(20, kMaximumInlineContentAdsPerDay.Get());
+  EXPECT_EQ(20U, kMaximumInlineContentAdsPerDay.Get());
 }
 
 TEST(BraveAdsInlineContentAdFeatureTest,
@@ -74,7 +74,7 @@ TEST(BraveAdsInlineContentAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kInlineContentAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(20, kMaximumInlineContentAdsPerDay.Get());
+  EXPECT_EQ(20U, kMaximumInlineContentAdsPerDay.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature.h b/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature.h
index 70448bdc5d45..c983da812737 100644
--- a/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature.h
+++ b/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature.h
@@ -18,11 +18,11 @@ namespace brave_ads {
 BASE_DECLARE_FEATURE(kNewTabPageAdFeature);
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumNewTabPageAdsPerHour{
+inline constexpr base::FeatureParam<size_t> kMaximumNewTabPageAdsPerHour{
     &kNewTabPageAdFeature, "maximum_ads_per_hour", 4};
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumNewTabPageAdsPerDay{
+inline constexpr base::FeatureParam<size_t> kMaximumNewTabPageAdsPerDay{
     &kNewTabPageAdFeature, "maximum_ads_per_day", 20};
 
 // Set to 0 to never cap.
diff --git a/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature_unittest.cc b/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature_unittest.cc
index 3b2099aaa440..e96beec58390 100644
--- a/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature_unittest.cc
+++ b/components/brave_ads/core/internal/ad_units/new_tab_page_ad/new_tab_page_ad_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsNewTabPageAdFeatureTest, MaximumNewTabPageAdsPerHour) {
       kNewTabPageAdFeature, {{"maximum_ads_per_hour", "42"}});
 
   // Act & Assert
-  EXPECT_EQ(42, kMaximumNewTabPageAdsPerHour.Get());
+  EXPECT_EQ(42U, kMaximumNewTabPageAdsPerHour.Get());
 }
 
 TEST(BraveAdsNewTabPageAdFeatureTest, DefaultMaximumNewTabPageAdsPerHour) {
   // Act & Assert
-  EXPECT_EQ(4, kMaximumNewTabPageAdsPerHour.Get());
+  EXPECT_EQ(4U, kMaximumNewTabPageAdsPerHour.Get());
 }
 
 TEST(BraveAdsNewTabPageAdFeatureTest,
@@ -48,7 +48,7 @@ TEST(BraveAdsNewTabPageAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kNewTabPageAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(4, kMaximumNewTabPageAdsPerHour.Get());
+  EXPECT_EQ(4U, kMaximumNewTabPageAdsPerHour.Get());
 }
 
 TEST(BraveAdsNewTabPageAdFeatureTest, MaximumNewTabPageAdsPerDay) {
@@ -58,12 +58,12 @@ TEST(BraveAdsNewTabPageAdFeatureTest, MaximumNewTabPageAdsPerDay) {
       kNewTabPageAdFeature, {{"maximum_ads_per_day", "24"}});
 
   // Act & Assert
-  EXPECT_EQ(24, kMaximumNewTabPageAdsPerDay.Get());
+  EXPECT_EQ(24U, kMaximumNewTabPageAdsPerDay.Get());
 }
 
 TEST(BraveAdsNewTabPageAdFeatureTest, DefaultMaximumNewTabPageAdsPerDay) {
   // Act & Assert
-  EXPECT_EQ(20, kMaximumNewTabPageAdsPerDay.Get());
+  EXPECT_EQ(20U, kMaximumNewTabPageAdsPerDay.Get());
 }
 
 TEST(BraveAdsNewTabPageAdFeatureTest,
@@ -73,7 +73,7 @@ TEST(BraveAdsNewTabPageAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kNewTabPageAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(20, kMaximumNewTabPageAdsPerDay.Get());
+  EXPECT_EQ(20U, kMaximumNewTabPageAdsPerDay.Get());
 }
 
 TEST(BraveAdsNewTabPageAdFeatureTest, NewTabPageAdMinimumWaitTime) {
diff --git a/components/brave_ads/core/internal/ad_units/notification_ad/notification_ad_feature_unittest.cc b/components/brave_ads/core/internal/ad_units/notification_ad/notification_ad_feature_unittest.cc
index a440a700f5b6..c0ff26082052 100644
--- a/components/brave_ads/core/internal/ad_units/notification_ad/notification_ad_feature_unittest.cc
+++ b/components/brave_ads/core/internal/ad_units/notification_ad/notification_ad_feature_unittest.cc
@@ -58,12 +58,12 @@ TEST(BraveAdsNotificationAdFeatureTest, MaximumNotificationAdsPerDay) {
       kNotificationAdFeature, {{"maximum_ads_per_day", "24"}});
 
   // Act & Assert
-  EXPECT_EQ(24, kMaximumNotificationAdsPerDay.Get());
+  EXPECT_EQ(24U, kMaximumNotificationAdsPerDay.Get());
 }
 
 TEST(BraveAdsNotificationAdFeatureTest, DefaultMaximumNotificationAdsPerDay) {
   // Act & Assert
-  EXPECT_EQ(100, kMaximumNotificationAdsPerDay.Get());
+  EXPECT_EQ(100U, kMaximumNotificationAdsPerDay.Get());
 }
 
 TEST(BraveAdsNotificationAdFeatureTest,
@@ -73,7 +73,7 @@ TEST(BraveAdsNotificationAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kNotificationAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(100, kMaximumNotificationAdsPerDay.Get());
+  EXPECT_EQ(100U, kMaximumNotificationAdsPerDay.Get());
 }
 
 TEST(BraveAdsNotificationAdFeatureTest,
diff --git a/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature.h b/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature.h
index 5f195de640b7..879ebe3d2cdf 100644
--- a/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature.h
+++ b/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature.h
@@ -14,11 +14,11 @@ namespace brave_ads {
 BASE_DECLARE_FEATURE(kPromotedContentAdFeature);
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumPromotedContentAdsPerHour{
+inline constexpr base::FeatureParam<size_t> kMaximumPromotedContentAdsPerHour{
     &kPromotedContentAdFeature, "maximum_ads_per_hour", 4};
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumPromotedContentAdsPerDay{
+inline constexpr base::FeatureParam<size_t> kMaximumPromotedContentAdsPerDay{
     &kPromotedContentAdFeature, "maximum_ads_per_day", 20};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature_unittest.cc b/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature_unittest.cc
index 9298dec9edb1..e3c66b18c3f7 100644
--- a/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature_unittest.cc
+++ b/components/brave_ads/core/internal/ad_units/promoted_content_ad/promoted_content_ad_feature_unittest.cc
@@ -33,13 +33,13 @@ TEST(BraveAdsPromotedContentAdFeatureTest, MaximumPromotedContentAdsPerHour) {
       kPromotedContentAdFeature, {{"maximum_ads_per_hour", "42"}});
 
   // Act & Assert
-  EXPECT_EQ(42, kMaximumPromotedContentAdsPerHour.Get());
+  EXPECT_EQ(42U, kMaximumPromotedContentAdsPerHour.Get());
 }
 
 TEST(BraveAdsPromotedContentAdFeatureTest,
      DefaultMaximumPromotedContentAdsPerHour) {
   // Act & Assert
-  EXPECT_EQ(4, kMaximumPromotedContentAdsPerHour.Get());
+  EXPECT_EQ(4U, kMaximumPromotedContentAdsPerHour.Get());
 }
 
 TEST(BraveAdsPromotedContentAdFeatureTest,
@@ -49,7 +49,7 @@ TEST(BraveAdsPromotedContentAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kPromotedContentAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(4, kMaximumPromotedContentAdsPerHour.Get());
+  EXPECT_EQ(4U, kMaximumPromotedContentAdsPerHour.Get());
 }
 
 TEST(BraveAdsPromotedContentAdFeatureTest, MaximumPromotedContentAdsPerDay) {
@@ -59,13 +59,13 @@ TEST(BraveAdsPromotedContentAdFeatureTest, MaximumPromotedContentAdsPerDay) {
       kPromotedContentAdFeature, {{"maximum_ads_per_day", "24"}});
 
   // Act & Assert
-  EXPECT_EQ(24, kMaximumPromotedContentAdsPerDay.Get());
+  EXPECT_EQ(24U, kMaximumPromotedContentAdsPerDay.Get());
 }
 
 TEST(BraveAdsPromotedContentAdFeatureTest,
      DefaultMaximumPromotedContentAdsPerDay) {
   // Act & Assert
-  EXPECT_EQ(20, kMaximumPromotedContentAdsPerDay.Get());
+  EXPECT_EQ(20U, kMaximumPromotedContentAdsPerDay.Get());
 }
 
 TEST(BraveAdsPromotedContentAdFeatureTest,
@@ -75,7 +75,7 @@ TEST(BraveAdsPromotedContentAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kPromotedContentAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(20, kMaximumPromotedContentAdsPerDay.Get());
+  EXPECT_EQ(20U, kMaximumPromotedContentAdsPerDay.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/ad_units/search_result_ad/search_result_ad_feature_unittest.cc b/components/brave_ads/core/internal/ad_units/search_result_ad/search_result_ad_feature_unittest.cc
index e823755f89d9..2ee89bd93c2e 100644
--- a/components/brave_ads/core/internal/ad_units/search_result_ad/search_result_ad_feature_unittest.cc
+++ b/components/brave_ads/core/internal/ad_units/search_result_ad/search_result_ad_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsSearchResultAdFeatureTest, MaximumSearchResultAdsPerHour) {
       kSearchResultAdFeature, {{"maximum_ads_per_hour", "42"}});
 
   // Act & Assert
-  EXPECT_EQ(42, kMaximumSearchResultAdsPerHour.Get());
+  EXPECT_EQ(42U, kMaximumSearchResultAdsPerHour.Get());
 }
 
 TEST(BraveAdsSearchResultAdFeatureTest, DefaultMaximumSearchResultAdsPerHour) {
   // Act & Assert
-  EXPECT_EQ(0, kMaximumSearchResultAdsPerHour.Get());
+  EXPECT_EQ(0U, kMaximumSearchResultAdsPerHour.Get());
 }
 
 TEST(BraveAdsSearchResultAdFeatureTest,
@@ -48,7 +48,7 @@ TEST(BraveAdsSearchResultAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kSearchResultAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(0, kMaximumSearchResultAdsPerHour.Get());
+  EXPECT_EQ(0U, kMaximumSearchResultAdsPerHour.Get());
 }
 
 TEST(BraveAdsSearchResultAdFeatureTest, MaximumSearchResultAdsPerDay) {
@@ -58,12 +58,12 @@ TEST(BraveAdsSearchResultAdFeatureTest, MaximumSearchResultAdsPerDay) {
       kSearchResultAdFeature, {{"maximum_ads_per_day", "24"}});
 
   // Act & Assert
-  EXPECT_EQ(24, kMaximumSearchResultAdsPerDay.Get());
+  EXPECT_EQ(24U, kMaximumSearchResultAdsPerDay.Get());
 }
 
 TEST(BraveAdsSearchResultAdFeatureTest, DefaultMaximumSearchResultAdsPerDay) {
   // Act & Assert
-  EXPECT_EQ(0, kMaximumSearchResultAdsPerDay.Get());
+  EXPECT_EQ(0U, kMaximumSearchResultAdsPerDay.Get());
 }
 
 TEST(BraveAdsSearchResultAdFeatureTest,
@@ -73,7 +73,7 @@ TEST(BraveAdsSearchResultAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kSearchResultAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(0, kMaximumSearchResultAdsPerDay.Get());
+  EXPECT_EQ(0U, kMaximumSearchResultAdsPerDay.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/common/calendar/calendar_util_unittest.cc b/components/brave_ads/core/internal/common/calendar/calendar_util_unittest.cc
index 387cd1fcba77..d190fb038bd6 100644
--- a/components/brave_ads/core/internal/common/calendar/calendar_util_unittest.cc
+++ b/components/brave_ads/core/internal/common/calendar/calendar_util_unittest.cc
@@ -44,7 +44,7 @@ TEST(BraveAdsCalendarUtilTest, DaysInMonth) {
                                        31, 31, 30, 31, 30, 31};
 
   // Act & Assert
-  for (int i = 0; i < 12; ++i) {
+  for (size_t i = 0; i < 12; ++i) {
     EXPECT_EQ(kLastDayInMonth[i], DaysInMonth(/*year=*/2021, /*month=*/i + 1));
   }
 }
@@ -55,7 +55,7 @@ TEST(BraveAdsCalendarUtilTest, DaysInMonthForLeapYear) {
                                     31, 31, 30, 31, 30, 31};
 
   // Act & Assert
-  for (int i = 0; i < 12; ++i) {
+  for (size_t i = 0; i < 12; ++i) {
     EXPECT_EQ(kDaysInMonth[i], DaysInMonth(/*year=*/2020, /*month=*/i + 1));
   }
 }
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc
index 99478dc1e9f5..e809228d1c6d 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.cc
@@ -23,8 +23,8 @@ namespace brave_ads::cbr {
 namespace {
 
 std::optional<challenge_bypass_ristretto::BatchDLEQProof> Create(
-    const std::vector<BlindedToken>& blinded_tokens,
-    const std::vector<SignedToken>& signed_tokens,
+    const BlindedTokenList& blinded_tokens,
+    const SignedTokenList& signed_tokens,
     const SigningKey& signing_key) {
   if (!signing_key.has_value()) {
     return std::nullopt;
@@ -46,9 +46,9 @@ std::optional<challenge_bypass_ristretto::BatchDLEQProof> Create(
           batch_dleq_proof_base64));
 }
 
-std::vector<UnblindedToken> ToUnblindedTokens(
+UnblindedTokenList ToUnblindedTokens(
     const std::vector<challenge_bypass_ristretto::UnblindedToken>& raw_tokens) {
-  std::vector<UnblindedToken> unblinded_tokens;
+  UnblindedTokenList unblinded_tokens;
   unblinded_tokens.reserve(raw_tokens.size());
 
   for (const auto& raw_token : raw_tokens) {
@@ -70,8 +70,8 @@ BatchDLEQProof::BatchDLEQProof() = default;
 BatchDLEQProof::BatchDLEQProof(const std::string& batch_dleq_proof_base64)
     : batch_dleq_proof_(Create(batch_dleq_proof_base64)) {}
 
-BatchDLEQProof::BatchDLEQProof(const std::vector<BlindedToken>& blinded_tokens,
-                               const std::vector<SignedToken>& signed_tokens,
+BatchDLEQProof::BatchDLEQProof(const BlindedTokenList& blinded_tokens,
+                               const SignedTokenList& signed_tokens,
                                const SigningKey& signing_key)
     : batch_dleq_proof_(Create(blinded_tokens, signed_tokens, signing_key)) {}
 
@@ -102,8 +102,8 @@ std::optional<std::string> BatchDLEQProof::EncodeBase64() const {
   return batch_dleq_proof_->EncodeBase64();
 }
 
-bool BatchDLEQProof::Verify(const std::vector<BlindedToken>& blinded_tokens,
-                            const std::vector<SignedToken>& signed_tokens,
+bool BatchDLEQProof::Verify(const BlindedTokenList& blinded_tokens,
+                            const SignedTokenList& signed_tokens,
                             const PublicKey& public_key) {
   if (!has_value() || !public_key.has_value()) {
     return false;
@@ -120,10 +120,10 @@ bool BatchDLEQProof::Verify(const std::vector<BlindedToken>& blinded_tokens,
       .value_or(false);
 }
 
-std::optional<std::vector<UnblindedToken>> BatchDLEQProof::VerifyAndUnblind(
-    const std::vector<Token>& tokens,
-    const std::vector<BlindedToken>& blinded_tokens,
-    const std::vector<SignedToken>& signed_tokens,
+std::optional<UnblindedTokenList> BatchDLEQProof::VerifyAndUnblind(
+    const TokenList& tokens,
+    const BlindedTokenList& blinded_tokens,
+    const SignedTokenList& signed_tokens,
     const PublicKey& public_key) {
   if (!batch_dleq_proof_ || !has_value() || tokens.empty() ||
       !public_key.has_value()) {
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h
index 065c9d69d646..1b8d8d76d4d2 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/batch_dleq_proof.h
@@ -9,19 +9,18 @@
 #include <optional>
 #include <ostream>
 #include <string>
-#include <vector>
 
 #include "base/check.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h"
 #include "brave/components/challenge_bypass_ristretto/batch_dleq_proof.h"
 
 namespace brave_ads::cbr {
 
-class BlindedToken;
 class PublicKey;
-class SignedToken;
 class SigningKey;
-class Token;
-class UnblindedToken;
 
 // A `BatchDLEQProof` is a proof of the equivalence of the discrete logarithm
 // between a common pair of points and one or more other pairs of points.
@@ -30,8 +29,8 @@ class BatchDLEQProof {
  public:
   BatchDLEQProof();
   explicit BatchDLEQProof(const std::string& batch_dleq_proof_base64);
-  BatchDLEQProof(const std::vector<BlindedToken>& blinded_tokens,
-                 const std::vector<SignedToken>& signed_tokens,
+  BatchDLEQProof(const BlindedTokenList& blinded_tokens,
+                 const SignedTokenList& signed_tokens,
                  const SigningKey& signing_key);
 
   BatchDLEQProof(const BatchDLEQProof&) = delete;
@@ -60,14 +59,14 @@ class BatchDLEQProof {
       const std::string& batch_dleq_proof_base64);
   std::optional<std::string> EncodeBase64() const;
 
-  [[nodiscard]] bool Verify(const std::vector<BlindedToken>& blinded_tokens,
-                            const std::vector<SignedToken>& signed_tokens,
+  [[nodiscard]] bool Verify(const BlindedTokenList& blinded_tokens,
+                            const SignedTokenList& signed_tokens,
                             const PublicKey& public_key);
 
-  [[nodiscard]] std::optional<std::vector<UnblindedToken>> VerifyAndUnblind(
-      const std::vector<Token>& tokens,
-      const std::vector<BlindedToken>& blinded_tokens,
-      const std::vector<SignedToken>& signed_tokens,
+  [[nodiscard]] std::optional<UnblindedTokenList> VerifyAndUnblind(
+      const TokenList& tokens,
+      const BlindedTokenList& blinded_tokens,
+      const SignedTokenList& signed_tokens,
       const PublicKey& public_key);
 
  private:
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.cc
index 43507d2491c6..fa3ec122d197 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.cc
@@ -18,11 +18,11 @@ BlindedToken GetInvalidBlindedToken() {
   return BlindedToken(kInvalidBase64);
 }
 
-std::vector<BlindedToken> GetBlindedTokens() {
+BlindedTokenList GetBlindedTokens() {
   return {GetBlindedToken()};
 }
 
-std::vector<BlindedToken> GetInvalidBlindedTokens() {
+BlindedTokenList GetInvalidBlindedTokens() {
   return {GetInvalidBlindedToken()};
 }
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.h
index 2f9c0fc61212..c02da3fae7c3 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_test_util.h
@@ -6,21 +6,15 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BLINDED_TOKEN_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BLINDED_TOKEN_TEST_UTIL_H_
 
-#include <vector>
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h"
 
-namespace brave_ads::cbr {
-
-class BlindedToken;
-
-namespace test {
+namespace brave_ads::cbr::test {
 
 BlindedToken GetBlindedToken();
 BlindedToken GetInvalidBlindedToken();
-std::vector<BlindedToken> GetBlindedTokens();
-std::vector<BlindedToken> GetInvalidBlindedTokens();
-
-}  // namespace test
+BlindedTokenList GetBlindedTokens();
+BlindedTokenList GetInvalidBlindedTokens();
 
-}  // namespace brave_ads::cbr
+}  // namespace brave_ads::cbr::test
 
 #endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_BLINDED_TOKEN_TEST_UTIL_H_
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc
index a9dd373e49bd..c4fbe946e88f 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.cc
@@ -12,8 +12,8 @@
 
 namespace brave_ads::cbr {
 
-std::vector<BlindedToken> BlindTokens(const std::vector<Token>& tokens) {
-  std::vector<BlindedToken> blinded_tokens;
+BlindedTokenList BlindTokens(const TokenList& tokens) {
+  BlindedTokenList blinded_tokens;
   blinded_tokens.reserve(tokens.size());
 
   for (Token token : tokens) {
@@ -33,7 +33,7 @@ std::vector<BlindedToken> BlindTokens(const std::vector<Token>& tokens) {
 }
 
 std::vector<challenge_bypass_ristretto::BlindedToken> ToRawBlindedTokens(
-    const std::vector<BlindedToken>& blinded_tokens) {
+    const BlindedTokenList& blinded_tokens) {
   std::vector<challenge_bypass_ristretto::BlindedToken> raw_blinded_tokens;
   raw_blinded_tokens.reserve(blinded_tokens.size());
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.h
index 42829e99c03e..90aab03b7f3b 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token_util.h
@@ -8,17 +8,16 @@
 
 #include <vector>
 
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/blinded_token.h"
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h"
 #include "brave/components/challenge_bypass_ristretto/blinded_token.h"
 
 namespace brave_ads::cbr {
 
-class BlindedToken;
-class Token;
-
-std::vector<BlindedToken> BlindTokens(const std::vector<Token>& tokens);
+BlindedTokenList BlindTokens(const TokenList& tokens);
 
 std::vector<challenge_bypass_ristretto::BlindedToken> ToRawBlindedTokens(
-    const std::vector<BlindedToken>& blinded_tokens);
+    const BlindedTokenList& blinded_tokens);
 
 }  // namespace brave_ads::cbr
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h
index af3954667048..6fecefd5dc93 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h
@@ -25,9 +25,6 @@ inline constexpr char kBlindedTokenBase64[] =
 inline constexpr char kSignedTokenBase64[] =
     R"(jGZR7JREp+zoqxgsMOa32F+zhhBw/0d/HeVhl9iPVWU=)";
 
-inline constexpr char kDLEQProofBase64[] =
-    R"(8vp0QItdO24oqOZB8m8rCB85VUftBhnpZ8kDovYP9AvvlaEpwDFbTi72B1ZEJmumS5TazlWlLBlI4HrWDCMvDg==)";
-
 inline constexpr char kBatchDLEQProofBase64[] =
     R"(y0a409PTX6g97xC0Xq8cCuY7ElLPaP+QJ6DaHNfqlQWizBYCSWdaleakKatkyNswfPmkQuhL7awmzQ0ygEUGDw==)";
 
@@ -40,6 +37,172 @@ inline constexpr char kVerificationSignatureBase64[] =
 inline constexpr char kTokenPreimageBase64[] =
     R"(IXDCnZnVEJ0orkbZfr2ut2NQPQ0ofdervKBmQ2hyjcClGCjA3/ExbBumO0ua5cxwo//nN0uKQ60kknru8hRXxw==)";
 
+// Deterministic values for testing.
+//
+// Confirmation Tokens:
+//
+//   Signing Key:
+//     vzbdla00HbNHEjyHtH9zhNiHW9xaIh9lGoz+nrbPlwY=
+//
+//   Public Key:
+//     OqhZpUC8B15u+Gc11rQYRl8O3zOSAUIEC2JuDHI32TM=
+//
+//   Blinded Tokens:
+//     +qJiMi6k0hRzRAEN239nLthLqrNm53O78x/PV8I/JS0=
+//     qJRP/aub7Io1osPghMfENIAZ8ImOH7D/tLzuokEHgQQ=
+//     Rpubvx6PW1Emd4MLEUEvcilslF9IXH4rOf6M/DIw0RQ=
+//     emAayme7sAYSMHZyQL7pz4spX0ENV8GguOaa0kVjy2Y=
+//     BCsNsSajBb1oy0BBd8SYE7OqU0fFiAVae4uyGwh1yA8=
+//     iI+VRiS6DIeCQrZ1VUDjrNqmrPfQsgL5LC2r34pPQWo=
+//     uk4WrGWDL3kcQUFaAdKZcZwwWlFB+VvHxmXekbl7sx8=
+//     tDTQL9Q2dstNUBis+dMeGYLXkoyZ0WCxS6p0tzm+FEQ=
+//     GBMycmaAioDYqcGHaRuCHZqLj1kjm16hE9Q0IwqlegM=
+//     ronQjHzjJ3/+k9bQcIysdTOLVhQTUr0SE5rRuPXr/S0=
+//     1LcBYzvkZCveVBWqnD8q0ROib/DBxmClJXUPE/L0rFk=
+//     eMwmKIn+x469uG2ELHVAy5gA6w6MhpvNBMxCZDaK6F0=
+//     ksmor6Rf+mhygDpamII59NqgWTeGp7LBv6K9pFWuaC8=
+//     8KPXVtGZSRhyQA7lijOVX5mw1s1tHBAyI1J02GVj/Hs=
+//     KPa8J+FFbtRiOWFuartWFOU8sXmtWQCKAED/OCZeSDc=
+//     hKJaPWMgJPk0tzdHhizBWGjK3OdPWek0ulHuw+ugaCg=
+//     Gpl+hOjKQ+u8G/9k95ounlvqS1clessS8ffzphAOjSA=
+//     TKFhPnXiyn7QKV3lZwxqtjuUUbpnZXCd6NraOK/Wl2c=
+//     Ru0Jww8XcXowuE+I206YRzN0H/svPh965gSDUruqGBY=
+//     XMtBT/TIWqhe7oEi0sc9PVV0+ORGmkZyXqYbY1sceGk=
+//     Hls4b0JfV1wzmEkuzi+JAvV8GSeOMtCu1TUYV3qi1FQ=
+//     PtV7vv6wwko9BJvKwKpss/ip8n9kPE4OI0pskdNujE0=
+//     zm+xId+BnvG/0pVK0ensKZw6cpGkyfPoFU0Ciy90YAw=
+//     vH4Ia7rARJ5BzOtgdDpo91nCb8yJi1hegK0zrD1kpzk=
+//     VL2iooUBy0wSKWh+0xPsXL3XBnnHAIlEbYFT0FucdH4=
+//     wDO5/O80DbUNpE7VPW8KjNyU6NgNpAXwDhUUL9fjFBk=
+//     smD5xbol3KT21x8gWqLdrS6aEF/Z2NK3jcavPkbc11k=
+//     UJQWTdjmqfG0Q7EOsnT8y7JDMJcvR1TdBu2ufeCkyxg=
+//     OoVG5cljpSFh7slaHtUp1f0NxQMYnhElres1Mryw3AY=
+//     /C2ZWFQRfb1z+jDR84qym63nF2taJegOnHfBvx2+iG8=
+//     rC1beWdXC+0byVFU+A882xyhusXwQZfYm0HDq7refAE=
+//     KjHtaRsaAhemIc62b++WSeATUGa3dt8ZI7R+gzi/2mc=
+//     frh0M5bFn+aoaXuU7aFvi2arOP2PgQ2atGoVAJexumU=
+//     TGubsu4p3Fy4/W882udNbE971BYLg7pNsykM12cuayQ=
+//     7imGJvy4AjF+RaKfPAfz/Czt+kObY5qtSrqPnRjEIAQ=
+//     glk6eUsg/9nUas1iQ7MRzvpww44PinupfOwxVfa9KmI=
+//     +A3bf8OPgdZ0vtMi6eVC1RFFMqQG9qrWw/bQfeTD4W0=
+//     KtRpWtyibVmDt0XTCXCJCg+aN7oD2KgCAWVjyfJO4gs=
+//     NEAoVtzlNrMDmhQcCEiyYvivFwL5M1vdtaFx+j276QI=
+//     nlTsApw3b5dKzu/iL6ax74/3h6MaDHhaGTAeGqBAmm0=
+//     cHKwDZcMDJrTHJ38lv3rhdaoGVJ2yjH9G9KsQSFG5yk=
+//     yF+sL24C27QK7RNGEcYXAHyb50/QCwgcvGgWjqqu0DE=
+//     qgk0zv2bC6cUBMBEaUBo072QHyadMVqk8l1HvvB50l8=
+//     krmsbSgqWiAZny1Z3NP6FgVkmEqPJzNWfb5oqTbxfys=
+//     aKtrU/igXLTAfRzFSXyOzg7ZWNtzVClyQ1VTUp/K5Xo=
+//     HE5V9vDc4uA1OvcS5NG1dpOjx1DjwqvyUsuBe1f6oAs=
+//     /DWUsXLbZ0FnQ5P4Xv5/NZn4WY0O755v1bkj3Ye1KA8=
+//     UMqOMU+hU2MqKdgmjgNW03YkL/ta0cQpcivRmRhKrH0=
+//     3Pg0R+A1WdbQWMwN8Kr+4sCFaF7svBHdqoXzs79yDmQ=
+//     gKq3Mu2S5r6zp+e23dpr4y5a3xY3KF6wDyhJqabhDh8=
+//
+//   Signed Tokens:
+//     Ktsii4pOKOjfmqziUsdlV3lJETaGXG0rksRujn1i1Qs=
+//     Mv5M6UhufCEmF7u9pBaGQJAckuwpkSpOJvJq1F+y9VE=
+//     MpysVJMYUI4n0NcY2CdZyZxQxADOHJal1pZI2uPiqWs=
+//     5stC+5v3eo3tADEkTtxESlCBIkoYI8aRDLJ8VVtcLyE=
+//     MBSxmUfpp5p8FI+86A4+0zFYw5dPhre1YYw+sRFWkTs=
+//     TPtzCHdDbaW3vAApNFc6nyC806fmdNqG9HaoZMQWGx8=
+//     dt0Xmblg7vU0TEzE4yaBtNnQ8igZJcdlNj1CDVxXVHA=
+//     RBJGJT9Pf2T2yzi+hfPXnXIjxZ6WbJ7UhZ1f1BGDpHc=
+//     NN/FZ/sbjvhGAKzBQdtUrbjkDuCKbpwNCT3cKURvzB8=
+//     BCoCHDIFRVyZqgGfB1SJpTsHa8tJ9VFOq0PUPubLBk8=
+//     EAjQxthZt6mR2+wgMV35B4Bq61e16PCyX5JkhRwdxXM=
+//     3LPp0kUrPjeKVkBFJSOL9b7/qjfUCc8ylqZyjcSFhVs=
+//     zpjmculV506uDhkXJ4k6lCCFhVja5EkA2uXkefE3ZlY=
+//     nEzbQkRVPl6H9+AF/OBcfLf61o1xO/jbB+7a1amJ3Eg=
+//     NgSQDmucmraSK8QZve64DvMv1l01jQEpK9RjSR7J91Q=
+//     vCB5ksvHTXCYtbCdBe+xynPo3T6ybVgLfHf0Od8PEEQ=
+//     PlkLA8DFzpMQQaCsKICK7zxDRJ10YEdFGvFFfx9Fn08=
+//     jm2usDGsU+/KSy2+6Q8X5cwhFr7pZ+tJ6GRCue2ywl0=
+//     SD8rfdIV3Hp3PbiQ29KmNN4eYd0kMA6fVr4ZKb6McRg=
+//     DKPADls0HZ0m0MtQb2qk5A/w/bUWAgf5gQI+F/9JMQQ=
+//     5phPdMP/HWQCMGkXvgW8BDLgKZRTni2eQft8oDOlUhY=
+//     LDkKHokr0ydfPuj3cFaXsI1Il1pFEZUrX3G2IM30Il8=
+//     FFbRg7fgraPLTOBKkiepCl0ukp6fYHrh/E715Gsxn0Q=
+//     aNBW1Qn9y0WejDJJzU/4FmfBnfOipeDOD0qo2u8u2xQ=
+//     KGIhrGVhTah7Liwgphh6EidivlOVKbnWMQRrKItcnVY=
+//     Ag+u6UoZ/AJnVmLH659K8zLlaFVgEV4TSWiCIo/1RGk=
+//     Bjsr97vTdcPRFb8rVZ96yGKGEWqBRobalK09hSjnckk=
+//     TLdnTFqBqDBI4LhGQrQLFIP9hYBXjvRIAj58YuCkrG8=
+//     nLTmiuYHyKudXYxXSwT5fOLmIJOiuB5nsrvzRr+STlI=
+//     sBYEmkom7ay5PR0JI4J9pohdAsT00BneDcBlk9XJAXc=
+//     loZ/wr35u1XaMQXPi2KDCXbMoqCR4qSrihf8hGFGFnk=
+//     Ethq6jJOlvciMq9CxnvCvPiS6dpQTSJAfGG3JAMTcn0=
+//     uKGcjL8+ja5g+kg1GXmoKqB1UxsJjHFYyJsErIxRTDI=
+//     zGNHYNpUX9fdDENSlT5a0MFzssn9nJwRs9Fh5NM1GDw=
+//     xHnOdiSKGvOr7qzIXgP0epsFPy0STQy2+6nd6NZEeXo=
+//     wuFVfI9geQ+U+R7LxM+SFiz15Fj7rpIRMOMNSt43PAM=
+//     agMSIk+buHMb4qUc0veGzAUXdcVkHqc+Oy+Zt7IOKzA=
+//     mj7RPYebPDz859w61Ce5HEQh3NGQ1xYyp5xthZtpym8=
+//     jkmYEUw+dU8ypn03nXl6Fj+OzctOLlG8CSYEI15zNAg=
+//     UAuc8dnFor4mva7EGD5bV/nqZz8wq2/RAte8r0iuNUY=
+//     9OxHQt1/VR9JpMB4XrC0Yf7MScmHANkpSzcb1XujtkM=
+//     Mv5V7+I0BBwNrVYf/012S+esEnqh3gAXZtlE8ClbOg0=
+//     doMba7NOQ+4doCwCQdBGWbvI+qofpgNr1VHqrM8vMCw=
+//     QIl+CO4G3g6Tbfre2g6TOkKOgZ4TgIoXeOoRqSV4jGU=
+//     LBjAPlawmwRldmRDpKk0wJRQBpkNqhzDiDNBNYmzg1E=
+//     QlKUaOO/znQjVtwXNGiwUDrV+GW3/a9wZXvvjvib+3I=
+//     CAHB+5LsyE/ntr8d4Ll1eFnowotytI+ZksaSdiiIa00=
+//     PorTCjYCypszf7/fs4eXgrgV4yi/3qIEmffYmaJ9hXI=
+//     Gt95JWkzrdcSw41DCdoTs8umsC7CzH1y0rJ7m/2vGX4=
+//     IjtwdzooaSvEr/V+e5vESRhUoJgvLnaqdbTL+dnKyR4=
+//
+//   Verification Signatures:
+//     +Z9XQWp6ltCj5g/GyVU4GTVGNHIVWG5hmNZITgsAZvN088sfO8zmBTNI4IhGWBUCzlKs/zt7k25Kgz/v9lnClA==
+//     BdktXBMekamjs0vNyYjAia1CzsjNy+7a+SiAKM9a68nqMDSzfhLMvOoLtCTA/WOJdLk1sSK9PvI0J8bghSKP+Q==
+//     ziGht6ktE/UkZMGg2TaEzAB/ugKC/lQV6gUEHxzCApp7SQ5U+meKot5lAk5S0d/Sf1+7Ry8TVSvXkGW2G6ql2w==
+//     oC3h53kphYAW8DvCChOa8zIu3UkVUFN5+pFQKep0dXYtGG/PZHV8RnzBVfCRW61FF/cKrfp+tfz3Rz8v52Yc/Q==
+//     8U4rqAue0LnOAi1LbpW1+z/LXRAf8ovSA7fVoWV11E61fhiwCMYJYa2k3PhTNtzBf+yOEk6QNW25DrdsXV13PA==
+//     3F+KPmTFNPHEquqicHfvYJPFiygpzPYlo/XphdY6g6Xlr6cD9vlm+YlBPYnKdwRlSlQiby0obz1n26nyD9XcIg==
+//     soWJkIZVfHW9Wbow8/pk4qMsNAubDs/2JlOMMZmIaOJm6iJLrse5nws6RL56QhUS12KDpVi5hfr7POseXEH3lw==
+//     IEpwZV6/I6+v9gEPjYSBZlqtvynUAEshq6rPNtAHaTgxcP5fvjfJQml+FHhU3x4BjGPkJ8WABB98/78gi7WLFA==
+//     Z9qJvSP4rc9T1QVk8O/MW2P1iGSxZYtgpHnG+B4aCFOZEWXK2SSNo3BE0CuI7a53WMT2II4T/Yj6FhVA68UpqQ==
+//     A68UwMC9GkG6NdeUpk1Uujfg7jXfgy5BPzQP8xO4CVDdK6MzPnaJTT1bfiSiYDxOOR3nUX6pR+keICY3IJHtkQ==
+//     MLcO6JvMWnu6+7LD2SxU3wjAikYKqm8VsHyHEvxrwC8MqdYnAk3QwyqY4cz1y85D6IcfixLdV1tfgUVNIKS+Sw==
+//     B3ka0buAN04NUTl5JEVkBFZnZnI9aYleqnxHpG4IIVIh1xkhpRHHguwr7+n+M7dJzKIa1o1nPfTR4Zaw8uPQQA==
+//     85ABYWSteFPQHDZog8z9rDFWgjVqZEkQXP6vEnEclsv7BofsYwyRUDxiERcgRknzr30lPeqxg63mKMyGnZ25BA==
+//     zmbuOuGBWOIMRDaLa1fH5lpqHdr4i6ZvOb7p/Fj44nByi+TMPzXv9GdF9CkDN20Iduy6LiOVZb6wvJtpJ3l2XQ==
+//     WFBZXiarPUEz6COtHlodMT12v+Icf6gUQXW4GWhXoA6u5lsa3uGPEBvxZh90kcwyCKKI/Mt13W/PEZNxdZWBmQ==
+//     PIedXOTy/5zkrxouvxv9yApmw1ye7zS8UZCcYhEYj5Z8Y20fzH7D5ZAJjt7uX0LvCZHmnSjV5xY7fcZP9PyZiQ==
+//     LMhwPJ9L6wD2CwHtseesfyLvslKkQogymD7Yfu9946zVlB2VkQCQxRkKndQL0dU9qUbynuoqB6UKap/JR2DjdA==
+//     G2cAs/OYgQeNhy4Yh6h+/+CGlDgQtof4SZEg0MkQ+xvKdmFBVmdIfKANaZYBNOcfxWxpKUH0NVaSe+tNn6QbCg==
+//     Jq3aO3UsTkgOjaXrvL7cYMrfG5U3liGyqtVIxj4BEeT4BWiY4qMvXGlLFCLFPC3de2rouUaaqdDhIHZrRiSSsg==
+//     9lt1kEYmSCvEZcvfs+KWrXD8XYykUNoLyYiSUq6VPPZIxg8dfBFp0Yabea3CZXHaetCKAznMVAlYyt2QYOcpig==
+//     Ba+VI7EFvqQWRo8iuUYX1sS4EotS3zzYZFuwiyrdD8wNpGtKbo6DHgbzo+WkLbHUQFjZTlBeoVOw4Rl/NZJMMA==
+//     QmN9vW4hC+4GxGDP8OIDsvwA/9vZzMDof0HRYkRD78+tZWSic/xC0rzL1ltTYVm2ZO64ZK1PxBE6j/6z7VbW8g==
+//     HE23nVQysY3YlPYLA6CHtyyD2OmeixRsLzolWXxtWfjS4QExY0Xe2IK3dJkU/TsJGogfUQYl1zvuBCWcs7Z6yA==
+//     B8tWTLiWzWa61s4zscWS23sf3PLAXU6vBSCSNOstz4PBXmmw1PcUEMwSUTJGQupwGLEEHvIJMPZBaUsJtmBAgA==
+//     /dHptF8FxWu9IZybSnzsEu+PhuwS2UXusUsSdTa69zWuP4AsjPNOllaVY/TucChNDBhaGJMnBYm9bcmWSDjm0Q==
+//     gD+f9NK0YIS48VIUhmaC9XOEYxjPtxRC4P4LDmDvPzJk22PPTPtP+p9MEyXPgP+zV5IoKuN6KtvJ2gCHE4khDQ==
+//     Mhv2p6UefL/ahe3Ji8/U4ebMjJxSq5ImiqfeMZB+ngvqHRY0uH1WxsKeh94EJK997QZ61Ff0HylKjDtnBPw76w==
+//     RZZP4Y6F94DC51vZxdEJ1S0f8VAG0wyBVDb7tgy1wjrZ8vi9OVxjtoHn681ejmpzysqSV8ATeTm/xNyUA2iG/w==
+//     bhSaLLopcx06tl5YozNVLB7AyZPvjqey/ZFpBzwbCrQROVCfGXCLGnLVZGXkvLYnzJqA5NtG9Cw7X9+SvcZvbw==
+//     n6CfLBw68UauJg9DtnpKtmnVMOjfRwPHZHjiHcGR1JXAD47RA+SBZ/0yI9yeJCpQSs4UFKwSCX48L8VXv9twWg==
+//     iEUDL/79PS1LRfgqYovPb5bJk76a7rFFcbrXuMKPohoS2Rky8ajigLYjITinJAP+Ne1aD9AlXeAb6ifuuPhIzA==
+//     AdCjNiHaoa/Suga+dkEFafrUGRQlosqhsCNY1+TRySCgeLA7McFSMDQ/oz8auB6VBZ0i8pZh/uUxmv+fumzIOw==
+//     Ly4YClA0kcxfGlDTBMqFWxQgaW/9qh0peV/eqOdiQbq3xG0pFM8ouG1PbrQlakB7SFpOLaw8rXXsMIDNq4bGmA==
+//     vUH/w8veqSwLz6V/ND4fAc7DOUqFhFwaxNJIuf0HYFDZ7rt4lqmraVzSGUP3hE/+0uEX4SRdByt33rnz/Akaeg==
+//     QP/16mclGrIF6wHY6aC3Aczo2lO4q6HCt2TXk36b8QPvYQTH3wr6eZOxrvK+i2W/xT0iNKwmCdQvf+CMXMOb1w==
+//     kgJH26HO81Whx88R8tuuoISkbNljhAMlsS+RjgSTUwxsWe2Y4S/MUkMfSBkvjhEEzKQ9fXXL1aHJV8pAL8w58w==
+//     60yyP00POYx+d8zCfsSMxNJwXwimRvWQZ4tKxChr1IKofa4F0WHNE7qBM1fLF4ZHlavevyI6I3LNyU7lDOY/ng==
+//     tmroZlGFmNp42vLQKE2b5CZ0RBoc9lP44hzqPNDP5GqXYx2Ti74ARHbvggfxayL+FFZR+s6y/VltyA926s8bgA==
+//     A0pteyI7SiDfFIdHrgFaxscYi7+KswFJguIE4TDo2D+l/SXyCJ3noVKyo8hsCIgIcg7AgHF34Cw1IjZKq0GtVA==
+//     S/ejSKQvDbBFXMFUZxcXWOB0g4gdVWtfjRqhltQhJyGJMl6yIhK6eJ8utsn0MbokafzN0X1nMDgUcZlrALf4MQ==
+//     xEYTDWYEkjdTxqcfA+XKF4AvPnBPTCekmi8LAweUy0QS7FUFQ7ulzgLByRuhVaRV26u4yZUKjAY2zHT7GbEWSA==
+//     ZcLPSI4WhgwxQufMjIaqgv5JnhQ38D2clKskgGjwtyN5sbWPW4OGlpYt0KaWXiUQ/DcGhrIHIRaDEEK5OgKJbw==
+//     bBR0bdi/x+jyEOq/WrhNah+K2wCoqcFQ17y6twTO65FsINg+68faqPz27rh8S6OwkQaBoKoTqZZR24/qMofWdg==
+//     pyhKI7QsDwx6meOf7QKXZYijnwkh2LznM6F7dkmqucRe2xpJwMIH9InbJzRzZA5+MoA0ZeNgkiLZDd+rYw4+IQ==
+//     w8fnt7cqNYbVWkrF47VGmDAkNZVFmm7LCN3k/yqQIbFPZwUt3KzQwNEU/lH7vVLV2+IzVhZAr/SF5V0RXUx6uA==
+//     sTfn98SyMF7A0BeDHX5U91d60XgXWTLtk9ofqqxYa83DA2uhiqBdGg73nKJLeAY2k7BnaS0UqlHaZCM61irMaA==
+//     BtrGFdoljQcDzXG1qyI7t+YPKU8qZdJH9TPZvofHjubEDC9mvMxljgE1EIbcpvjV2ZFXJizsgUEAf+7pQYa2PA==
+//     M4ch9HyN6Gf5Pa2WfICcY4cBJ2VVTEL8zoSWNfmdAroxu2pE9P42w1G3E5ZYf6H3D0SmLu05vNB3tBSk/vS1KA==
+//     xxcALu7b51kqaWgN/wH1AM+sNdT6LtpZ5/CxyVUi7EXVgM9n/Lhud4oruxNvV+g4cbn176MOdmTqIdHKiYgD1g==
+//     ZEJ0KdtJqANHu39QewDjsCmpiMWGPXgkUF07r4802xnX4JVkpb+tH4fVqMKr7xH43Hbu6s2scCKIHXIn/2Z6Sg==
+
 }  // namespace brave_ads::cbr::test
 
 #endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_CHALLENGE_BYPASS_RISTRETTO_TEST_CONSTANTS_H_
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc
index 8d8540b00926..64d372ab0a1b 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/credential_builder_unittest.cc
@@ -14,7 +14,7 @@
 
 namespace brave_ads {
 
-TEST(BraveAdsChallengeBypassRistrettoTest, BuildCredential) {
+TEST(BraveAdsCredentialBuilderTest, BuildCredential) {
   // Act
   const std::optional<base::Value::Dict> credential = cbr::MaybeBuildCredential(
       cbr::UnblindedToken(cbr::test::kUnblindedTokenBase64),
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.cc
index 9acfe61f52e1..eec11dae9a2f 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.cc
@@ -18,11 +18,11 @@ SignedToken GetInvalidSignedToken() {
   return SignedToken(kInvalidBase64);
 }
 
-std::vector<SignedToken> GetSignedTokens() {
+SignedTokenList GetSignedTokens() {
   return {GetSignedToken()};
 }
 
-std::vector<SignedToken> GetInvalidSignedTokens() {
+SignedTokenList GetInvalidSignedTokens() {
   return {GetInvalidSignedToken()};
 }
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.h
index 9674a89d8c91..6df469b8b163 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_test_util.h
@@ -6,21 +6,15 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNED_TOKEN_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNED_TOKEN_TEST_UTIL_H_
 
-#include <vector>
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h"
 
-namespace brave_ads::cbr {
-
-class SignedToken;
-
-namespace test {
+namespace brave_ads::cbr::test {
 
 SignedToken GetSignedToken();
 SignedToken GetInvalidSignedToken();
-std::vector<SignedToken> GetSignedTokens();
-std::vector<SignedToken> GetInvalidSignedTokens();
-
-}  // namespace test
+SignedTokenList GetSignedTokens();
+SignedTokenList GetInvalidSignedTokens();
 
-}  // namespace brave_ads::cbr
+}  // namespace brave_ads::cbr::test
 
 #endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_SIGNED_TOKEN_TEST_UTIL_H_
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.cc
index e0acc7e4b63c..6b9f389dee49 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.cc
@@ -10,7 +10,7 @@
 namespace brave_ads::cbr {
 
 std::vector<challenge_bypass_ristretto::SignedToken> ToRawSignedTokens(
-    const std::vector<SignedToken>& tokens) {
+    const SignedTokenList& tokens) {
   std::vector<challenge_bypass_ristretto::SignedToken> raw_tokens;
   raw_tokens.reserve(tokens.size());
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.h
index 16e6b899b3ff..33fd1a05ffe9 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token_util.h
@@ -8,14 +8,13 @@
 
 #include <vector>
 
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/signed_token.h"
 #include "brave/components/challenge_bypass_ristretto/signed_token.h"
 
 namespace brave_ads::cbr {
 
-class SignedToken;
-
 std::vector<challenge_bypass_ristretto::SignedToken> ToRawSignedTokens(
-    const std::vector<SignedToken>& signed_tokens);
+    const SignedTokenList& signed_tokens);
 
 }  // namespace brave_ads::cbr
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.cc
index d79efa8ee305..1f0ad3252ba6 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.cc
@@ -5,6 +5,7 @@
 
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.h"
 
+#include "base/no_destructor.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage.h"
 
@@ -18,4 +19,61 @@ TokenPreimage GetInvalidTokenPreimage() {
   return TokenPreimage(kInvalidBase64);
 }
 
+const std::vector<std::string>& GetTokenPreimages() {
+  static base::NoDestructor<std::vector<std::string>> token_preimages({
+      R"(/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JQ==)",
+      R"(8o+uKml91AthZzZgdH0iVGtZHfK2lAmPFdlhfF8rXnF67OtwnzHntFOimAmE73L7d9zh2sl0TJMv0mYwFf3zfg==)",
+      R"(4F+VBba3Wv9CZx5HF/R217w4M4B7v4xAWTpJZ3bCIog03tm1eHrsRgCn1XGFxrugV7U/C5+waLadwEk9vqB23w==)",
+      R"(Qu5OVNnHXfXB+aj6dJqV2B68pEfYwdevhMMBvlC/w4o81XE13y1b8dGYdDmN30ct4LacOJ8d/s8CVt2HZ9+P9g==)",
+      R"(bTChDKb8bO4406rN6Kazn8rMjaFE+8VHsGjhRJQOhhuiE7iPkD1x8Wh16Iw2KVgB3F/gzp48TSLloErwrpGeTw==)",
+      R"(VJpMA/p6XOysRoKyogmT3c8GzCmuOvPOfPFEQECU6RE4mmrG0iDSM7VbMYTJQNCUU2Gwh021TafmcS6SUO5lew==)",
+      R"(yxV23PfA329B7GwzAKDoooS8qBUby82ldcQibOd0xAwbcqpp2fURn9JaDApnyO6NT6eFMfXXzvghOJJAWBSTJQ==)",
+      R"(h8avY/txLkex4vX8cROpzCFqY2ehPZIw4avYWpkUUs6FuY/X3WNQBAv6k8BNYo2BMyw9WS75hO6NHd6ZHH/vCw==)",
+      R"(+NDdXqzN+fBKzZsahecJ8BjKygzxxVklMeqZaQTBDIL8ymSL92xC0ArV/l5cJstOam3v3lm9dxkKaS/kq2xtNA==)",
+      R"(iP/zkjmYnlxQQAPYshasqwM9aY6dcSnFWrgZ8PGwMv8cSoN0c1ZWBqB02iMKJ8tU9Z/cu4aOib6H+nCER/qCMA==)",
+      R"(QUWt9T/TFI9H+6f3IHyZE1MDqZVte4sP7Bm9RItz8EL4MLabEVOJPFwJ+MMMqXKa1yAbZLk7CAPALRTAoQWhtQ==)",
+      R"(IfiUpAFFGEogSCEJWn++VNMtE5D2FPAgUaZq7bT4zn+POnCHSTRTdCYfcAWT2O47bFXcW+hWRO26nqZG0nbGMw==)",
+      R"(8PvoTrzyIRxOQN3pF+i6pBUsICiafyrtFzK2y3NKwPpEfhwySbWi0OmI4/EfRjH/8B1pYhC2e5ocfXxMQJg/8w==)",
+      R"(B3ba4F/Z+7ear6hgVXbb+HqtY29zt9/08wqIiRAruCmz26JYrKK36FsHVoaWHVXbqE50kKa6EmBuwxk8K/p0DQ==)",
+      R"(iBYbz22bz4DkUYFPvjxV/qQVvpwyBSgSo+28e1Fat0CqFBHzFtzvQqg/U2YBbuGoBG28pkyPOd90jyu6X/gDvg==)",
+      R"(RddwoyJZ+MNSrSAbRMd6pdRWZCZiwtTecfBT6CwEAsrPPckdHnEohw52y8Zfd8E3CJL6PglGe45rStDxuIGGTQ==)",
+      R"(nKwtChzFdVT/u9NwjsnWJ6S5wsd2zHUBumOQgjKNqAMhdKU3XhhEbOq+8PuNEPTD59IgPjsli7/jTghoNkE/zA==)",
+      R"(tOyts/yWbWoIZ80CALNDz5iYbuyZ0kmtFG3maOIdK/MiTY7j2kEdaQa7zA/TGw/0nq+mOb26o39j6CVoQCKf3w==)",
+      R"(AX0TXD4Qp8J+dORSHwvBU6Ns0AxeaNwZHxkurlIsrR7L5Pzuci2kvSDi9qomjUsA7byhWtIcOwPTL7NUPzaTLA==)",
+      R"(fM+qLel3ljJMgZ3CBcDoo2KjZC/nMbnQReo7f1uNfnoQkW+5nHYMm7b4IheJ9llg1vU8I8pOllcXZTWlI7dw9A==)",
+      R"(vh3GD+slh2KDvKG0RWQG9BmXwvUX7ZVrpHPXTPLGqhooc+3/Dfh0BnHVEA1aOt0H+jqfpK+gzeJwZPB+uE6h4A==)",
+      R"(MLoNQTqT5VnEp0f30JB5014MguJ0nxq+r9p3KGJL+/ATOEwdMQh2Hwah+3nfmTdmS2nBxA0msxFn9hRZ6tAZUw==)",
+      R"(k5ruhL1W9dtuUdnnNj/FDE0cHeLUR0+KLMWoNQ5kTbSjJkt7cw1hcEkkLVb+v9k8+dGugEktHiodhGOOngbdMw==)",
+      R"(17i178+xnyy1hgK8Noy24I+YFtqg+VgDbN4KFyPYJiNXkI7pyA05+PGewcFByz+OJM9NjQK0D24hJVm8lg6kLw==)",
+      R"(gIy44kVuFM7OIdd1iOXhez/wfIwZtF+M7Hmx38CQdivUT6545tIk5Il14czyXk/yXy/Parn0Sn+SD8Oc/ZltTQ==)",
+      R"(vST4PalUIaZRZJWFyq6oecP3EG6Q7LgMVYejXHb/QfGARMuB3+qiRNPDq5eX8A6CzzWQkgi5xKmPlnjOQiKYWw==)",
+      R"(MP6Z2d0QR4hQRWnVm0gRKvhmi8N8C3wT5iOHPDjTeDlrtt4+Cl1cBROumF2cU7fAFhW45UAm3ndtnBR6xq3R/A==)",
+      R"(CJ/SVmXrTXYhwm8CS0ri6v5kUmuwufrm2zxUaImLfdL2iBbNui4gWg4Sot+QQWlLz8aeOrwwBsSO9JKkyn1xuA==)",
+      R"(FklHuKltxiuFQbcn+9EbQ2VfJ5Qbtp6cyYp3abgtfmwuU0tHfBlqfNTUWfa8Ui9NVWjXi4lsNv7zxYL7K8DljA==)",
+      R"(Au7mGjI/gSRwRXW/+hNqsCAXAzPgRMo98jqXdVK1vY6e6A4ycASI8n370p7f39a01pMrKnb6VRRJJGvTvf/P8Q==)",
+      R"(RKKb+uW+hF36ukHPSwLjh8fLQYGJqHzX1mrCQCjs5iMNheGZRlF6mP4c1EZql8p+aFaZ36jg1xOXtOyEF088gQ==)",
+      R"(15ztbRNtz3pU9rttKjOeBtSKrK4a4t1hGPkef/wni1B92ZG4KC31LbQBBSUKzljoacHCY7OyhgPuvjWNqpE/jQ==)",
+      R"(OiXsHDy5c6n0Jdncui30fQaga+HdIRIVV31C+/gD5TxaoicZfH70gPXuqv6+NAGisXNPnRGupFA+Q68mgvw/Iw==)",
+      R"(V8ePIKOqd2yvJh+WaZVG7P43gMmYI4gIBkdXo57ma8wEL57N+k4T2RKknrVdgQeilBkzzIb5KIun3tDu9AuEDg==)",
+      R"(/ZfbQX5o7QbMmqaqm3jzuVcHjYowLDlV1zLhex0RBjOobDwndhNyZeRhoOqUQFrgS5tHFn9SRF0AlSFwd2JH9A==)",
+      R"(iQkT7Z4mhNylLFZ7WLOdYcM2x60f0hOublqBGIYFjUYxk5zdynNJtId1HlyQ9SSTRku4e6/txOIciYEDUj/gRg==)",
+      R"(AhgyLs+sKpxwWilA4vusIXV0KmgC2gC4EDXYQtUKCn/PCt8vKbQmUnG2eg3IOTLVaq0/O7l6NkfdUUBIMtgFcw==)",
+      R"(F5ZCIStqAXxAWoGtZQcvo2IjvTHdWybN3pP7OkcxG7e44IhicC2ETToqJUvWpD+1h7EKlm4SvxqKSiXyDKOedA==)",
+      R"(pk1dShFTH61C9vrANLoWNry7zb0HWTYH5IX7G2/uVaGjFUXWgrJOzRDTet938/v7jcqVqhfRFrXrQ/tGvVEMJA==)",
+      R"(BPXrBvOkr2L6elCaY86fRWIQOwa0IP2bx0DN1hNcotuD1mZgECAYnVH+J1rHwqQtTDztea3UTuR8+N+bgHybyA==)",
+      R"(x0ZQkkeA7pLD1fDLOBS59yUjhWmo2BkeeZIInXfg/g/nQEm2UGUuAlzrHda+XLazHnoZREaLP1yAzzEiOjFZtw==)",
+      R"(usir+ZMjKzZFBSHaBtLDzoLpQut7FzpnCF06i4CWZ17VH5IL9qBmV0WkBgMyfvthtjP4tcRoYB+q2PC4bfnB1w==)",
+      R"(H6Xnh1CxmhILBxminu2dHpJyor/vis8LEWRnsHzaUDb9H1ffJl2AjEHA7z2gNWf6XS35bdTKL2bSFNAz9tiu1A==)",
+      R"(VV6ZzHhu3UQI/vQoXoZbsB6XPLMnGwtXACQDofKxvexJ1kd69RVX9sUSQ8l6f1r2fkQrY/wjYtRd94QDrtpLkg==)",
+      R"(VVBri+U/df3inE+9b83RrUDaQqpoaQWDrtV9NKUbMXpAGypbLBik+6wayFS1TGOYy/YTO024AGoWH3VXNapjTg==)",
+      R"(2Qc5OErDr7bSh8rPjmW/bTcmf7IjLjjSdrxCu3cstAaYz9azD/kE8S6H0b2I3YrRKmehmHznUVfFV+mrjGwsvQ==)",
+      R"(VP6wYjOCCI0AEXfYcyTFc7ufz4i28lo8RTmIVzZl9TsF2wvvsWqwB8Yvd3iuc8yqHf6sTKdjIxarIHx1aNJ0fA==)",
+      R"(5ePNEDI1lWVhJcd2TyFCE1FLJwhzQUIES/w0YCy0C9+1dwT8KPjnUoWsRc3ey9toeZ6KcX2+wAiTFDtbjNeWiQ==)",
+      R"(uXo5mB3gx2jlwRobaY/xavCyfSHHfwe8PRAai1jgCYRyrtHtCCtFTFF0k88YWOO22LHHUeRy9W+znC3mwu1kng==)",
+      R"(Cr+85HfJLSseyS1Ah3lxkbBE2XqBGfir3vJ78sxzhTUFM9emwdNzqT6wqc0tXk2SbY3C2WXGUKCPYwDEZN5FTw==)",
+  });
+
+  return *token_preimages;
+}
+
 }  // namespace brave_ads::cbr::test
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.h
index 84d4426e9530..7190b5899eb9 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_preimage_test_util.h
@@ -6,6 +6,9 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_PREIMAGE_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_PREIMAGE_TEST_UTIL_H_
 
+#include <string>
+#include <vector>
+
 namespace brave_ads::cbr {
 
 class TokenPreimage;
@@ -15,6 +18,8 @@ namespace test {
 TokenPreimage GetTokenPreimage();
 TokenPreimage GetInvalidTokenPreimage();
 
+const std::vector<std::string>& GetTokenPreimages();
+
 }  // namespace test
 
 }  // namespace brave_ads::cbr
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.cc
index c0567dc4a31c..30903839d636 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.cc
@@ -5,6 +5,7 @@
 
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.h"
 
+#include "base/no_destructor.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h"
 
@@ -18,12 +19,121 @@ Token GetInvalidToken() {
   return Token(kInvalidBase64);
 }
 
-std::vector<Token> GetTokens() {
+TokenList GetTokens() {
   return {GetToken()};
 }
 
-std::vector<Token> GetInvalidTokens() {
+TokenList GetInvalidTokens() {
   return {GetInvalidToken()};
 }
 
+const TokenList& Tokens() {
+  static base::
+      NoDestructor<TokenList>
+          tokens(
+              {
+                  Token(
+                      R"(/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JVkVTu9dLQdR595gZf/D4PvSuhgk5RcoBm3fSFGI4JQF)"),
+                  Token(
+                      R"(8o+uKml91AthZzZgdH0iVGtZHfK2lAmPFdlhfF8rXnF67OtwnzHntFOimAmE73L7d9zh2sl0TJMv0mYwFf3zfsLUKsTlhuI71SwQsb/wOPYS/FIy5ldvxgam7dZCehcE)"),
+                  Token(
+                      R"(4F+VBba3Wv9CZx5HF/R217w4M4B7v4xAWTpJZ3bCIog03tm1eHrsRgCn1XGFxrugV7U/C5+waLadwEk9vqB233U3gps93CiySTbmDngv8xPYE1kqLz7IzjpWn2MuVvMD)"),
+                  Token(
+                      R"(Qu5OVNnHXfXB+aj6dJqV2B68pEfYwdevhMMBvlC/w4o81XE13y1b8dGYdDmN30ct4LacOJ8d/s8CVt2HZ9+P9sFCRuTv7PS5o9LgescSqgzF7q5G6vlN4vjDIvrKtFMH)"),
+                  Token(
+                      R"(bTChDKb8bO4406rN6Kazn8rMjaFE+8VHsGjhRJQOhhuiE7iPkD1x8Wh16Iw2KVgB3F/gzp48TSLloErwrpGeT3nSw/uK3i2WGX88Taw5akjU1rGlBSfi8HjopMwgMywG)"),
+                  Token(
+                      R"(VJpMA/p6XOysRoKyogmT3c8GzCmuOvPOfPFEQECU6RE4mmrG0iDSM7VbMYTJQNCUU2Gwh021TafmcS6SUO5le68yBUTqiUAMheF9utim3NNbSpRkXJtQBBZwgND0rukO)"),
+                  Token(
+                      R"(yxV23PfA329B7GwzAKDoooS8qBUby82ldcQibOd0xAwbcqpp2fURn9JaDApnyO6NT6eFMfXXzvghOJJAWBSTJbQQRAnWgVW02QqZYfjnhuykhcem2g8/XwpErup+SjcL)"),
+                  Token(
+                      R"(h8avY/txLkex4vX8cROpzCFqY2ehPZIw4avYWpkUUs6FuY/X3WNQBAv6k8BNYo2BMyw9WS75hO6NHd6ZHH/vC5lfWV3IQLMvw3gOOV8rslDAS7zEcQO0393z9MD0ahEA)"),
+                  Token(
+                      R"(+NDdXqzN+fBKzZsahecJ8BjKygzxxVklMeqZaQTBDIL8ymSL92xC0ArV/l5cJstOam3v3lm9dxkKaS/kq2xtNLZSyVwwPbt6Lk0Jwy71hLalKRp2bjyLSu2NILiezYIK)"),
+                  Token(
+                      R"(iP/zkjmYnlxQQAPYshasqwM9aY6dcSnFWrgZ8PGwMv8cSoN0c1ZWBqB02iMKJ8tU9Z/cu4aOib6H+nCER/qCMPSTIc8VL7LLZYcCviIkFo8qEQNPTLKzUj89M5vmTYQM)"),
+                  Token(
+                      R"(QUWt9T/TFI9H+6f3IHyZE1MDqZVte4sP7Bm9RItz8EL4MLabEVOJPFwJ+MMMqXKa1yAbZLk7CAPALRTAoQWhtf1gqyS1iZJ9AKxzfoCWCpIOQjpcvNJDd4BtZgIsASEK)"),
+                  Token(
+                      R"(IfiUpAFFGEogSCEJWn++VNMtE5D2FPAgUaZq7bT4zn+POnCHSTRTdCYfcAWT2O47bFXcW+hWRO26nqZG0nbGMyqVfL86jZRflcXaoLcQ/hyFr8O/1SFcrwa6xCd9p6cL)"),
+                  Token(
+                      R"(8PvoTrzyIRxOQN3pF+i6pBUsICiafyrtFzK2y3NKwPpEfhwySbWi0OmI4/EfRjH/8B1pYhC2e5ocfXxMQJg/80WqrCUcyzI+peYC834YIVPE+Q8BA9JkUBpQdwj3sf0B)"),
+                  Token(
+                      R"(B3ba4F/Z+7ear6hgVXbb+HqtY29zt9/08wqIiRAruCmz26JYrKK36FsHVoaWHVXbqE50kKa6EmBuwxk8K/p0DbVeJG4WhqniIUoJsqWkJyxmJ7dPzlAHggwL4y+buEkP)"),
+                  Token(
+                      R"(iBYbz22bz4DkUYFPvjxV/qQVvpwyBSgSo+28e1Fat0CqFBHzFtzvQqg/U2YBbuGoBG28pkyPOd90jyu6X/gDvjIKHXViDxE12QUV/dJXeAuUyirpGHuqIAyM+3orzTgP)"),
+                  Token(
+                      R"(RddwoyJZ+MNSrSAbRMd6pdRWZCZiwtTecfBT6CwEAsrPPckdHnEohw52y8Zfd8E3CJL6PglGe45rStDxuIGGTX3uZPztMDymld7DOCFYdviDoi6lqdk139Dln+OYiTIA)"),
+                  Token(
+                      R"(nKwtChzFdVT/u9NwjsnWJ6S5wsd2zHUBumOQgjKNqAMhdKU3XhhEbOq+8PuNEPTD59IgPjsli7/jTghoNkE/zFzRF+D4fcVp+/ibr/Y/2Ds7GChOwNgHrG6wLiXX1IgG)"),
+                  Token(
+                      R"(tOyts/yWbWoIZ80CALNDz5iYbuyZ0kmtFG3maOIdK/MiTY7j2kEdaQa7zA/TGw/0nq+mOb26o39j6CVoQCKf3+N39pMPE/YwUWtrgn+YZY1O/9atBc3nL12L8X3Och0A)"),
+                  Token(
+                      R"(AX0TXD4Qp8J+dORSHwvBU6Ns0AxeaNwZHxkurlIsrR7L5Pzuci2kvSDi9qomjUsA7byhWtIcOwPTL7NUPzaTLFX0o+AT18gS2EaGBGWhgknDqvp9rMcV5S1/8tc+pyEO)"),
+                  Token(
+                      R"(fM+qLel3ljJMgZ3CBcDoo2KjZC/nMbnQReo7f1uNfnoQkW+5nHYMm7b4IheJ9llg1vU8I8pOllcXZTWlI7dw9JCJS2QX30flwR0cRWJ7IbHa1LjLcamPOXblqiw2zcMB)"),
+                  Token(
+                      R"(vh3GD+slh2KDvKG0RWQG9BmXwvUX7ZVrpHPXTPLGqhooc+3/Dfh0BnHVEA1aOt0H+jqfpK+gzeJwZPB+uE6h4LPvVCiunLRsFgziXXw/XMk1qAk4oEoSJpslr7ff8AEA)"),
+                  Token(
+                      R"(MLoNQTqT5VnEp0f30JB5014MguJ0nxq+r9p3KGJL+/ATOEwdMQh2Hwah+3nfmTdmS2nBxA0msxFn9hRZ6tAZUy/Q5WGyMFOBcZXabeO0f9LVD96xk3S6BMOg+DPgnHoM)"),
+                  Token(
+                      R"(k5ruhL1W9dtuUdnnNj/FDE0cHeLUR0+KLMWoNQ5kTbSjJkt7cw1hcEkkLVb+v9k8+dGugEktHiodhGOOngbdM4w9E86rnThbirq+SndrVEaeytPNfbHzfO0fyT0PqZAI)"),
+                  Token(
+                      R"(17i178+xnyy1hgK8Noy24I+YFtqg+VgDbN4KFyPYJiNXkI7pyA05+PGewcFByz+OJM9NjQK0D24hJVm8lg6kLyNFENW6Ztetv+EVdQ7xeM3H2tIsf4XJD5NyDwTNEpYM)"),
+                  Token(
+                      R"(gIy44kVuFM7OIdd1iOXhez/wfIwZtF+M7Hmx38CQdivUT6545tIk5Il14czyXk/yXy/Parn0Sn+SD8Oc/ZltTYwZlUtuNiVHqWVZ2gWxymU7MXhl7I+JUScVgw/S9NMO)"),
+                  Token(
+                      R"(vST4PalUIaZRZJWFyq6oecP3EG6Q7LgMVYejXHb/QfGARMuB3+qiRNPDq5eX8A6CzzWQkgi5xKmPlnjOQiKYW2NokBrV9cjUOcQwhQAPN/b207+0v2h7d04DcM8VUqoD)"),
+                  Token(
+                      R"(MP6Z2d0QR4hQRWnVm0gRKvhmi8N8C3wT5iOHPDjTeDlrtt4+Cl1cBROumF2cU7fAFhW45UAm3ndtnBR6xq3R/KKvwW7I3iZBYHYsTxPgOGXVpt9jfRz0G+pC9UlRMm4I)"),
+                  Token(
+                      R"(CJ/SVmXrTXYhwm8CS0ri6v5kUmuwufrm2zxUaImLfdL2iBbNui4gWg4Sot+QQWlLz8aeOrwwBsSO9JKkyn1xuCtzcNf0aQfnFvrxJO+xLWvsE5CFCQXBKDRIwBbkzHcD)"),
+                  Token(
+                      R"(FklHuKltxiuFQbcn+9EbQ2VfJ5Qbtp6cyYp3abgtfmwuU0tHfBlqfNTUWfa8Ui9NVWjXi4lsNv7zxYL7K8DljCAKdyBm7dCPkcEa9VzGoE+FVr70+A5g5+RpLAjbTgsC)"),
+                  Token(
+                      R"(Au7mGjI/gSRwRXW/+hNqsCAXAzPgRMo98jqXdVK1vY6e6A4ycASI8n370p7f39a01pMrKnb6VRRJJGvTvf/P8S/yoq5Vid9BPcgWKhh5HD3oqaUg+BJhIE7QCTFpFbcL)"),
+                  Token(
+                      R"(RKKb+uW+hF36ukHPSwLjh8fLQYGJqHzX1mrCQCjs5iMNheGZRlF6mP4c1EZql8p+aFaZ36jg1xOXtOyEF088gXbls/gdxOPRmmnrARQc4khLuwuwjE0GVtEuxl7Q7aYF)"),
+                  Token(
+                      R"(15ztbRNtz3pU9rttKjOeBtSKrK4a4t1hGPkef/wni1B92ZG4KC31LbQBBSUKzljoacHCY7OyhgPuvjWNqpE/jXNSbnyBwAylpciaZRqLyfoyT693OUIegpD+pJR1BfUH)"),
+                  Token(
+                      R"(OiXsHDy5c6n0Jdncui30fQaga+HdIRIVV31C+/gD5TxaoicZfH70gPXuqv6+NAGisXNPnRGupFA+Q68mgvw/I5dgdwIfxiJwwff3u9zvk0rZokzi+zidCzbgLvKWKRwO)"),
+                  Token(
+                      R"(V8ePIKOqd2yvJh+WaZVG7P43gMmYI4gIBkdXo57ma8wEL57N+k4T2RKknrVdgQeilBkzzIb5KIun3tDu9AuEDnYYkwVSFD3jcd71zjw+5CxPDiyGlbyLJoUhOgu0JU0A)"),
+                  Token(
+                      R"(/ZfbQX5o7QbMmqaqm3jzuVcHjYowLDlV1zLhex0RBjOobDwndhNyZeRhoOqUQFrgS5tHFn9SRF0AlSFwd2JH9E7Hr57TZ8geEo7uoQiK8gAJYoRWXfOMINLB9b8/rS8H)"),
+                  Token(
+                      R"(iQkT7Z4mhNylLFZ7WLOdYcM2x60f0hOublqBGIYFjUYxk5zdynNJtId1HlyQ9SSTRku4e6/txOIciYEDUj/gRgXofFO1/88lrekyjtCayUpsR6Q6ObsNRytkhr5yAAkO)"),
+                  Token(
+                      R"(AhgyLs+sKpxwWilA4vusIXV0KmgC2gC4EDXYQtUKCn/PCt8vKbQmUnG2eg3IOTLVaq0/O7l6NkfdUUBIMtgFc2J25e9RVqGj89mUHt86TE9yIR1jA1yH0ntNKpsjjnoA)"),
+                  Token(R"(F5ZCIStqAXxAWoGtZQcvo2IjvTHdWybN3pP7OkcxG7e44IhicC2ETToqJUvWpD+1h7EKlm4SvxqKSiXyDKOedBkQQWW+Jpr244B7MKATw+XNIB31SaHKiJhIVBAe6TkP)"),
+                  Token(
+                      R"(pk1dShFTH61C9vrANLoWNry7zb0HWTYH5IX7G2/uVaGjFUXWgrJOzRDTet938/v7jcqVqhfRFrXrQ/tGvVEMJHzVf/Z5oM+btr1YQwN3YCfevmktYX6G8jmQZqXZ0rIM)"),
+                  Token(
+                      R"(BPXrBvOkr2L6elCaY86fRWIQOwa0IP2bx0DN1hNcotuD1mZgECAYnVH+J1rHwqQtTDztea3UTuR8+N+bgHybyGTmNej6sXRaw6Nf2t8IVTO09MPlfFICPkgO2jCn2SsK)"),
+                  Token(
+                      R"(x0ZQkkeA7pLD1fDLOBS59yUjhWmo2BkeeZIInXfg/g/nQEm2UGUuAlzrHda+XLazHnoZREaLP1yAzzEiOjFZt+uInayChjCygETw86y7a3Nj1Yia8SwWmvAvSXTCSXIK)"),
+                  Token(
+                      R"(usir+ZMjKzZFBSHaBtLDzoLpQut7FzpnCF06i4CWZ17VH5IL9qBmV0WkBgMyfvthtjP4tcRoYB+q2PC4bfnB1/d1TsjZneMzZnK/ClfCGGn22k+sEIbhytZDaVmlBqUI)"),
+                  Token(
+                      R"(H6Xnh1CxmhILBxminu2dHpJyor/vis8LEWRnsHzaUDb9H1ffJl2AjEHA7z2gNWf6XS35bdTKL2bSFNAz9tiu1DA2yBF0VUkb0rOLVvzk/b+bC6XaC5Wfr9lIXQTBciwP)"),
+                  Token(
+                      R"(VV6ZzHhu3UQI/vQoXoZbsB6XPLMnGwtXACQDofKxvexJ1kd69RVX9sUSQ8l6f1r2fkQrY/wjYtRd94QDrtpLkkotRlz9EiWg9w9XsLMVLn8nwrnl334xA3NUyPHbRm0O)"),
+                  Token(
+                      R"(VVBri+U/df3inE+9b83RrUDaQqpoaQWDrtV9NKUbMXpAGypbLBik+6wayFS1TGOYy/YTO024AGoWH3VXNapjTpCGBN+0T02D6nJ6hR3maMXryhNNA5Zo7RkSg9ZkvPAB)"),
+                  Token(
+                      R"(2Qc5OErDr7bSh8rPjmW/bTcmf7IjLjjSdrxCu3cstAaYz9azD/kE8S6H0b2I3YrRKmehmHznUVfFV+mrjGwsvfBD6pPXY1VehVjjvjK9j/7JBNc87jWaGuYgHxbSoe8G)"),
+                  Token(
+                      R"(VP6wYjOCCI0AEXfYcyTFc7ufz4i28lo8RTmIVzZl9TsF2wvvsWqwB8Yvd3iuc8yqHf6sTKdjIxarIHx1aNJ0fOg8Mz4mI8j0RgXoIysJu+5m27aDnFwwO6ekhNgyPSUI)"),
+                  Token(
+                      R"(5ePNEDI1lWVhJcd2TyFCE1FLJwhzQUIES/w0YCy0C9+1dwT8KPjnUoWsRc3ey9toeZ6KcX2+wAiTFDtbjNeWiTQTzfBQjbBNPFwGQSqtzJ4lf+zzLqSr3U0vbI8iPFsM)"),
+                  Token(
+                      R"(uXo5mB3gx2jlwRobaY/xavCyfSHHfwe8PRAai1jgCYRyrtHtCCtFTFF0k88YWOO22LHHUeRy9W+znC3mwu1knqrzAd2P82OEYGTAaHdVwydSsEKUCG92P4KQSlv+RhEL)"),
+                  Token(
+                      R"(Cr+85HfJLSseyS1Ah3lxkbBE2XqBGfir3vJ78sxzhTUFM9emwdNzqT6wqc0tXk2SbY3C2WXGUKCPYwDEZN5FT64SXZFySDJVBiAcptoYQVqzCDCwixQTlhYtm2OKWDYA)"),
+              });
+
+  return *tokens;
+}
+
 }  // namespace brave_ads::cbr::test
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.h
index f56023ed071e..0908a3778f57 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_test_util.h
@@ -6,21 +6,17 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_TEST_UTIL_H_
 
-#include <vector>
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h"
 
-namespace brave_ads::cbr {
-
-class Token;
-
-namespace test {
+namespace brave_ads::cbr::test {
 
 Token GetToken();
 Token GetInvalidToken();
-std::vector<Token> GetTokens();
-std::vector<Token> GetInvalidTokens();
+TokenList GetTokens();
+TokenList GetInvalidTokens();
 
-}  // namespace test
+const TokenList& Tokens();
 
-}  // namespace brave_ads::cbr
+}  // namespace brave_ads::cbr::test
 
 #endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_TOKEN_TEST_UTIL_H_
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.cc
index 2617a33f8479..4a0176ebc4b3 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.cc
@@ -10,7 +10,7 @@
 namespace brave_ads::cbr {
 
 std::vector<challenge_bypass_ristretto::Token> ToRawTokens(
-    const std::vector<Token>& tokens) {
+    const TokenList& tokens) {
   std::vector<challenge_bypass_ristretto::Token> raw_tokens;
   raw_tokens.reserve(tokens.size());
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.h
index 20059dbde64c..2efc6e5f210e 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token_util.h
@@ -8,14 +8,13 @@
 
 #include <vector>
 
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/token.h"
 #include "brave/components/challenge_bypass_ristretto/token.h"
 
 namespace brave_ads::cbr {
 
-class Token;
-
 std::vector<challenge_bypass_ristretto::Token> ToRawTokens(
-    const std::vector<Token>& tokens);
+    const TokenList& tokens);
 
 }  // namespace brave_ads::cbr
 
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.cc b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.cc
index bbc7e8779e7e..f110880cb911 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.cc
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.cc
@@ -5,6 +5,7 @@
 
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.h"
 
+#include "base/no_destructor.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/challenge_bypass_ristretto_test_constants.h"
 #include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h"
 
@@ -14,11 +15,118 @@ UnblindedToken GetUnblindedToken() {
   return UnblindedToken(kUnblindedTokenBase64);
 }
 
-std::vector<UnblindedToken> GetUnblindedTokens() {
-  std::vector<UnblindedToken> unblinded_tokens;
+UnblindedTokenList GetUnblindedTokens() {
+  UnblindedTokenList unblinded_tokens;
   const UnblindedToken unblinded_token = GetUnblindedToken();
   unblinded_tokens.push_back(unblinded_token);
   return unblinded_tokens;
 }
 
+const UnblindedTokenList& UnblindedTokens() {
+  static base::NoDestructor<UnblindedTokenList> unblinded_tokens(
+      {
+          UnblindedToken(
+              R"(/mfTAAjHrWmAlLiEktbqNS/dxoMVdnz1esoVplQUs7yG/apAq2K6OeST6lBTKFJmOq7rV8QbY/DF2HFRMcz/JTrpqSWv/sNVO/Pi8nHDyl3CET+S2CKkMmYlXW3DgqxW)"),
+          UnblindedToken(
+              R"(8o+uKml91AthZzZgdH0iVGtZHfK2lAmPFdlhfF8rXnF67OtwnzHntFOimAmE73L7d9zh2sl0TJMv0mYwFf3zfsLb7m0IE1e3UqGPVaKP3B+rLmCjbSau+mfzjqQ8OQMS)"),
+          UnblindedToken(
+              R"(4F+VBba3Wv9CZx5HF/R217w4M4B7v4xAWTpJZ3bCIog03tm1eHrsRgCn1XGFxrugV7U/C5+waLadwEk9vqB239LqecZUunqkY+vJ9bxNkWPUglLQ1FqY7mQ+WpEGmowV)"),
+          UnblindedToken(
+              R"(Qu5OVNnHXfXB+aj6dJqV2B68pEfYwdevhMMBvlC/w4o81XE13y1b8dGYdDmN30ct4LacOJ8d/s8CVt2HZ9+P9jRNMjwzSLhfVBDLcQ1TdaLT6Ab7XG1Z4DrYGxKnsplZ)"),
+          UnblindedToken(
+              R"(bTChDKb8bO4406rN6Kazn8rMjaFE+8VHsGjhRJQOhhuiE7iPkD1x8Wh16Iw2KVgB3F/gzp48TSLloErwrpGeT8SjqyV1C0+5iF46YGxZIYzIeN5vU3grxB4Z3/K2ToZE)"),
+          UnblindedToken(
+              R"(VJpMA/p6XOysRoKyogmT3c8GzCmuOvPOfPFEQECU6RE4mmrG0iDSM7VbMYTJQNCUU2Gwh021TafmcS6SUO5le3yFAskSYZ9BGLJpEmL1Sz/yxeAqKDAcaKXJr97K8NgI)"),
+          UnblindedToken(
+              R"(yxV23PfA329B7GwzAKDoooS8qBUby82ldcQibOd0xAwbcqpp2fURn9JaDApnyO6NT6eFMfXXzvghOJJAWBSTJVSqWe9ScXyOZg0ufl1BRAkmqpvfDWqIlB22YgNRYGpv)"),
+          UnblindedToken(
+              R"(h8avY/txLkex4vX8cROpzCFqY2ehPZIw4avYWpkUUs6FuY/X3WNQBAv6k8BNYo2BMyw9WS75hO6NHd6ZHH/vC/YwRA9eThulT5IL+P17VDSHET4kSX2kuVljF/cG1P8l)"),
+          UnblindedToken(
+              R"(+NDdXqzN+fBKzZsahecJ8BjKygzxxVklMeqZaQTBDIL8ymSL92xC0ArV/l5cJstOam3v3lm9dxkKaS/kq2xtNH7fqvaa2nNX3fo6KLA7opxbfS9owGNn6kFPeeurJmwd)"),
+          UnblindedToken(
+              R"(iP/zkjmYnlxQQAPYshasqwM9aY6dcSnFWrgZ8PGwMv8cSoN0c1ZWBqB02iMKJ8tU9Z/cu4aOib6H+nCER/qCMPoFPZgKPQiQNDDAwW8ZQSmQsv3jaVJMpv7RC2u7BgQ3)"),
+          UnblindedToken(
+              R"(QUWt9T/TFI9H+6f3IHyZE1MDqZVte4sP7Bm9RItz8EL4MLabEVOJPFwJ+MMMqXKa1yAbZLk7CAPALRTAoQWhtVawO/11QqrYPJoj0TaU24cd4At3UFZ5KvVUBpvxfZ1W)"),
+          UnblindedToken(
+              R"(IfiUpAFFGEogSCEJWn++VNMtE5D2FPAgUaZq7bT4zn+POnCHSTRTdCYfcAWT2O47bFXcW+hWRO26nqZG0nbGM8pFbbMoqjujbQ+6fMGtny4FKptrWR2kTZpuHp4Ak1Uf)"),
+          UnblindedToken(
+              R"(8PvoTrzyIRxOQN3pF+i6pBUsICiafyrtFzK2y3NKwPpEfhwySbWi0OmI4/EfRjH/8B1pYhC2e5ocfXxMQJg/87LrBn1LdamYzB/AiFwvHydlZAMf6gIl4H7yPgvJwuBB)"),
+          UnblindedToken(
+              R"(B3ba4F/Z+7ear6hgVXbb+HqtY29zt9/08wqIiRAruCmz26JYrKK36FsHVoaWHVXbqE50kKa6EmBuwxk8K/p0DZrTIhdthOSpwJ0U7oMjUM00A/ObfbJSBk4dIxnd11sW)"),
+          UnblindedToken(
+              R"(iBYbz22bz4DkUYFPvjxV/qQVvpwyBSgSo+28e1Fat0CqFBHzFtzvQqg/U2YBbuGoBG28pkyPOd90jyu6X/gDvjDh1/73iZoNpuTlufKelnJqsHl4W8FI6wNYxUA2sisz)"),
+          UnblindedToken(
+              R"(RddwoyJZ+MNSrSAbRMd6pdRWZCZiwtTecfBT6CwEAsrPPckdHnEohw52y8Zfd8E3CJL6PglGe45rStDxuIGGTVAZZmLXBcQ+ahfFsrdTr+MTJhGD+EGVKvDsXjvHhndg)"),
+          UnblindedToken(
+              R"(nKwtChzFdVT/u9NwjsnWJ6S5wsd2zHUBumOQgjKNqAMhdKU3XhhEbOq+8PuNEPTD59IgPjsli7/jTghoNkE/zLxUYIyzipZzlGqWsW9LP+akGLhMmHKj1IKdJE3GDmlA)"),
+          UnblindedToken(
+              R"(tOyts/yWbWoIZ80CALNDz5iYbuyZ0kmtFG3maOIdK/MiTY7j2kEdaQa7zA/TGw/0nq+mOb26o39j6CVoQCKf34wco6DYgv4qnRwtw+drj0TNAMch2N66ahg8ZVHh7LJN)"),
+          UnblindedToken(
+              R"(AX0TXD4Qp8J+dORSHwvBU6Ns0AxeaNwZHxkurlIsrR7L5Pzuci2kvSDi9qomjUsA7byhWtIcOwPTL7NUPzaTLPhgxaD6QZCdug8FMQC4ZsS+FXuzq3yONEW7Yuu1/b0J)"),
+          UnblindedToken(
+              R"(fM+qLel3ljJMgZ3CBcDoo2KjZC/nMbnQReo7f1uNfnoQkW+5nHYMm7b4IheJ9llg1vU8I8pOllcXZTWlI7dw9LK0AWVOA33a24Djiz5qlYXVtBhgy3gsBi4vub5qf4ts)"),
+          UnblindedToken(R"(vh3GD+slh2KDvKG0RWQG9BmXwvUX7ZVrpHPXTPLGqhooc+3/Dfh0BnHVEA1aOt0H+jqfpK+gzeJwZPB+uE6h4OB+sxkg7TsgBmIuIE8njCCxV2b7L0Aj2WPmV+hLWaU6)"),
+          UnblindedToken(
+              R"(MLoNQTqT5VnEp0f30JB5014MguJ0nxq+r9p3KGJL+/ATOEwdMQh2Hwah+3nfmTdmS2nBxA0msxFn9hRZ6tAZU7KiJle1Oi2qJop6MO9ceD5F+pzzyxO96Wigr1ezPHEJ)"),
+          UnblindedToken(
+              R"(k5ruhL1W9dtuUdnnNj/FDE0cHeLUR0+KLMWoNQ5kTbSjJkt7cw1hcEkkLVb+v9k8+dGugEktHiodhGOOngbdM8S1TM1uIOGA61IhwSk9VxFaE7AiDX/AmGfg341zjoZU)"),
+          UnblindedToken(
+              R"(17i178+xnyy1hgK8Noy24I+YFtqg+VgDbN4KFyPYJiNXkI7pyA05+PGewcFByz+OJM9NjQK0D24hJVm8lg6kL8BNvK+9OGiIKwfujojLfJuZYE5PcEP3ri+x8NGVa/No)"),
+          UnblindedToken(
+              R"(gIy44kVuFM7OIdd1iOXhez/wfIwZtF+M7Hmx38CQdivUT6545tIk5Il14czyXk/yXy/Parn0Sn+SD8Oc/ZltTRjohh9TBupuoPkZHUm1trdOckr9spDiD4wNPVJdK+Nm)"),
+          UnblindedToken(
+              R"(vST4PalUIaZRZJWFyq6oecP3EG6Q7LgMVYejXHb/QfGARMuB3+qiRNPDq5eX8A6CzzWQkgi5xKmPlnjOQiKYW7CV5ZmcyZacOeB3Mrt2rD33XFHuk042qS9sGKsll617)"),
+          UnblindedToken(
+              R"(MP6Z2d0QR4hQRWnVm0gRKvhmi8N8C3wT5iOHPDjTeDlrtt4+Cl1cBROumF2cU7fAFhW45UAm3ndtnBR6xq3R/PT6GFGXd9WJmoq/ItPfZSTv9VeG4I0NHZ1lXeuxM0ZT)"),
+          UnblindedToken(
+              R"(CJ/SVmXrTXYhwm8CS0ri6v5kUmuwufrm2zxUaImLfdL2iBbNui4gWg4Sot+QQWlLz8aeOrwwBsSO9JKkyn1xuK7iBdTBz3LRt+5iaj0YMPNLyZTbz3Ydeo5byyBHighR)"),
+          UnblindedToken(
+              R"(FklHuKltxiuFQbcn+9EbQ2VfJ5Qbtp6cyYp3abgtfmwuU0tHfBlqfNTUWfa8Ui9NVWjXi4lsNv7zxYL7K8DljB7OoM52ttyB0W/6Tr5r92WbVTHqpyI+BPoHL7G0gtYZ)"),
+          UnblindedToken(
+              R"(Au7mGjI/gSRwRXW/+hNqsCAXAzPgRMo98jqXdVK1vY6e6A4ycASI8n370p7f39a01pMrKnb6VRRJJGvTvf/P8SouSSs5yJqoN4eizf0bOv8RI9DoFNyDn00d+gzg5swV)"),
+          UnblindedToken(
+              R"(RKKb+uW+hF36ukHPSwLjh8fLQYGJqHzX1mrCQCjs5iMNheGZRlF6mP4c1EZql8p+aFaZ36jg1xOXtOyEF088gWi2zv86w0o/1g7QsCCEX/czE+1Jo/Hd1HaTlp4N1uwn)"),
+          UnblindedToken(
+              R"(15ztbRNtz3pU9rttKjOeBtSKrK4a4t1hGPkef/wni1B92ZG4KC31LbQBBSUKzljoacHCY7OyhgPuvjWNqpE/jeKyIt/Oxj0cgdZVDgcFrnX+/EEl7IjcDXftgwe4q4oP)"),
+          UnblindedToken(
+              R"(OiXsHDy5c6n0Jdncui30fQaga+HdIRIVV31C+/gD5TxaoicZfH70gPXuqv6+NAGisXNPnRGupFA+Q68mgvw/I4pHCNkUFcEKEHvP6rQ+oawlQ8mxbBEPosTq6MI8NOsh)"),
+          UnblindedToken(
+              R"(V8ePIKOqd2yvJh+WaZVG7P43gMmYI4gIBkdXo57ma8wEL57N+k4T2RKknrVdgQeilBkzzIb5KIun3tDu9AuEDireSp195fVpBtLTZfGD3eHpKj2gN+qgKp/ID4Nyjz8i)"),
+          UnblindedToken(
+              R"(/ZfbQX5o7QbMmqaqm3jzuVcHjYowLDlV1zLhex0RBjOobDwndhNyZeRhoOqUQFrgS5tHFn9SRF0AlSFwd2JH9HRWN5GQYfzy0Ba5hY0mV1p0+apwEGtRIRLoIMFbzhwg)"),
+          UnblindedToken(
+              R"(iQkT7Z4mhNylLFZ7WLOdYcM2x60f0hOublqBGIYFjUYxk5zdynNJtId1HlyQ9SSTRku4e6/txOIciYEDUj/gRkpJ+eOXpHTCPxNto+fbyNsDGyQHjpmfik7jxhwiy1hY)"),
+          UnblindedToken(
+              R"(AhgyLs+sKpxwWilA4vusIXV0KmgC2gC4EDXYQtUKCn/PCt8vKbQmUnG2eg3IOTLVaq0/O7l6NkfdUUBIMtgFc9hojYjRDmAxpDBZ53/OtJKlI05/getwKUGQx0l8eRJI)"),
+          UnblindedToken(
+              R"(F5ZCIStqAXxAWoGtZQcvo2IjvTHdWybN3pP7OkcxG7e44IhicC2ETToqJUvWpD+1h7EKlm4SvxqKSiXyDKOedNYFK/BQg2N7sABDs7EzmhbDusFYNZf8MRq7Tzo43gYI)"),
+          UnblindedToken(
+              R"(pk1dShFTH61C9vrANLoWNry7zb0HWTYH5IX7G2/uVaGjFUXWgrJOzRDTet938/v7jcqVqhfRFrXrQ/tGvVEMJFIwqBDp/Mef+X0UrJJbBBS5SsvlPe5Xjpj9mwM8CIMP)"),
+          UnblindedToken(
+              R"(BPXrBvOkr2L6elCaY86fRWIQOwa0IP2bx0DN1hNcotuD1mZgECAYnVH+J1rHwqQtTDztea3UTuR8+N+bgHybyBSCfEsdMauHmLGqUEAqJwl2/+OCSE7XvEAhoq/2FWVO)"),
+          UnblindedToken(
+              R"(x0ZQkkeA7pLD1fDLOBS59yUjhWmo2BkeeZIInXfg/g/nQEm2UGUuAlzrHda+XLazHnoZREaLP1yAzzEiOjFZtyww7fyj73tWaEsXhXACE5GqwnEvWGctuyeh0tlhK9Vi)"),
+          UnblindedToken(
+              R"(usir+ZMjKzZFBSHaBtLDzoLpQut7FzpnCF06i4CWZ17VH5IL9qBmV0WkBgMyfvthtjP4tcRoYB+q2PC4bfnB17KmCD4QECVTS8acLnP1NnINLSRSya2MDBKfrZsBEJ1C)"),
+          UnblindedToken(
+              R"(H6Xnh1CxmhILBxminu2dHpJyor/vis8LEWRnsHzaUDb9H1ffJl2AjEHA7z2gNWf6XS35bdTKL2bSFNAz9tiu1NKwb6orgiVFEBvyDGK+5OtT0DEGwJ/W7qsvHEJabnli)"),
+          UnblindedToken(
+              R"(VV6ZzHhu3UQI/vQoXoZbsB6XPLMnGwtXACQDofKxvexJ1kd69RVX9sUSQ8l6f1r2fkQrY/wjYtRd94QDrtpLkpZXZ1SvJKEVr/r2C6bnffduw6tTI7ze4lEz2S/ltJpG)"),
+          UnblindedToken(
+              R"(VVBri+U/df3inE+9b83RrUDaQqpoaQWDrtV9NKUbMXpAGypbLBik+6wayFS1TGOYy/YTO024AGoWH3VXNapjTuCjFnm8MXzeyuDQDXqRI87L4nAeclytgwBUL2j802dJ)"),
+          UnblindedToken(
+              R"(2Qc5OErDr7bSh8rPjmW/bTcmf7IjLjjSdrxCu3cstAaYz9azD/kE8S6H0b2I3YrRKmehmHznUVfFV+mrjGwsvUyT0pCN2WGu7CcX2BuqZwy5UOoidhyNRyoiuG7KWk4U)"),
+          UnblindedToken(
+              R"(VP6wYjOCCI0AEXfYcyTFc7ufz4i28lo8RTmIVzZl9TsF2wvvsWqwB8Yvd3iuc8yqHf6sTKdjIxarIHx1aNJ0fEoqViYY/EkahNrqL2j/VC25yRFqc6Srphrl1rq7ZYwl)"),
+          UnblindedToken(
+              R"(5ePNEDI1lWVhJcd2TyFCE1FLJwhzQUIES/w0YCy0C9+1dwT8KPjnUoWsRc3ey9toeZ6KcX2+wAiTFDtbjNeWiZIRUekNTV7zZAeBg9qAqsOPBZQ4m1/cfgxPmn6UAdsw)"),
+          UnblindedToken(
+              R"(uXo5mB3gx2jlwRobaY/xavCyfSHHfwe8PRAai1jgCYRyrtHtCCtFTFF0k88YWOO22LHHUeRy9W+znC3mwu1knn6OqBV8YOXDSC/AcpJoO9gJV7nci7SJmwhc5QQmU5kT)"),
+          UnblindedToken(
+              R"(Cr+85HfJLSseyS1Ah3lxkbBE2XqBGfir3vJ78sxzhTUFM9emwdNzqT6wqc0tXk2SbY3C2WXGUKCPYwDEZN5FTzZWVkeyep/hJ6tPZ/Q4KtIGLDMhTK9MX/NQu1Khz8h3)"),
+      });
+
+  return *unblinded_tokens;
+}
+
 }  // namespace brave_ads::cbr::test
diff --git a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.h b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.h
index 96483db6c4df..e09e7455e76c 100644
--- a/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.h
+++ b/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token_test_util.h
@@ -6,19 +6,15 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_UNBLINDED_TOKEN_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_UNBLINDED_TOKEN_TEST_UTIL_H_
 
-#include <vector>
+#include "brave/components/brave_ads/core/internal/common/challenge_bypass_ristretto/unblinded_token.h"
 
-namespace brave_ads::cbr {
-
-class UnblindedToken;
-
-namespace test {
+namespace brave_ads::cbr::test {
 
 UnblindedToken GetUnblindedToken();
-std::vector<UnblindedToken> GetUnblindedTokens();
+UnblindedTokenList GetUnblindedTokens();
 
-}  // namespace test
+const UnblindedTokenList& UnblindedTokens();
 
-}  // namespace brave_ads::cbr
+}  // namespace brave_ads::cbr::test
 
 #endif  // BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_COMMON_CHALLENGE_BYPASS_RISTRETTO_UNBLINDED_TOKEN_TEST_UTIL_H_
diff --git a/components/brave_ads/core/internal/common/test/test_base.cc b/components/brave_ads/core/internal/common/test/test_base.cc
index 2c2556f9c954..029421565f7d 100644
--- a/components/brave_ads/core/internal/common/test/test_base.cc
+++ b/components/brave_ads/core/internal/common/test/test_base.cc
@@ -5,7 +5,6 @@
 
 #include "brave/components/brave_ads/core/internal/common/test/test_base.h"
 
-#include <iostream>
 #include <memory>
 
 #include "base/check.h"
diff --git a/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.cc b/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.cc
index aa633c377229..b90d70145c12 100644
--- a/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.cc
+++ b/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.cc
@@ -14,12 +14,12 @@
 
 namespace brave_ads::test {
 
-CreativeInlineContentAdList BuildCreativeInlineContentAds(int count) {
-  CHECK_GT(count, 0);
+CreativeInlineContentAdList BuildCreativeInlineContentAds(size_t count) {
+  CHECK_GT(count, 0U);
 
   CreativeInlineContentAdList creative_ads;
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     CreativeInlineContentAdInfo creative_ad = BuildCreativeInlineContentAd(
         /*should_generate_random_uuids=*/true);
     creative_ad.segment = kSegments[i % std::size(kSegments)];
diff --git a/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.h b/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.h
index 53fe34978a2a..7dc7fe12f46c 100644
--- a/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.h
+++ b/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_test_util.h
@@ -6,11 +6,13 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_INLINE_CONTENT_ADS_CREATIVE_INLINE_CONTENT_AD_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_INLINE_CONTENT_ADS_CREATIVE_INLINE_CONTENT_AD_TEST_UTIL_H_
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/creatives/inline_content_ads/creative_inline_content_ad_info.h"
 
 namespace brave_ads::test {
 
-CreativeInlineContentAdList BuildCreativeInlineContentAds(int count);
+CreativeInlineContentAdList BuildCreativeInlineContentAds(size_t count);
 CreativeInlineContentAdInfo BuildCreativeInlineContentAd(
     bool should_generate_random_uuids);
 
diff --git a/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.cc b/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.cc
index 7137de897f58..e0612ca88377 100644
--- a/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.cc
+++ b/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.cc
@@ -13,12 +13,12 @@
 
 namespace brave_ads::test {
 
-CreativeNewTabPageAdList BuildCreativeNewTabPageAds(int count) {
-  CHECK_GT(count, 0);
+CreativeNewTabPageAdList BuildCreativeNewTabPageAds(size_t count) {
+  CHECK_GT(count, 0U);
 
   CreativeNewTabPageAdList creative_ads;
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     CreativeNewTabPageAdInfo creative_ad =
         BuildCreativeNewTabPageAd(/*should_generate_random_uuids=*/true);
     creative_ad.segment = kSegments[i % kSegments.size()];
@@ -28,7 +28,6 @@ CreativeNewTabPageAdList BuildCreativeNewTabPageAds(int count) {
 
   return creative_ads;
 }
-
 CreativeNewTabPageAdInfo BuildCreativeNewTabPageAd(
     bool should_generate_random_uuids) {
   const CreativeAdInfo creative_ad =
diff --git a/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.h b/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.h
index d87f98758458..be9586a4e2c8 100644
--- a/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.h
+++ b/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_test_util.h
@@ -6,11 +6,13 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_NEW_TAB_PAGE_ADS_CREATIVE_NEW_TAB_PAGE_AD_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_NEW_TAB_PAGE_ADS_CREATIVE_NEW_TAB_PAGE_AD_TEST_UTIL_H_
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_info.h"
 
 namespace brave_ads::test {
 
-CreativeNewTabPageAdList BuildCreativeNewTabPageAds(int count);
+CreativeNewTabPageAdList BuildCreativeNewTabPageAds(size_t count);
 CreativeNewTabPageAdInfo BuildCreativeNewTabPageAd(
     bool should_generate_random_uuids);
 
diff --git a/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.cc b/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.cc
index 8990d0bd64bc..fda8316c5878 100644
--- a/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.cc
+++ b/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.cc
@@ -13,12 +13,12 @@
 
 namespace brave_ads::test {
 
-CreativeNotificationAdList BuildCreativeNotificationAds(int count) {
-  CHECK_GT(count, 0);
+CreativeNotificationAdList BuildCreativeNotificationAds(size_t count) {
+  CHECK_GT(count, 0U);
 
   CreativeNotificationAdList creative_ads;
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     CreativeNotificationAdInfo creative_ad = BuildCreativeNotificationAd(
         /*should_generate_random_uuids=*/true);
     creative_ad.segment = kSegments[i % kSegments.size()];
diff --git a/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.h b/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.h
index 80be8d56281a..9228e0ad8579 100644
--- a/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.h
+++ b/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_test_util.h
@@ -6,11 +6,13 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_NOTIFICATION_ADS_CREATIVE_NOTIFICATION_AD_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_NOTIFICATION_ADS_CREATIVE_NOTIFICATION_AD_TEST_UTIL_H_
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/creatives/notification_ads/creative_notification_ad_info.h"
 
 namespace brave_ads::test {
 
-CreativeNotificationAdList BuildCreativeNotificationAds(int count);
+CreativeNotificationAdList BuildCreativeNotificationAds(size_t count);
 CreativeNotificationAdInfo BuildCreativeNotificationAd(
     bool should_generate_random_uuids);
 
diff --git a/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.cc b/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.cc
index 2d9b15821c17..cda94779f117 100644
--- a/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.cc
+++ b/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.cc
@@ -12,12 +12,12 @@
 
 namespace brave_ads::test {
 
-CreativePromotedContentAdList BuildCreativePromotedContentAds(int count) {
-  CHECK_GT(count, 0);
+CreativePromotedContentAdList BuildCreativePromotedContentAds(size_t count) {
+  CHECK_GT(count, 0U);
 
   CreativePromotedContentAdList creative_ads;
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     CreativePromotedContentAdInfo creative_ad = BuildCreativePromotedContentAd(
         /*should_generate_random_uuids=*/true);
     creative_ad.segment = kSegments[i % kSegments.size()];
diff --git a/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.h b/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.h
index e8e1106bc821..5e9183387fa2 100644
--- a/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.h
+++ b/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_test_util.h
@@ -6,11 +6,13 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_PROMOTED_CONTENT_ADS_CREATIVE_PROMOTED_CONTENT_AD_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_CREATIVES_PROMOTED_CONTENT_ADS_CREATIVE_PROMOTED_CONTENT_AD_TEST_UTIL_H_
 
+#include <cstddef>
+
 #include "brave/components/brave_ads/core/internal/creatives/promoted_content_ads/creative_promoted_content_ad_info.h"
 
 namespace brave_ads::test {
 
-CreativePromotedContentAdList BuildCreativePromotedContentAds(int count);
+CreativePromotedContentAdList BuildCreativePromotedContentAds(size_t count);
 CreativePromotedContentAdInfo BuildCreativePromotedContentAd(
     bool should_generate_random_uuids);
 
diff --git a/components/brave_ads/core/internal/ml/data/vector_data_unittest.cc b/components/brave_ads/core/internal/ml/data/vector_data_unittest.cc
index 8ce3cd5c6677..003178d805dc 100644
--- a/components/brave_ads/core/internal/ml/data/vector_data_unittest.cc
+++ b/components/brave_ads/core/internal/ml/data/vector_data_unittest.cc
@@ -162,7 +162,7 @@ TEST_F(BraveAdsVectorDataTest, AddElementWise) {
   vector_data_3.AddElementWise(vector_data_4);
 
   // Assert
-  for (int i = 0; i < 3; ++i) {
+  for (size_t i = 0; i < 3; ++i) {
     EXPECT_NEAR(vector_sum_1_2.at(i), vector_data_1.GetData().at(i), 0.001F);
     EXPECT_NEAR(vector_sum_2_1.at(i), vector_data_2.GetData().at(i), 0.001F);
     EXPECT_NEAR(vector_sum_3_4.at(i), vector_data_3.GetData().at(i), 0.001F);
@@ -188,7 +188,7 @@ TEST_F(BraveAdsVectorDataTest, DivideByScalar) {
   vector_data_4.DivideByScalar(-0.25F);
 
   // Assert
-  for (int i = 0; i < 3; ++i) {
+  for (size_t i = 0; i < 3; ++i) {
     EXPECT_NEAR(vector_1_division.at(i), vector_data_1.GetData().at(i), 0.001F);
     EXPECT_NEAR(vector_2_division.at(i), vector_data_2.GetData().at(i), 0.001F);
     EXPECT_NEAR(vector_3_division.at(i), vector_data_3.GetData().at(i), 0.001F);
diff --git a/components/brave_ads/core/internal/reminders/reminders_feature.h b/components/brave_ads/core/internal/reminders/reminders_feature.h
index 57a2731ddc0f..c86bff352135 100644
--- a/components/brave_ads/core/internal/reminders/reminders_feature.h
+++ b/components/brave_ads/core/internal/reminders/reminders_feature.h
@@ -13,7 +13,7 @@ namespace brave_ads {
 
 BASE_DECLARE_FEATURE(kRemindersFeature);
 
-inline constexpr base::FeatureParam<int> kRemindUserIfClickingTheSameAdAfter{
+inline constexpr base::FeatureParam<size_t> kRemindUserIfClickingTheSameAdAfter{
     &kRemindersFeature, "remind_user_if_clicking_the_same_ad_after", 3};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/reminders/reminders_feature_unittest.cc b/components/brave_ads/core/internal/reminders/reminders_feature_unittest.cc
index 86bb13114f76..1e5dcd3bbab0 100644
--- a/components/brave_ads/core/internal/reminders/reminders_feature_unittest.cc
+++ b/components/brave_ads/core/internal/reminders/reminders_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsRemindersFeatureTest, RemindUserIfClickingTheSameAdAfter) {
       kRemindersFeature, {{"remind_user_if_clicking_the_same_ad_after", "1"}});
 
   // Act & Assert
-  EXPECT_EQ(1, kRemindUserIfClickingTheSameAdAfter.Get());
+  EXPECT_EQ(1U, kRemindUserIfClickingTheSameAdAfter.Get());
 }
 
 TEST(BraveAdsRemindersFeatureTest, DefaultRemindUserIfClickingTheSameAdAfter) {
   // Act & Assert
-  EXPECT_EQ(3, kRemindUserIfClickingTheSameAdAfter.Get());
+  EXPECT_EQ(3U, kRemindUserIfClickingTheSameAdAfter.Get());
 }
 
 TEST(BraveAdsRemindersFeatureTest,
@@ -48,7 +48,7 @@ TEST(BraveAdsRemindersFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kRemindersFeature);
 
   // Act & Assert
-  EXPECT_EQ(3, kRemindUserIfClickingTheSameAdAfter.Get());
+  EXPECT_EQ(3U, kRemindUserIfClickingTheSameAdAfter.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature.h b/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature.h
index 68e3221568fb..f7d4eb298a5a 100644
--- a/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature.h
+++ b/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature.h
@@ -13,10 +13,10 @@ namespace brave_ads {
 
 BASE_DECLARE_FEATURE(kEligibleAdFeature);
 
-inline constexpr base::FeatureParam<int> kSiteHistoryMaxCount{
+inline constexpr base::FeatureParam<size_t> kSiteHistoryMaxCount{
     &kEligibleAdFeature, "site_history_max_count", 5'000};
 
-inline constexpr base::FeatureParam<int> kSiteHistoryRecentDayRange{
+inline constexpr base::FeatureParam<size_t> kSiteHistoryRecentDayRange{
     &kEligibleAdFeature, "site_history_recent_day_range", 180};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature_unittest.cc b/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature_unittest.cc
index 6a2095c4b0f2..93daf6777ddc 100644
--- a/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature_unittest.cc
+++ b/components/brave_ads/core/internal/serving/eligible_ads/eligible_ads_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsEligibleAdFeatureTest, SiteHistoryMaxCount) {
       kEligibleAdFeature, {{"site_history_max_count", "666"}});
 
   // Act & Assert
-  EXPECT_EQ(666, kSiteHistoryMaxCount.Get());
+  EXPECT_EQ(666U, kSiteHistoryMaxCount.Get());
 }
 
 TEST(BraveAdsEligibleAdFeatureTest, DefaultSiteHistoryMaxCount) {
   // Act & Assert
-  EXPECT_EQ(5'000, kSiteHistoryMaxCount.Get());
+  EXPECT_EQ(5'000U, kSiteHistoryMaxCount.Get());
 }
 
 TEST(BraveAdsEligibleAdFeatureTest, DefaultSiteHistoryMaxCountWhenDisabled) {
@@ -47,7 +47,7 @@ TEST(BraveAdsEligibleAdFeatureTest, DefaultSiteHistoryMaxCountWhenDisabled) {
   scoped_feature_list.InitAndDisableFeature(kEligibleAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(5'000, kSiteHistoryMaxCount.Get());
+  EXPECT_EQ(5'000U, kSiteHistoryMaxCount.Get());
 }
 
 TEST(BraveAdsEligibleAdFeatureTest, SiteHistoryRecentDayRange) {
@@ -57,12 +57,12 @@ TEST(BraveAdsEligibleAdFeatureTest, SiteHistoryRecentDayRange) {
       kEligibleAdFeature, {{"site_history_recent_day_range", "7"}});
 
   // Act & Assert
-  EXPECT_EQ(7, kSiteHistoryRecentDayRange.Get());
+  EXPECT_EQ(7U, kSiteHistoryRecentDayRange.Get());
 }
 
 TEST(BraveAdsEligibleAdFeatureTest, DefaultSiteHistoryRecentDayRange) {
   // Act & Assert
-  EXPECT_EQ(180, kSiteHistoryRecentDayRange.Get());
+  EXPECT_EQ(180U, kSiteHistoryRecentDayRange.Get());
 }
 
 TEST(BraveAdsEligibleAdFeatureTest,
@@ -72,7 +72,7 @@ TEST(BraveAdsEligibleAdFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kEligibleAdFeature);
 
   // Act & Assert
-  EXPECT_EQ(180, kSiteHistoryRecentDayRange.Get());
+  EXPECT_EQ(180U, kSiteHistoryRecentDayRange.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/conversion_exclusion_rule_unittest.cc b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/conversion_exclusion_rule_unittest.cc
index a0e8496004e5..fcf31aee34d2 100644
--- a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/conversion_exclusion_rule_unittest.cc
+++ b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/conversion_exclusion_rule_unittest.cc
@@ -93,7 +93,7 @@ TEST_F(BraveAdsConversionExclusionRuleTest,
       creative_ad, mojom::AdType::kNotificationAd,
       mojom::ConfirmationType::kConversion,
       /*created_at=*/test::Now(), /*should_generate_random_uuids=*/false);
-  for (int i = 0;
+  for (size_t i = 0;
        i < kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get() - 1; ++i) {
     ad_events.push_back(ad_event);
   }
@@ -120,8 +120,8 @@ TEST_F(BraveAdsConversionExclusionRuleTest,
       creative_ad, mojom::AdType::kNotificationAd,
       mojom::ConfirmationType::kConversion,
       /*created_at=*/test::Now(), /*should_generate_random_uuids=*/false);
-  for (int i = 0; i < kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get();
-       ++i) {
+  for (size_t i = 0;
+       i < kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get(); ++i) {
     ad_events.push_back(ad_event);
   }
 
diff --git a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature.h b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature.h
index 5d7b67e1c0c5..dbb058a8214b 100644
--- a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature.h
+++ b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature.h
@@ -40,14 +40,14 @@ inline constexpr base::FeatureParam<base::TimeDelta>
 
 // Set to 0 to never exclude an ad if the creative instance exceeds the per hour
 // cap.
-inline constexpr base::FeatureParam<int>
+inline constexpr base::FeatureParam<size_t>
     kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap{
         &kExclusionRulesFeature,
         "should_exclude_ad_if_creative_instance_exceeds_per_hour_cap", 1};
 
 // Set to 0 to never exclude an ad if the creative set exceeds the conversion
 // cap.
-inline constexpr base::FeatureParam<int>
+inline constexpr base::FeatureParam<size_t>
     kShouldExcludeAdIfCreativeSetExceedsConversionCap{
         &kExclusionRulesFeature,
         "should_exclude_ad_if_creative_set_exceeds_conversion_cap", 1};
diff --git a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature_unittest.cc b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature_unittest.cc
index 083eed239f85..a776396b7335 100644
--- a/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature_unittest.cc
+++ b/components/brave_ads/core/internal/serving/eligible_ads/exclusion_rules/exclusion_rule_feature_unittest.cc
@@ -94,13 +94,13 @@ TEST(BraveAdsExclusionRuleFeatureTest,
       {{"should_exclude_ad_if_creative_instance_exceeds_per_hour_cap", "7"}});
 
   // Act & Assert
-  EXPECT_EQ(7, kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap.Get());
+  EXPECT_EQ(7U, kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap.Get());
 }
 
 TEST(BraveAdsExclusionRuleFeatureTest,
      DefaultShouldExcludeAdIfCreativeInstanceExceedsPerHourCap) {
   // Act & Assert
-  EXPECT_EQ(1, kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap.Get());
+  EXPECT_EQ(1U, kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap.Get());
 }
 
 TEST(BraveAdsExclusionRuleFeatureTest,
@@ -110,7 +110,7 @@ TEST(BraveAdsExclusionRuleFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kExclusionRulesFeature);
 
   // Act & Assert
-  EXPECT_EQ(1, kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap.Get());
+  EXPECT_EQ(1U, kShouldExcludeAdIfCreativeInstanceExceedsPerHourCap.Get());
 }
 
 TEST(BraveAdsExclusionRuleFeatureTest,
@@ -122,13 +122,13 @@ TEST(BraveAdsExclusionRuleFeatureTest,
       {{"should_exclude_ad_if_creative_set_exceeds_conversion_cap", "7"}});
 
   // Act & Assert
-  EXPECT_EQ(7, kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get());
+  EXPECT_EQ(7U, kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get());
 }
 
 TEST(BraveAdsExclusionRuleFeatureTest,
      DefaultShouldExcludeAdIfCreativeSetExceedsConversionCap) {
   // Act & Assert
-  EXPECT_EQ(1, kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get());
+  EXPECT_EQ(1U, kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get());
 }
 
 TEST(BraveAdsExclusionRuleFeatureTest,
@@ -138,7 +138,7 @@ TEST(BraveAdsExclusionRuleFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kExclusionRulesFeature);
 
   // Act & Assert
-  EXPECT_EQ(1, kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get());
+  EXPECT_EQ(1U, kShouldExcludeAdIfCreativeSetExceedsConversionCap.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc b/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc
index b929994e8957..8c77d5439851 100644
--- a/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc
+++ b/components/brave_ads/core/internal/serving/prediction/model_based/sampling/creative_ad_model_based_predictor_sampling_unittest.cc
@@ -61,7 +61,7 @@ TEST_F(BraveAdsCreativeAdModelBasedPredictorSamplingTest,
   creative_ad_predictors.push_back(creative_ad_predictor_3);
 
   // Act & Assert
-  for (int i = 0; i < 10; ++i) {
+  for (size_t i = 0; i < 10; ++i) {
     EXPECT_EQ(creative_ad_predictor_2.creative_ad,
               MaybeSampleCreativeAd(creative_ad_predictors));
   }
@@ -91,7 +91,7 @@ TEST_F(BraveAdsCreativeAdModelBasedPredictorSamplingTest,
   int creative_ad_1_count = 0;
   int creative_ad_2_count = 0;
 
-  for (int i = 0; i < 25; ++i) {
+  for (size_t i = 0; i < 25; ++i) {
     // P(X>1) > 0.99999999 with X~Bin(n=25, p=0.5), i.e. less than 1 in 100M
     // tests are expected to fail.
     const std::optional<CreativeNotificationAdInfo> creative_ad =
diff --git a/components/brave_ads/core/internal/serving/targeting/condition_matcher/prefs/internal/condition_matcher_pref_util_internal.cc b/components/brave_ads/core/internal/serving/targeting/condition_matcher/prefs/internal/condition_matcher_pref_util_internal.cc
index 1e0dd88d0925..242cba1d7824 100644
--- a/components/brave_ads/core/internal/serving/targeting/condition_matcher/prefs/internal/condition_matcher_pref_util_internal.cc
+++ b/components/brave_ads/core/internal/serving/targeting/condition_matcher/prefs/internal/condition_matcher_pref_util_internal.cc
@@ -84,8 +84,8 @@ std::optional<base::Value> MaybeGetDictPrefValue(const base::Value& pref_value,
 
 std::optional<base::Value> MaybeGetListPrefValue(const base::Value& pref_value,
                                                  const std::string& key) {
-  int index;
-  if (!base::StringToInt(key, &index)) {
+  size_t index;
+  if (!base::StringToSizeT(key, &index)) {
     // Invalid pref path key, because this should be an integer index for the
     // list.
     return std::nullopt;
@@ -93,7 +93,7 @@ std::optional<base::Value> MaybeGetListPrefValue(const base::Value& pref_value,
 
   const base::Value::List& list = pref_value.GetList();
 
-  if (index < 0 || index >= static_cast<int>(list.size())) {
+  if (index >= list.size()) {
     // Invalid pref path key, because the list index is out of bounds.
     return std::nullopt;
   }
diff --git a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature.h b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature.h
index 8ba474fa9277..6ef6fa6e8c79 100644
--- a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature.h
+++ b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature.h
@@ -16,7 +16,7 @@ BASE_DECLARE_FEATURE(kTextClassificationFeature);
 inline constexpr base::FeatureParam<int> kTextClassificationResourceVersion{
     &kTextClassificationFeature, "flatbuffers_resource_version", 1};
 
-inline constexpr base::FeatureParam<int>
+inline constexpr base::FeatureParam<size_t>
     kTextClassificationPageProbabilitiesHistorySize{
         &kTextClassificationFeature, "page_probabilities_history_size", 5};
 
diff --git a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature_unittest.cc b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature_unittest.cc
index c5a89f1ce6ed..3e4e844867b2 100644
--- a/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature_unittest.cc
+++ b/components/brave_ads/core/internal/targeting/contextual/text_classification/text_classification_feature_unittest.cc
@@ -60,13 +60,13 @@ TEST(BraveAdsTextClassificationFeatureTest,
       kTextClassificationFeature, {{"page_probabilities_history_size", "3"}});
 
   // Act & Assert
-  EXPECT_EQ(3, kTextClassificationPageProbabilitiesHistorySize.Get());
+  EXPECT_EQ(3U, kTextClassificationPageProbabilitiesHistorySize.Get());
 }
 
 TEST(BraveAdsTextClassificationFeatureTest,
      DefaultTextClassificationPageProbabilitiesHistorySize) {
   // Act & Assert
-  EXPECT_EQ(5, kTextClassificationPageProbabilitiesHistorySize.Get());
+  EXPECT_EQ(5U, kTextClassificationPageProbabilitiesHistorySize.Get());
 }
 
 TEST(BraveAdsTextClassificationFeatureTest,
@@ -76,7 +76,7 @@ TEST(BraveAdsTextClassificationFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kTextClassificationFeature);
 
   // Act & Assert
-  EXPECT_EQ(5, kTextClassificationPageProbabilitiesHistorySize.Get());
+  EXPECT_EQ(5U, kTextClassificationPageProbabilitiesHistorySize.Get());
 }
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature.h b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature.h
index 7e0735c0d9bc..85b1f8752f07 100644
--- a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature.h
+++ b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature.h
@@ -19,7 +19,7 @@ namespace brave_ads {
 
 BASE_DECLARE_FEATURE(kUserActivityFeature);
 
-inline constexpr base::FeatureParam<int> kMaximumUserActivityEvents{
+inline constexpr base::FeatureParam<size_t> kMaximumUserActivityEvents{
     &kUserActivityFeature, "maximum_events", 3600};
 
 inline constexpr base::FeatureParam<std::string> kUserActivityTriggers{
diff --git a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature_unittest.cc b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature_unittest.cc
index 6bd379bc9304..bb02a8e928b7 100644
--- a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature_unittest.cc
+++ b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_feature_unittest.cc
@@ -33,12 +33,12 @@ TEST(BraveAdsUserActivityFeatureTest, MaximumUserActivityEvents) {
       kUserActivityFeature, {{"maximum_events", "7"}});
 
   // Act & Assert
-  EXPECT_EQ(7, kMaximumUserActivityEvents.Get());
+  EXPECT_EQ(7U, kMaximumUserActivityEvents.Get());
 }
 
 TEST(BraveAdsUserActivityFeatureTest, DefaultMaximumUserActivityEvents) {
   // Act & Assert
-  EXPECT_EQ(3600, kMaximumUserActivityEvents.Get());
+  EXPECT_EQ(3600U, kMaximumUserActivityEvents.Get());
 }
 
 TEST(BraveAdsUserActivityFeatureTest,
@@ -48,7 +48,7 @@ TEST(BraveAdsUserActivityFeatureTest,
   scoped_feature_list.InitAndDisableFeature(kUserActivityFeature);
 
   // Act & Assert
-  EXPECT_EQ(3600, kMaximumUserActivityEvents.Get());
+  EXPECT_EQ(3600U, kMaximumUserActivityEvents.Get());
 }
 
 TEST(BraveAdsUserActivityFeatureTest, UserActivityTriggers) {
diff --git a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager.cc b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager.cc
index 787f7bd99c09..e448f01b45ea 100644
--- a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager.cc
+++ b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager.cc
@@ -72,8 +72,7 @@ void UserActivityManager::RecordEvent(UserActivityEventType event_type) {
   user_activity_events_.push_back(UserActivityEventInfo{
       .type = event_type, .created_at = base::Time::Now()});
 
-  if (user_activity_events_.size() >
-      static_cast<size_t>(kMaximumUserActivityEvents.Get())) {
+  if (user_activity_events_.size() > kMaximumUserActivityEvents.Get()) {
     user_activity_events_.pop_front();
   }
 
diff --git a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager_unittest.cc b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager_unittest.cc
index 834445c39ed2..935d277dd77a 100644
--- a/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager_unittest.cc
+++ b/components/brave_ads/core/internal/user_attention/user_activity/user_activity_manager_unittest.cc
@@ -431,7 +431,7 @@ TEST_F(BraveAdsUserActivityManagerTest, MaximumHistoryItems) {
   // Arrange
   const UserActivityEventType user_activity_event_type =
       UserActivityEventType::kClosedTab;
-  for (int i = 0; i < kMaximumUserActivityEvents.Get(); ++i) {
+  for (size_t i = 0; i < kMaximumUserActivityEvents.Get(); ++i) {
     UserActivityManager::GetInstance().RecordEvent(user_activity_event_type);
   }
 
@@ -443,7 +443,7 @@ TEST_F(BraveAdsUserActivityManagerTest, MaximumHistoryItems) {
 
   UserActivityEventInfo expected_user_activity_event;
 
-  for (int i = 0; i < kMaximumUserActivityEvents.Get() - 1; ++i) {
+  for (size_t i = 0; i < kMaximumUserActivityEvents.Get() - 1; ++i) {
     expected_user_activity_event.type = user_activity_event_type;
     expected_user_activity_event.created_at = test::Now();
     expected_user_activity_events.push_back(expected_user_activity_event);
diff --git a/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.cc b/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.cc
index 471704ede1fb..480166c37c37 100644
--- a/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.cc
+++ b/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.cc
@@ -44,10 +44,10 @@ void RecordAdEvents(
 
 void RecordAdEvents(const AdInfo& ad,
                     mojom::ConfirmationType mojom_confirmation_type,
-                    int count) {
-  CHECK_GT(count, 0);
+                    size_t count) {
+  CHECK_GT(count, 0U);
 
-  for (int i = 0; i < count; ++i) {
+  for (size_t i = 0; i < count; ++i) {
     RecordAdEvent(ad, mojom_confirmation_type);
   }
 }
diff --git a/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.h b/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.h
index cd524b56674e..6e40dda4f01f 100644
--- a/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.h
+++ b/components/brave_ads/core/internal/user_engagement/ad_events/ad_event_test_util.h
@@ -6,6 +6,7 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_USER_ENGAGEMENT_AD_EVENTS_AD_EVENT_TEST_UTIL_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_CORE_INTERNAL_USER_ENGAGEMENT_AD_EVENTS_AD_EVENT_TEST_UTIL_H_
 
+#include <cstddef>
 #include <vector>
 
 #include "brave/components/brave_ads/core/mojom/brave_ads.mojom-forward.h"
@@ -25,7 +26,7 @@ void RecordAdEvents(
 
 void RecordAdEvents(const AdInfo& ad,
                     mojom::ConfirmationType mojom_confirmation_type,
-                    int count);
+                    size_t count);
 
 }  // namespace test
 
diff --git a/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_non_rewards_unittest.cc b/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_non_rewards_unittest.cc
index 208ac862c8e9..41f4bcd34ff4 100644
--- a/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_non_rewards_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_non_rewards_unittest.cc
@@ -77,8 +77,9 @@ TEST_F(BraveAdsSearchResultAdEventHandlerUtilForNonRewardsTest,
           /*should_generate_random_uuids=*/true);
 
   // Act
-  for (int i = 0;
-       i < static_cast<int>(mojom::SearchResultAdEventType::kMaxValue); ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::SearchResultAdEventType::kMaxValue);
+       ++i) {
     const auto mojom_ad_event_type =
         static_cast<mojom::SearchResultAdEventType>(i);
     if (mojom_ad_event_type != mojom::SearchResultAdEventType::kClicked) {
@@ -148,8 +149,9 @@ TEST_F(BraveAdsSearchResultAdEventHandlerUtilForNonRewardsTest,
           /*should_generate_random_uuids=*/true);
 
   // Act & Assert
-  for (int i = 0;
-       i < static_cast<int>(mojom::SearchResultAdEventType::kMaxValue); ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::SearchResultAdEventType::kMaxValue);
+       ++i) {
     const auto mojom_ad_event_type =
         static_cast<mojom::SearchResultAdEventType>(i);
     if (mojom_ad_event_type != mojom::SearchResultAdEventType::kClicked) {
diff --git a/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_rewards_unittest.cc b/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_rewards_unittest.cc
index d979bb85f06f..3939184e8ecd 100644
--- a/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_rewards_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/ad_events/search_result_ads/search_result_ad_event_handler_util_for_rewards_unittest.cc
@@ -75,8 +75,9 @@ TEST_F(BraveAdsSearchResultAdEventHandlerUtilForRewardsTest,
           /*should_generate_random_uuids=*/true);
 
   // Act
-  for (int i = 0;
-       i < static_cast<int>(mojom::SearchResultAdEventType::kMaxValue); ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::SearchResultAdEventType::kMaxValue);
+       ++i) {
     const auto mojom_ad_event_type =
         static_cast<mojom::SearchResultAdEventType>(i);
     if (mojom_ad_event_type !=
@@ -124,8 +125,9 @@ TEST_F(BraveAdsSearchResultAdEventHandlerUtilForRewardsTest,
           /*should_generate_random_uuids=*/true);
 
   // Act & Assert
-  for (int i = 0;
-       i < static_cast<int>(mojom::SearchResultAdEventType::kMaxValue); ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::SearchResultAdEventType::kMaxValue);
+       ++i) {
     const auto mojom_ad_event_type =
         static_cast<mojom::SearchResultAdEventType>(i);
     EXPECT_TRUE(IsAllowedToFireAdEvent(mojom_creative_ad, mojom_ad_event_type));
@@ -140,8 +142,9 @@ TEST_F(BraveAdsSearchResultAdEventHandlerUtilForRewardsTest,
           /*should_generate_random_uuids=*/true);
 
   // Act & Assert
-  for (int i = 0;
-       i < static_cast<int>(mojom::SearchResultAdEventType::kMaxValue); ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::SearchResultAdEventType::kMaxValue);
+       ++i) {
     const auto mojom_ad_event_type =
         static_cast<mojom::SearchResultAdEventType>(i);
     EXPECT_TRUE(IsAllowedToFireAdEvent(mojom_creative_ad, mojom_ad_event_type));
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_feature.h b/components/brave_ads/core/internal/user_engagement/conversions/conversions_feature.h
index 03e4b8975049..285950aac1be 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_feature.h
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_feature.h
@@ -24,7 +24,7 @@ inline constexpr base::FeatureParam<std::string>
         R"~(<meta.*name="ad-conversion-id".*content="([-a-zA-Z0-9]*)".*>)~"};
 
 // Set to 0 to never cap creative set conversions.
-inline constexpr base::FeatureParam<int> kCreativeSetConversionCap{
+inline constexpr base::FeatureParam<size_t> kCreativeSetConversionCap{
     &kConversionsFeature, "creative_set_conversion_cap", 1};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_inline_content_ad_util_unittest.cc b/components/brave_ads/core/internal/user_engagement/conversions/conversions_inline_content_ad_util_unittest.cc
index 279d165f130f..6d9a8092a20e 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_inline_content_ad_util_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_inline_content_ad_util_unittest.cc
@@ -110,8 +110,8 @@ TEST_F(BraveAdsConversionsInlineContentAdUtilTest,
                                   /*should_generate_random_uuids=*/false);
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     const auto confirmation_type = static_cast<mojom::ConfirmationType>(i);
     if (confirmation_type == mojom::ConfirmationType::kViewedImpression ||
         confirmation_type == mojom::ConfirmationType::kClicked) {
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_new_tab_page_ad_util_unittest.cc b/components/brave_ads/core/internal/user_engagement/conversions/conversions_new_tab_page_ad_util_unittest.cc
index 77b110d679b2..cdf1fc9ae42d 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_new_tab_page_ad_util_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_new_tab_page_ad_util_unittest.cc
@@ -147,8 +147,8 @@ TEST_F(BraveAdsConversionsNewTabPageAdUtilTest,
                                   /*should_generate_random_uuids=*/false);
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     const auto confirmation_type = static_cast<mojom::ConfirmationType>(i);
     if (confirmation_type == mojom::ConfirmationType::kViewedImpression ||
         confirmation_type == mojom::ConfirmationType::kClicked) {
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_notification_ad_util_unittest.cc b/components/brave_ads/core/internal/user_engagement/conversions/conversions_notification_ad_util_unittest.cc
index c3e5604f2550..960cc7b81e7e 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_notification_ad_util_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_notification_ad_util_unittest.cc
@@ -110,8 +110,8 @@ TEST_F(BraveAdsConversionsNotificationAdUtilTest,
                                   /*should_generate_random_uuids=*/false);
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     const auto confirmation_type = static_cast<mojom::ConfirmationType>(i);
     if (confirmation_type == mojom::ConfirmationType::kViewedImpression ||
         confirmation_type == mojom::ConfirmationType::kClicked) {
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_promoted_content_ad_util_unittest.cc b/components/brave_ads/core/internal/user_engagement/conversions/conversions_promoted_content_ad_util_unittest.cc
index 1c43d162099d..2580f7c7ad85 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_promoted_content_ad_util_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_promoted_content_ad_util_unittest.cc
@@ -110,8 +110,8 @@ TEST_F(BraveAdsConversionsPromotedContentAdUtilTest,
                                   /*should_generate_random_uuids=*/false);
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     const auto confirmation_type = static_cast<mojom::ConfirmationType>(i);
     if (confirmation_type == mojom::ConfirmationType::kViewedImpression ||
         confirmation_type == mojom::ConfirmationType::kClicked) {
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_search_result_ad_util_unittest.cc b/components/brave_ads/core/internal/user_engagement/conversions/conversions_search_result_ad_util_unittest.cc
index b91ace795611..80d8412901ba 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_search_result_ad_util_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_search_result_ad_util_unittest.cc
@@ -99,8 +99,8 @@ TEST_F(BraveAdsConversionsSearchResultAdUtilTest,
                                   /*should_generate_random_uuids=*/false);
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-       ++i) {
+  for (size_t i = 0;
+       i < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++i) {
     const auto confirmation_type = static_cast<mojom::ConfirmationType>(i);
     if (confirmation_type == mojom::ConfirmationType::kViewedImpression ||
         confirmation_type == mojom::ConfirmationType::kClicked) {
diff --git a/components/brave_ads/core/internal/user_engagement/conversions/conversions_util_internal_unittest.cc b/components/brave_ads/core/internal/user_engagement/conversions/conversions_util_internal_unittest.cc
index b4d5729dfbcf..6e0b3616c79e 100644
--- a/components/brave_ads/core/internal/user_engagement/conversions/conversions_util_internal_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/conversions/conversions_util_internal_unittest.cc
@@ -26,14 +26,14 @@ TEST_F(BraveAdsConversionsUtilInternalTest,
   test::DisableBraveRewards();
 
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::AdType::kMaxValue); ++i) {
+  for (size_t i = 0; i < static_cast<size_t>(mojom::AdType::kMaxValue); ++i) {
     const auto mojom_ad_type = static_cast<mojom::AdType>(i);
 
     const AdInfo ad = test::BuildAd(mojom_ad_type,
                                     /*should_generate_random_uuids=*/false);
 
-    for (int j = 0; j < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-         ++j) {
+    for (size_t j = 0;
+         j < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++j) {
       const auto confirmation_type = static_cast<mojom::ConfirmationType>(j);
 
       bool expected_can_convert_ad_event;
@@ -59,14 +59,14 @@ TEST_F(BraveAdsConversionsUtilInternalTest,
 
 TEST_F(BraveAdsConversionsUtilInternalTest, CanConvertAdEventForRewardsUser) {
   // Act & Assert
-  for (int i = 0; i < static_cast<int>(mojom::AdType::kMaxValue); ++i) {
+  for (size_t i = 0; i < static_cast<size_t>(mojom::AdType::kMaxValue); ++i) {
     const auto mojom_ad_type = static_cast<mojom::AdType>(i);
 
     const AdInfo ad = test::BuildAd(mojom_ad_type,
                                     /*should_generate_random_uuids=*/false);
 
-    for (int j = 0; j < static_cast<int>(mojom::ConfirmationType::kMaxValue);
-         ++j) {
+    for (size_t j = 0;
+         j < static_cast<size_t>(mojom::ConfirmationType::kMaxValue); ++j) {
       const auto confirmation_type = static_cast<mojom::ConfirmationType>(j);
 
       // Only viewed and clicked ad events are allowed to be converted.
diff --git a/components/brave_ads/core/internal/user_engagement/site_visit/site_visit_feature_unittest.cc b/components/brave_ads/core/internal/user_engagement/site_visit/site_visit_feature_unittest.cc
index 2f477b66cb63..0aa6eb2bff21 100644
--- a/components/brave_ads/core/internal/user_engagement/site_visit/site_visit_feature_unittest.cc
+++ b/components/brave_ads/core/internal/user_engagement/site_visit/site_visit_feature_unittest.cc
@@ -57,12 +57,12 @@ TEST(BraveAdsSiteVisitFeatureTest, PageLandCap) {
       kSiteVisitFeature, {{"page_land_cap", "7"}});
 
   // Act & Assert
-  EXPECT_EQ(7, kPageLandCap.Get());
+  EXPECT_EQ(7U, kPageLandCap.Get());
 }
 
 TEST(BraveAdsSiteVisitFeatureTest, DefaultPageLandCap) {
   // Act & Assert
-  EXPECT_EQ(0, kPageLandCap.Get());
+  EXPECT_EQ(0U, kPageLandCap.Get());
 }
 
 TEST(BraveAdsSiteVisitFeatureTest, DefaultPageLandCapWhenDisabled) {
@@ -71,7 +71,7 @@ TEST(BraveAdsSiteVisitFeatureTest, DefaultPageLandCapWhenDisabled) {
   scoped_feature_list.InitAndDisableFeature(kSiteVisitFeature);
 
   // Act & Assert
-  EXPECT_EQ(0, kPageLandCap.Get());
+  EXPECT_EQ(0U, kPageLandCap.Get());
 }
 
 TEST(BraveAdsSiteVisitFeatureTest, ShouldSuspendAndResumePageLand) {
diff --git a/components/brave_ads/core/public/ad_units/notification_ad/notification_ad_feature.h b/components/brave_ads/core/public/ad_units/notification_ad/notification_ad_feature.h
index c0f3ce8994ac..8341406691d0 100644
--- a/components/brave_ads/core/public/ad_units/notification_ad/notification_ad_feature.h
+++ b/components/brave_ads/core/public/ad_units/notification_ad/notification_ad_feature.h
@@ -26,7 +26,7 @@ inline constexpr base::FeatureParam<int> kDefaultNotificationAdsPerHour{
     kDefaultBraveRewardsNotificationAdsPerHour};
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumNotificationAdsPerDay{
+inline constexpr base::FeatureParam<size_t> kMaximumNotificationAdsPerDay{
     &kNotificationAdFeature, "maximum_ads_per_day", 100};
 
 // Set to true to fallback to custom notification ads if native notifications
diff --git a/components/brave_ads/core/public/ad_units/search_result_ad/search_result_ad_feature.h b/components/brave_ads/core/public/ad_units/search_result_ad/search_result_ad_feature.h
index f1eafd6340c3..5e1dd4cb8c30 100644
--- a/components/brave_ads/core/public/ad_units/search_result_ad/search_result_ad_feature.h
+++ b/components/brave_ads/core/public/ad_units/search_result_ad/search_result_ad_feature.h
@@ -14,11 +14,11 @@ namespace brave_ads {
 BASE_DECLARE_FEATURE(kSearchResultAdFeature);
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumSearchResultAdsPerHour{
+inline constexpr base::FeatureParam<size_t> kMaximumSearchResultAdsPerHour{
     &kSearchResultAdFeature, "maximum_ads_per_hour", 0};
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kMaximumSearchResultAdsPerDay{
+inline constexpr base::FeatureParam<size_t> kMaximumSearchResultAdsPerDay{
     &kSearchResultAdFeature, "maximum_ads_per_day", 0};
 
 }  // namespace brave_ads
diff --git a/components/brave_ads/core/public/user_engagement/site_visit/site_visit_feature.h b/components/brave_ads/core/public/user_engagement/site_visit/site_visit_feature.h
index 3c8a783428b8..144f6c0dcf7d 100644
--- a/components/brave_ads/core/public/user_engagement/site_visit/site_visit_feature.h
+++ b/components/brave_ads/core/public/user_engagement/site_visit/site_visit_feature.h
@@ -21,8 +21,8 @@ inline constexpr base::FeatureParam<base::TimeDelta> kPageLandAfter{
     &kSiteVisitFeature, "page_land_after", base::Seconds(5)};
 
 // Set to 0 to never cap.
-inline constexpr base::FeatureParam<int> kPageLandCap{&kSiteVisitFeature,
-                                                      "page_land_cap", 0};
+inline constexpr base::FeatureParam<size_t> kPageLandCap{&kSiteVisitFeature,
+                                                         "page_land_cap", 0};
 
 inline constexpr base::FeatureParam<bool> kShouldSuspendAndResumePageLand{
     &kSiteVisitFeature, "should_suspend_and_resume_page_land", true};