diff --git a/tests/Makefile b/tests/Makefile
index 95df468c77..3f837cd5bf 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,11 +1,11 @@
 test-integration:
-	go test ./integration/... -timeout 30m
+	go test -failfast ./integration/... -timeout 30m
 
 test-integration-cov:
-	go test ./integration/... -timeout 30m -coverpkg=../... -coverprofile=integration-profile.out -covermode=atomic
+	go test -failfast ./integration/... -timeout 30m -coverpkg=../... -coverprofile=integration-profile.out -covermode=atomic
 
 test-e2e:
-	go test ./e2e/... -mod=readonly -timeout 30m -race -tags='e2e'
+	go test ./e2e/... -failfast -mod=readonly -timeout 30m -race -tags='e2e'
 
 test-e2e-cov:
-	go test ./e2e/... -mod=readonly -timeout 30m -race -tags='e2e' -coverpkg=../... -coverprofile=e2e-profile.out -covermode=atomic
\ No newline at end of file
+	go test ./e2e/... -failfast -mod=readonly -timeout 30m -race -tags='e2e' -coverpkg=../... -coverprofile=e2e-profile.out -covermode=atomic
\ No newline at end of file
diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go
index ed2c7cdf79..90ee30a888 100644
--- a/x/upgrade/keeper/keeper.go
+++ b/x/upgrade/keeper/keeper.go
@@ -434,7 +434,7 @@ func (k Keeper) IsUpgraded(ctx sdk.Context, name string) bool {
 
 // InitUpgraded execute the upgrade initializer that the upgrade is already applied.
 func (k Keeper) InitUpgraded(ctx sdk.Context) error {
-	iter := storetypes.KVStorePrefixIterator(ctx.KVStore(k.storeKey), []byte{types.DoneByte})
+	iter := storetypes.KVStorePrefixIterator(ctx.KVStoreWithZeroRead(k.storeKey), []byte{types.DoneByte})
 	defer iter.Close()
 
 	for ; iter.Valid(); iter.Next() {
diff --git a/x/upgrade/types/upgrade_config.go b/x/upgrade/types/upgrade_config.go
index 10a4a95125..f280ab4c05 100644
--- a/x/upgrade/types/upgrade_config.go
+++ b/x/upgrade/types/upgrade_config.go
@@ -58,6 +58,10 @@ var (
 		Name:   Ural,
 		Height: 5347231,
 		Info:   "Ural hardfork",
+	}).SetPlan(&Plan{
+		Name:   Pawnee,
+		Height: 6239520,
+		Info:   "Pawnee hardfork",
 	})
 
 	TestnetChainID = "greenfield_5600-1"
@@ -85,6 +89,10 @@ var (
 		Name:   Ural,
 		Height: 5761391,
 		Info:   "Ural hardfork",
+	}).SetPlan(&Plan{
+		Name:   Pawnee,
+		Height: 6623127,
+		Info:   "Pawnee hardfork",
 	})
 )