diff --git a/tests/systemtests/genesis_io.go b/tests/systemtests/genesis_io.go
index df2081ba0924..f3a61e54a2dd 100644
--- a/tests/systemtests/genesis_io.go
+++ b/tests/systemtests/genesis_io.go
@@ -33,6 +33,15 @@ func SetGovVotingPeriod(t *testing.T, period time.Duration) GenesisMutator {
 	}
 }
 
+func SetGovExpeditedVotingPeriod(t *testing.T, period time.Duration) GenesisMutator {
+	t.Helper()
+	return func(genesis []byte) []byte {
+		state, err := sjson.SetRawBytes(genesis, "app_state.gov.params.expedited_voting_period", []byte(fmt.Sprintf("%q", period.String())))
+		require.NoError(t, err)
+		return state
+	}
+}
+
 // GetGenesisBalance return the balance amount for an address from the given genesis json
 func GetGenesisBalance(rawGenesis []byte, addr string) sdk.Coins {
 	var r []sdk.Coin
diff --git a/tests/systemtests/gov_test.go b/tests/systemtests/gov_test.go
index 092773dc2053..b3270275b454 100644
--- a/tests/systemtests/gov_test.go
+++ b/tests/systemtests/gov_test.go
@@ -375,6 +375,13 @@ func TestQueryDeposit(t *testing.T) {
 
 	sut.ResetChain(t)
 	cli := NewCLIWrapper(t, sut, verbose)
+	// short voting period
+	// update expedited voting period to avoid validation error
+	sut.ModifyGenesisJSON(
+		t,
+		SetGovVotingPeriod(t, time.Second*8),
+		SetGovExpeditedVotingPeriod(t, time.Second*7),
+	)
 
 	// get validator address
 	valAddr := gjson.Get(cli.Keys("keys", "list"), "0.address").String()
diff --git a/tests/systemtests/snapshots_test.go b/tests/systemtests/snapshots_test.go
index d80eb530f413..c4d6b257fc93 100644
--- a/tests/systemtests/snapshots_test.go
+++ b/tests/systemtests/snapshots_test.go
@@ -89,7 +89,7 @@ func TestPrune(t *testing.T) {
 	// prune
 	var command []string
 	if isV2() {
-		command = []string{"store", "prune", "--keep-recent=1"}
+		command = []string{"store", "prune", "--store.keep-recent=1"}
 	} else {
 		command = []string{"prune", "everything"}
 	}
diff --git a/tests/systemtests/system.go b/tests/systemtests/system.go
index f42bf96a79cd..adaa6da91d77 100644
--- a/tests/systemtests/system.go
+++ b/tests/systemtests/system.go
@@ -134,16 +134,6 @@ func (s *SystemUnderTest) SetupChain() {
 	if err != nil {
 		panic(fmt.Sprintf("failed to set block max gas: %s", err))
 	}
-	// Short period for gov
-	genesisBz, err = sjson.SetRawBytes(genesisBz, "app_state.gov.params.voting_period", []byte(fmt.Sprintf(`"%s"`, "8s")))
-	if err != nil {
-		panic(fmt.Sprintf("failed to set regular voting period: %s", err))
-	}
-	// update expedited voting period to avoid validation error
-	genesisBz, err = sjson.SetRawBytes(genesisBz, "app_state.gov.params.expedited_voting_period", []byte(fmt.Sprintf(`"%s"`, "7s")))
-	if err != nil {
-		panic(fmt.Sprintf("failed to set expedited voting period: %s", err))
-	}
 	s.withEachNodeHome(func(i int, home string) {
 		if err := saveGenesis(home, genesisBz); err != nil {
 			panic(err)