diff --git a/packages/protocol/contracts-0.8/common/test/MockCeloToken.sol b/packages/protocol/contracts-0.8/common/test/MockCeloToken.sol
index 792193c0b54..82bd1c57cc8 100644
--- a/packages/protocol/contracts-0.8/common/test/MockCeloToken.sol
+++ b/packages/protocol/contracts-0.8/common/test/MockCeloToken.sol
@@ -2,7 +2,7 @@ pragma solidity >=0.8.0 <0.9.0;
 // solhint-disable no-unused-vars
 
 /**
- * @title A mock StableToken for testing.
+ * @title A mock StableToken for testing. This contract can be deprecated once GoldToken gets migrated to 0.8
  */
 contract MockCeloToken08 {
   uint256 public totalSupply_;
diff --git a/packages/protocol/contracts-0.8/governance/Validators.sol b/packages/protocol/contracts-0.8/governance/Validators.sol
index 23c438c29f6..6f4857e013c 100644
--- a/packages/protocol/contracts-0.8/governance/Validators.sol
+++ b/packages/protocol/contracts-0.8/governance/Validators.sol
@@ -650,12 +650,8 @@ contract Validators is
   function mintStableToEpochManager(
     uint256 amount
   ) external onlyL2 nonReentrant onlyRegisteredContract(EPOCH_MANAGER_REGISTRY_ID) {
-    require(amount > 0, "mint amount is zero.");
     require(
-      IStableToken(getStableToken()).mint(
-        registry.getAddressForOrDie(EPOCH_MANAGER_REGISTRY_ID),
-        amount
-      ),
+      IStableToken(getStableToken()).mint(msg.sender, amount),
       "mint failed to epoch manager"
     );
   }
diff --git a/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol b/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol
index e6ae766024e..18229719cfc 100644
--- a/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol
+++ b/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol
@@ -3452,7 +3452,6 @@ contract ValidatorsTest_MintStableToEpochManager is ValidatorsTest {
     _whenL2();
     vm.prank(address(epochManager));
     validators.mintStableToEpochManager(5);
-
     assertEq(stableToken.balanceOf(address(epochManager)), 5);
   }
 }