diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go
index 5d67bd03f..3776a652c 100644
--- a/tests/interchaintest/setup.go
+++ b/tests/interchaintest/setup.go
@@ -178,6 +178,7 @@ func CreateChain(t *testing.T, numVals, numFullNodes int, opts ...func(*ibc.Chai
 
 	chainSpecs["orai"].NumFullNodes = &numFullNodes
 	chainSpecs["orai"].NumValidators = &numVals
+	chainSpecs["orai"].ChainConfig = oraiConfig
 
 	cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
 		chainSpecs["orai"],
diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go
index 96ba7f14c..be240eae6 100644
--- a/x/wasm/keeper/keeper.go
+++ b/x/wasm/keeper/keeper.go
@@ -416,7 +416,12 @@ func (k Keeper) execute(ctx context.Context, contractAddress, caller sdk.AccAddr
 
 	// prepare querier
 	querier := k.newQueryHandler(sdkCtx, contractAddress)
-	gasLeft := k.runtimeGasForContract(sdkCtx)
+	var gasLeft uint64
+	if isGasLess {
+		gasLeft = math.MaxUint64
+	} else {
+		gasLeft = k.runtimeGasForContract(sdkCtx)
+	}
 	res, gasUsed, execErr := k.wasmVM.Execute(codeInfo.CodeHash, env, info, msg, prefixStore, cosmwasmAPI, querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
 	// consume gas wasmvm if it isn't gas less contract
 	if !isGasLess {