diff --git a/cardano-api/test/cardano-api-golden/Test/Golden/Cardano/Api/EpochLeadership.hs b/cardano-api/test/cardano-api-golden/Test/Golden/Cardano/Api/EpochLeadership.hs
index 8e66ba4b90..9cd4ac5e27 100644
--- a/cardano-api/test/cardano-api-golden/Test/Golden/Cardano/Api/EpochLeadership.hs
+++ b/cardano-api/test/cardano-api-golden/Test/Golden/Cardano/Api/EpochLeadership.hs
@@ -7,7 +7,8 @@ module Test.Golden.Cardano.Api.EpochLeadership
   ( test_golden_currentEpochEligibleLeadershipSlots
   ) where
 
-import           Cardano.Api (deterministicSigningKey)
+import           Cardano.Api (Key (verificationKeyHash), deterministicSigningKey,
+                   getVerificationKey)
 import           Cardano.Api.Block (EpochNo (..), Hash (StakePoolKeyHash), SlotNo (..))
 import           Cardano.Api.Eon.ShelleyBasedEra (ShelleyBasedEra (..))
 import           Cardano.Api.Genesis (shelleyGenesisDefaults)
@@ -17,7 +18,7 @@ import           Cardano.Api.LedgerState (currentEpochEligibleLeadershipSlots)
 import           Cardano.Api.Modes (ConsensusProtocol)
 import           Cardano.Api.Query (ProtocolState (..),
                    SerialisedPoolDistribution (SerialisedPoolDistribution))
-import           Cardano.Api.Shelley (VrfKey, proxyToAsType, unStakePoolKeyHash)
+import           Cardano.Api.Shelley (Hash (VrfKeyHash), VrfKey, proxyToAsType, unStakePoolKeyHash)
 
 import           Cardano.Binary (ToCBOR, serialize)
 import           Cardano.Crypto.Seed (mkSeedFromBytes)
@@ -29,11 +30,13 @@ import           Cardano.Slotting.EpochInfo (EpochInfo (..))
 import           Cardano.Slotting.Time (RelativeTime (..), mkSlotLength)
 import qualified Ouroboros.Consensus.Protocol.Abstract as Consensus
 import           Ouroboros.Consensus.Protocol.TPraos (TPraosState (..))
-import           Ouroboros.Consensus.Shelley.Ledger.Query.Types (PoolDistr (..))
+import           Ouroboros.Consensus.Shelley.Ledger.Query.Types (IndividualPoolStake (..),
+                   PoolDistr (..))
 import           Ouroboros.Network.Block (Serialised (..))
 
 import qualified Data.Map as Map
 import           Data.Proxy (Proxy (..))
+import           Data.Ratio ((%))
 import qualified Data.Set as Set
 import           Data.Time.Clock (secondsToNominalDiffTime)
 
@@ -54,21 +57,42 @@ test_golden_currentEpochEligibleLeadershipSlots =
   H.property $ do
     let sbe = ShelleyBasedEraShelley
         sGen = shelleyGenesisDefaults
-        eInfo = EpochInfo { epochInfoSize_ = const (Right (EpochSize 10))
-                          , epochInfoFirst_ = \(EpochNo x) -> pure $ SlotNo (x * 10)
-                          , epochInfoEpoch_ = \(SlotNo x) -> pure $ EpochNo (x `div` 10)
-                          , epochInfoSlotToRelativeTime_ = \(SlotNo x) -> pure $ RelativeTime (secondsToNominalDiffTime (fromIntegral x * 10))
-                          , epochInfoSlotLength_ = const (pure $ mkSlotLength 10)
+        eInfo = EpochInfo { epochInfoSize_ = const (Right (EpochSize 100))
+                          , epochInfoFirst_ = \(EpochNo x) -> pure $ SlotNo (x * 100)
+                          , epochInfoEpoch_ = \(SlotNo x) -> pure $ EpochNo (x `div` 100)
+                          , epochInfoSlotToRelativeTime_ = \(SlotNo x) -> pure $ RelativeTime (secondsToNominalDiffTime (fromIntegral x * 60))
+                          , epochInfoSlotLength_ = const (pure $ mkSlotLength 100)
                           }
         pp = emptyPParams
         chainDepState = TPraosState Origin (API.initialChainDepState NeutralNonce Map.empty)
         ptclState = encodeProtocolState chainDepState
-        poolid = StakePoolKeyHash { unStakePoolKeyHash = KeyHash "58eef2925db2789f76ea057c51069e52c5e0a44550f853c6cdf620f8" }
-        vrskey = deterministicSigningKey (proxyToAsType (Proxy :: Proxy VrfKey)) (mkSeedFromBytes "")
-        poolDistr :: PoolDistr StandardCrypto = PoolDistr Map.empty
+        poolid = StakePoolKeyHash { unStakePoolKeyHash = KeyHash "83c5da842d7437e411d3c4db8aaa7a7d2c1642aee932108c9857282d" }
+        vrskey1 = deterministicSigningKey (proxyToAsType (Proxy :: Proxy VrfKey)) (mkSeedFromBytes "V5UlALekTHL9bIbe3Yb0Kk4T49gn9smf")
+        VrfKeyHash hash1 = verificationKeyHash $ getVerificationKey vrskey1
+        vrskey2 = deterministicSigningKey (proxyToAsType (Proxy :: Proxy VrfKey)) (mkSeedFromBytes "OLjPbWC6JCjSwO4lqUms0EgkinoLoIhz")
+        VrfKeyHash hash2 = verificationKeyHash $ getVerificationKey vrskey2
+        vrskey3 = deterministicSigningKey (proxyToAsType (Proxy :: Proxy VrfKey)) (mkSeedFromBytes "eF0R2dENRrHM8iyb9q7puTw4y2l8e2z4")
+        VrfKeyHash hash3 = verificationKeyHash $ getVerificationKey vrskey3
+        poolDistr :: PoolDistr StandardCrypto = PoolDistr $
+          Map.fromList [ ( KeyHash "a2927c1e43974b036d8e6838d410279266946e8a094895cfc748c91d"
+                         , IndividualPoolStake { individualPoolStake = 1 % 3
+                                               , individualPoolStakeVrf = hash1
+                                               }
+                         )
+                       , ( KeyHash "83c5da842d7437e411d3c4db8aaa7a7d2c1642aee932108c9857282d"
+                         , IndividualPoolStake { individualPoolStake = 1 % 3
+                                               , individualPoolStakeVrf = hash2
+                                               }
+                         )
+                       , ( KeyHash "362c2c2128ee75ca39690c27b42e809301231098003443669e2b03f3"
+                         , IndividualPoolStake { individualPoolStake = 1 % 3
+                                               , individualPoolStakeVrf = hash3
+                                               }
+                         )
+                       ]
         serPoolDistr = SerialisedPoolDistribution (Serialised (serialize (toByronCBOR poolDistr)))
         currentEpoch = EpochNo 4
-        eEligibileSlots = currentEpochEligibleLeadershipSlots sbe sGen eInfo pp ptclState poolid vrskey serPoolDistr currentEpoch
-        expectedEligibleSlots = [SlotNo 2, SlotNo 6]
+        eEligibileSlots = currentEpochEligibleLeadershipSlots sbe sGen eInfo pp ptclState poolid vrskey1 serPoolDistr currentEpoch
+        expectedEligibleSlots = [ SlotNo 406, SlotNo 432, SlotNo 437, SlotNo 443, SlotNo 484 ]
     eligibileSlots <- H.evalEither eEligibileSlots
     eligibileSlots H.=== Set.fromList expectedEligibleSlots