diff --git a/x/epochs/keeper/setup_test.go b/x/epochs/keeper/setup_test.go
index 669060ee..b236b353 100644
--- a/x/epochs/keeper/setup_test.go
+++ b/x/epochs/keeper/setup_test.go
@@ -38,13 +38,4 @@ func (suite *KeeperTestSuite) SetupTest() {
 	queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.app.InterfaceRegistry())
 	types.RegisterQueryServer(queryHelper, suite.app.EpochsKeeper)
 	suite.queryClient = types.NewQueryClient(queryHelper)
-
-	identifiers := []string{types.IncentiveEpochId}
-	for _, identifier := range identifiers {
-		epoch, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, identifier)
-		suite.Require().True(found)
-		epoch.StartTime = suite.ctx.BlockTime()
-		epoch.CurrentEpochStartHeight = suite.ctx.BlockHeight()
-		suite.app.EpochsKeeper.SetEpochInfo(suite.ctx, epoch)
-	}
 }
diff --git a/x/registry/keeper/setup_test.go b/x/registry/keeper/setup_test.go
index b47e1877..42335286 100644
--- a/x/registry/keeper/setup_test.go
+++ b/x/registry/keeper/setup_test.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/mycel-domain/mycel/testutil"
-	epochstypes "github.com/mycel-domain/mycel/x/epochs/types"
 
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -50,16 +49,6 @@ func (suite *KeeperTestSuite) SetupTest() {
 	// Init bank keeper
 	suite.app.BankKeeper.InitGenesis(suite.ctx, getBankGenesis())
 
-	// Setup epochs
-	identifiers := []string{epochstypes.IncentiveEpochId}
-	for _, identifier := range identifiers {
-		epoch, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, identifier)
-		suite.Require().True(found)
-		epoch.StartTime = suite.ctx.BlockTime()
-		epoch.CurrentEpochStartHeight = suite.ctx.BlockHeight()
-		suite.app.EpochsKeeper.SetEpochInfo(suite.ctx, epoch)
-	}
-
 }
 
 func makeBalance(address string, balance int64) banktypes.Balance {
diff --git a/x/resolver/keeper/setup_test.go b/x/resolver/keeper/setup_test.go
index b47e1877..72299998 100644
--- a/x/resolver/keeper/setup_test.go
+++ b/x/resolver/keeper/setup_test.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/mycel-domain/mycel/testutil"
-	epochstypes "github.com/mycel-domain/mycel/x/epochs/types"
 
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -49,17 +48,6 @@ func (suite *KeeperTestSuite) SetupTest() {
 
 	// Init bank keeper
 	suite.app.BankKeeper.InitGenesis(suite.ctx, getBankGenesis())
-
-	// Setup epochs
-	identifiers := []string{epochstypes.IncentiveEpochId}
-	for _, identifier := range identifiers {
-		epoch, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, identifier)
-		suite.Require().True(found)
-		epoch.StartTime = suite.ctx.BlockTime()
-		epoch.CurrentEpochStartHeight = suite.ctx.BlockHeight()
-		suite.app.EpochsKeeper.SetEpochInfo(suite.ctx, epoch)
-	}
-
 }
 
 func makeBalance(address string, balance int64) banktypes.Balance {