diff --git a/x/gov/keeper/old_proposal_test.go b/x/gov/keeper/old_proposal_test.go
index e65126df5..1ddfa916d 100644
--- a/x/gov/keeper/old_proposal_test.go
+++ b/x/gov/keeper/old_proposal_test.go
@@ -13,30 +13,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
-func TestActivateVotingPeriod(t *testing.T) {
-	ctx, _, _, keeper, _, _ := createTestInput(t, false, 100) // nolint: dogsled
-
-	tp := TestProposal
-	proposal, err := keeper.SubmitProposal(ctx, tp)
-	require.NoError(t, err)
-
-	require.True(t, proposal.VotingStartTime.Equal(time.Time{}))
-
-	keeper.ActivateVotingPeriod(ctx, proposal)
-
-	require.True(t, proposal.VotingStartTime.Equal(ctx.BlockHeader().Time))
-
-	proposal, ok := keeper.GetProposal(ctx, proposal.ProposalID)
-	require.True(t, ok)
-
-	activeIterator := keeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
-	require.True(t, activeIterator.Valid())
-
-	proposalID := types.GetProposalIDFromBytes(activeIterator.Value())
-	require.Equal(t, proposalID, proposal.ProposalID)
-	activeIterator.Close()
-}
-
 type validProposal struct{}
 
 func (validProposal) GetTitle() string       { return "title" }
diff --git a/x/gov/keeper/proposal_test.go b/x/gov/keeper/proposal_test.go
index 1158e54dc..4b6df06e5 100644
--- a/x/gov/keeper/proposal_test.go
+++ b/x/gov/keeper/proposal_test.go
@@ -2,12 +2,14 @@ package keeper_test
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
 func TestGetSetProposal(t *testing.T) {
@@ -24,3 +26,28 @@ func TestGetSetProposal(t *testing.T) {
 	require.True(t, ok)
 	require.True(t, ProposalEqual(proposal, gotProposal))
 }
+
+func TestActivateVotingPeriod(t *testing.T) {
+	app := simapp.Setup(false)
+	ctx := app.BaseApp.NewContext(false, abci.Header{})
+
+	tp := TestProposal
+	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
+	require.NoError(t, err)
+
+	require.True(t, proposal.VotingStartTime.Equal(time.Time{}))
+
+	app.GovKeeper.ActivateVotingPeriod(ctx, proposal)
+
+	require.True(t, proposal.VotingStartTime.Equal(ctx.BlockHeader().Time))
+
+	proposal, ok := app.GovKeeper.GetProposal(ctx, proposal.ProposalID)
+	require.True(t, ok)
+
+	activeIterator := app.GovKeeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
+	require.True(t, activeIterator.Valid())
+
+	proposalID := types.GetProposalIDFromBytes(activeIterator.Value())
+	require.Equal(t, proposalID, proposal.ProposalID)
+	activeIterator.Close()
+}