diff --git a/tests/integration/server/grpc/out_of_gas_test.go b/tests/integration/server/grpc/out_of_gas_test.go
index f662d2a25ff8..4a91d3e05201 100644
--- a/tests/integration/server/grpc/out_of_gas_test.go
+++ b/tests/integration/server/grpc/out_of_gas_test.go
@@ -17,6 +17,7 @@ import (
 	_ "cosmossdk.io/x/consensus"
 	_ "cosmossdk.io/x/staking"
 
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/testutil/configurator"
 	"github.com/cosmos/cosmos-sdk/testutil/network"
@@ -36,7 +37,7 @@ func (s *IntegrationTestOutOfGasSuite) SetupSuite() {
 	var err error
 	s.T().Log("setting up integration test suite")
 
-	s.cfg, err = network.DefaultConfigWithAppConfigWithQueryGasLimit(configurator.NewAppConfig(
+	s.cfg, err = network.DefaultConfigWithAppConfig(configurator.NewAppConfig(
 		configurator.AccountsModule(),
 		configurator.AuthModule(),
 		configurator.BankModule(),
@@ -44,7 +45,7 @@ func (s *IntegrationTestOutOfGasSuite) SetupSuite() {
 		configurator.StakingModule(),
 		configurator.ConsensusModule(),
 		configurator.TxModule(),
-	), 10)
+	), baseapp.SetQueryGasLimit(10))
 	s.NoError(err)
 	s.cfg.NumValidators = 1
 
diff --git a/testutil/network/network.go b/testutil/network/network.go
index fb2bbd54ae69..e34afc44b4f1 100644
--- a/testutil/network/network.go
+++ b/testutil/network/network.go
@@ -163,11 +163,7 @@ func DefaultConfig(factory TestFixtureFactory) Config {
 	}
 }
 
-func DefaultConfigWithAppConfig(appConfig depinject.Config) (Config, error) {
-	return DefaultConfigWithAppConfigWithQueryGasLimit(appConfig, 0)
-}
-
-func DefaultConfigWithAppConfigWithQueryGasLimit(appConfig depinject.Config, queryGasLimit uint64) (Config, error) {
+func DefaultConfigWithAppConfig(appConfig depinject.Config, baseappOpts ...func(*baseapp.BaseApp)) (Config, error) {
 	var (
 		appBuilder            *runtime.AppBuilder
 		txConfig              client.TxConfig
@@ -222,10 +218,11 @@ func DefaultConfigWithAppConfigWithQueryGasLimit(appConfig depinject.Config, que
 		app := appBuilder.Build(
 			dbm.NewMemDB(),
 			nil,
-			baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)),
-			baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices),
-			baseapp.SetChainID(cfg.ChainID),
-			baseapp.SetQueryGasLimit(queryGasLimit),
+			append(baseappOpts,
+				baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)),
+				baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices),
+				baseapp.SetChainID(cfg.ChainID),
+			)...,
 		)
 
 		testdata.RegisterQueryServer(app.GRPCQueryRouter(), testdata.QueryImpl{})