diff --git a/x/gov/keeper/keeper_test.go b/x/gov/keeper/keeper_test.go
index 9cd2a0559e..e824760d1c 100644
--- a/x/gov/keeper/keeper_test.go
+++ b/x/gov/keeper/keeper_test.go
@@ -1,51 +1,26 @@
-package keeper
+package keeper_test
 
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/cosmos/cosmos-sdk/simapp"
+	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/cosmos/cosmos-sdk/x/gov/types"
+	"github.com/stretchr/testify/require"
 )
 
 func TestIncrementProposalNumber(t *testing.T) {
-	ctx, _, _, keeper, _, _ := createTestInput(t, false, 100) // nolint: dogsled
+	app := simapp.Setup(false)
+	ctx := app.BaseApp.NewContext(false, abci.Header{})
 
 	tp := TestProposal
-	keeper.SubmitProposal(ctx, tp)
-	keeper.SubmitProposal(ctx, tp)
-	keeper.SubmitProposal(ctx, tp)
-	keeper.SubmitProposal(ctx, tp)
-	keeper.SubmitProposal(ctx, tp)
-	proposal6, err := keeper.SubmitProposal(ctx, tp)
+	app.GovKeeper.SubmitProposal(ctx, tp)
+	app.GovKeeper.SubmitProposal(ctx, tp)
+	app.GovKeeper.SubmitProposal(ctx, tp)
+	app.GovKeeper.SubmitProposal(ctx, tp)
+	app.GovKeeper.SubmitProposal(ctx, tp)
+	proposal6, err := app.GovKeeper.SubmitProposal(ctx, tp)
 	require.NoError(t, err)
 
 	require.Equal(t, uint64(6), proposal6.ProposalID)
 }
-
-func TestProposalQueues(t *testing.T) {
-	ctx, _, _, keeper, _, _ := createTestInput(t, false, 100) // nolint: dogsled
-
-	// create test proposals
-	tp := TestProposal
-	proposal, err := keeper.SubmitProposal(ctx, tp)
-	require.NoError(t, err)
-
-	inactiveIterator := keeper.InactiveProposalQueueIterator(ctx, proposal.DepositEndTime)
-	require.True(t, inactiveIterator.Valid())
-
-	proposalID := types.GetProposalIDFromBytes(inactiveIterator.Value())
-	require.Equal(t, proposalID, proposal.ProposalID)
-	inactiveIterator.Close()
-
-	keeper.activateVotingPeriod(ctx, proposal)
-
-	proposal, ok := keeper.GetProposal(ctx, proposal.ProposalID)
-	require.True(t, ok)
-
-	activeIterator := keeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
-	require.True(t, activeIterator.Valid())
-	keeper.cdc.UnmarshalBinaryLengthPrefixed(activeIterator.Value(), &proposalID)
-	require.Equal(t, proposalID, proposal.ProposalID)
-	activeIterator.Close()
-}
diff --git a/x/gov/keeper/old_keeper_test.go b/x/gov/keeper/old_keeper_test.go
new file mode 100644
index 0000000000..4b21f3eac6
--- /dev/null
+++ b/x/gov/keeper/old_keeper_test.go
@@ -0,0 +1,36 @@
+package keeper
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/cosmos/cosmos-sdk/x/gov/types"
+)
+
+func TestProposalQueues(t *testing.T) {
+	ctx, _, _, keeper, _, _ := createTestInput(t, false, 100) // nolint: dogsled
+
+	// create test proposals
+	tp := TestProposal
+	proposal, err := keeper.SubmitProposal(ctx, tp)
+	require.NoError(t, err)
+
+	inactiveIterator := keeper.InactiveProposalQueueIterator(ctx, proposal.DepositEndTime)
+	require.True(t, inactiveIterator.Valid())
+
+	proposalID := types.GetProposalIDFromBytes(inactiveIterator.Value())
+	require.Equal(t, proposalID, proposal.ProposalID)
+	inactiveIterator.Close()
+
+	keeper.activateVotingPeriod(ctx, proposal)
+
+	proposal, ok := keeper.GetProposal(ctx, proposal.ProposalID)
+	require.True(t, ok)
+
+	activeIterator := keeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
+	require.True(t, activeIterator.Valid())
+	keeper.cdc.UnmarshalBinaryLengthPrefixed(activeIterator.Value(), &proposalID)
+	require.Equal(t, proposalID, proposal.ProposalID)
+	activeIterator.Close()
+}