diff --git a/test/e2e/btc_staking_e2e_test.go b/test/e2e/btc_staking_e2e_test.go
index 08edcfe05..a6194d36f 100644
--- a/test/e2e/btc_staking_e2e_test.go
+++ b/test/e2e/btc_staking_e2e_test.go
@@ -84,7 +84,8 @@ func (s *BTCStakingTestSuite) Test1CreateFinalityProviderAndDelegation() {
 		create a random finality provider on Babylon
 	*/
 	// NOTE: we use the node's secret key as Babylon secret key for the finality provider
-	fp, err := datagen.GenRandomCustomFinalityProvider(r, fpBTCSK, nonValidatorNode.SecretKey, "")
+	fp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, fpBTCSK, "")
+
 	s.NoError(err)
 	nonValidatorNode.CreateFinalityProvider("val", fp.BtcPk, fp.Pop, fp.Description.Moniker, fp.Description.Identity, fp.Description.Website, fp.Description.SecurityContact, fp.Description.Details, fp.Commission)
 
diff --git a/test/e2e/btc_staking_integration_e2e_test.go b/test/e2e/btc_staking_integration_e2e_test.go
index 46ca8a49f..26b44e30a 100644
--- a/test/e2e/btc_staking_integration_e2e_test.go
+++ b/test/e2e/btc_staking_integration_e2e_test.go
@@ -416,7 +416,8 @@ func (s *BTCStakingIntegrationTestSuite) createVerifyConsumerFP(babylonNode *cha
 	*/
 	// NOTE: we use the node's secret key as Babylon secret key for the finality provider
 	czFpBTCSK, _, _ := datagen.GenRandomBTCKeyPair(r)
-	czFp, err := datagen.GenRandomCustomFinalityProvider(r, czFpBTCSK, babylonNode.SecretKey, consumerId)
+	czFp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, czFpBTCSK, consumerId)
+
 	s.NoError(err)
 	babylonNode.CreateConsumerFinalityProvider(
 		"val",
@@ -447,7 +448,7 @@ func (s *BTCStakingIntegrationTestSuite) createVerifyBabylonFP(babylonNode *chai
 	*/
 	// NOTE: we use the node's secret key as Babylon secret key for the finality provider
 	babylonFpBTCSK, _, _ := datagen.GenRandomBTCKeyPair(r)
-	babylonFp, err := datagen.GenRandomCustomFinalityProvider(r, babylonFpBTCSK, babylonNode.SecretKey, "")
+	babylonFp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, babylonFpBTCSK, "")
 	s.NoError(err)
 	babylonNode.CreateFinalityProvider("val", babylonFp.BtcPk, babylonFp.Pop, babylonFp.Description.Moniker, babylonFp.Description.Identity, babylonFp.Description.Website, babylonFp.Description.SecurityContact, babylonFp.Description.Details, babylonFp.Commission)
 
diff --git a/testutil/datagen/btcstaking.go b/testutil/datagen/btcstaking.go
index 834e003d4..195c5a0cb 100644
--- a/testutil/datagen/btcstaking.go
+++ b/testutil/datagen/btcstaking.go
@@ -1,7 +1,6 @@
 package datagen
 
 import (
-	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"math/rand"
 	"testing"
 
@@ -80,11 +79,6 @@ func GenRandomFinalityProviderWithBTCBabylonSKs(r *rand.Rand, btcSK *btcec.Priva
 	}, nil
 }
 
-func GenRandomCustomFinalityProvider(r *rand.Rand, btcSK *btcec.PrivateKey, bbnSK cryptotypes.PrivKey, consumerID string) (*bstypes.FinalityProvider, error) {
-	fpAddr := sdk.MustAccAddressFromBech32(bbnSK.PubKey().Address().String())
-	return GenRandomFinalityProviderWithBTCBabylonSKs(r, btcSK, fpAddr, consumerID)
-}
-
 // TODO: accomodate presign unbonding flow
 func GenRandomBTCDelegation(
 	r *rand.Rand,
diff --git a/x/finality/keeper/grpc_query_test.go b/x/finality/keeper/grpc_query_test.go
index 3de56cd85..885e8295c 100644
--- a/x/finality/keeper/grpc_query_test.go
+++ b/x/finality/keeper/grpc_query_test.go
@@ -198,10 +198,8 @@ func FuzzListPubRandCommit(f *testing.F) {
 		sk, _, err := datagen.GenRandomBTCKeyPair(r)
 		bip340PK := bbn.NewBIP340PubKeyFromBTCPK(sk.PubKey())
 		require.NoError(t, err)
-		bbnSK, _, err := datagen.GenRandomSecp256k1KeyPair(r)
-		require.NoError(t, err)
 		// register finality provider
-		fp, err := datagen.GenRandomCustomFinalityProvider(r, sk, bbnSK, "")
+		fp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, sk, "")
 		require.NoError(t, err)
 		bsKeeper.EXPECT().GetFinalityProvider(gomock.Any(), gomock.Eq(bip340PK.MustMarshal())).Return(fp, nil).AnyTimes()
 		bsKeeper.EXPECT().HasFinalityProvider(gomock.Any(), gomock.Eq(bip340PK.MustMarshal())).Return(true).AnyTimes()
diff --git a/x/finality/keeper/msg_server_test.go b/x/finality/keeper/msg_server_test.go
index 07a799904..cc78f0fd7 100644
--- a/x/finality/keeper/msg_server_test.go
+++ b/x/finality/keeper/msg_server_test.go
@@ -107,9 +107,7 @@ func FuzzAddFinalitySig(f *testing.F) {
 		// create and register a random finality provider
 		btcSK, btcPK, err := datagen.GenRandomBTCKeyPair(r)
 		require.NoError(t, err)
-		bbnSK, _, err := datagen.GenRandomSecp256k1KeyPair(r)
-		require.NoError(t, err)
-		fp, err := datagen.GenRandomCustomFinalityProvider(r, btcSK, bbnSK, "")
+		fp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, btcSK, "")
 		require.NoError(t, err)
 		fpBTCPK := bbn.NewBIP340PubKeyFromBTCPK(btcPK)
 		fpBTCPKBytes := fpBTCPK.MustMarshal()
@@ -215,9 +213,7 @@ func TestVoteForConflictingHashShouldRetrieveEvidenceAndSlash(t *testing.T) {
 	// create and register a random finality provider
 	btcSK, btcPK, err := datagen.GenRandomBTCKeyPair(r)
 	require.NoError(t, err)
-	bbnSK, _, err := datagen.GenRandomSecp256k1KeyPair(r)
-	require.NoError(t, err)
-	fp, err := datagen.GenRandomCustomFinalityProvider(r, btcSK, bbnSK, "")
+	fp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, btcSK, "")
 	require.NoError(t, err)
 	fpBTCPK := bbn.NewBIP340PubKeyFromBTCPK(btcPK)
 	fpBTCPKBytes := fpBTCPK.MustMarshal()
diff --git a/x/finality/keeper/votes_bench_test.go b/x/finality/keeper/votes_bench_test.go
index 05ac0bae2..2bd8ae413 100644
--- a/x/finality/keeper/votes_bench_test.go
+++ b/x/finality/keeper/votes_bench_test.go
@@ -31,9 +31,8 @@ func benchmarkAddFinalitySig(b *testing.B) {
 	require.NoError(b, err)
 	fpBTCPK := bbn.NewBIP340PubKeyFromBTCPK(btcPK)
 	fpBTCPKBytes := fpBTCPK.MustMarshal()
-	bbnSK, _, err := datagen.GenRandomSecp256k1KeyPair(r)
 	require.NoError(b, err)
-	fp, err := datagen.GenRandomCustomFinalityProvider(r, btcSK, bbnSK, "")
+	fp, err := datagen.GenRandomFinalityProviderWithBTCSK(r, btcSK, "")
 	require.NoError(b, err)
 
 	// register the finality provider