diff --git a/e2e/txpool_test.go b/e2e/txpool_test.go
index 1bf08c865f..8b19d5434c 100644
--- a/e2e/txpool_test.go
+++ b/e2e/txpool_test.go
@@ -5,8 +5,6 @@ import (
 	"crypto/ecdsa"
 	"errors"
 	"math/big"
-	"os"
-	"path/filepath"
 	"testing"
 	"time"
 
@@ -26,20 +24,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	wd, err := os.Getwd()
-	if err != nil {
-		return
-	}
-
-	parent := filepath.Dir(wd)
-	wd = filepath.Join(parent, "artifacts/polygon-edge")
-	os.Setenv("EDGE_BINARY", wd)
-	os.Setenv("E2E_TESTS", "true")
-	os.Setenv("E2E_LOGS", "true")
-	os.Setenv("E2E_LOG_LEVEL", "debug")
-}
-
 var (
 	oneEth = framework.EthToWei(1)
 	signer = crypto.NewSigner(chain.AllForksEnabled.At(0), 100)
diff --git a/gasprice/gasprice_test.go b/gasprice/gasprice_test.go
index a148f2ccad..207f8439c8 100644
--- a/gasprice/gasprice_test.go
+++ b/gasprice/gasprice_test.go
@@ -90,6 +90,7 @@ func TestGasHelper_MaxPriorityFeePerGas(t *testing.T) {
 							To:        &types.ZeroAddress,
 							GasTipCap: ethgo.Gwei(uint64(rand.Intn(200))),
 							GasFeeCap: ethgo.Gwei(uint64(rand.Intn(200) + 200)),
+							ChainID:   big.NewInt(backend.Config().ChainID),
 						})
 
 						tx, err := signer.SignTx(tx, senderKey)
@@ -224,6 +225,7 @@ func createTestTxs(t *testing.T, backend *backendMock, numOfTxsPerBlock, txCap i
 				To:        &types.ZeroAddress,
 				GasTipCap: ethgo.Gwei(uint64(rand.Intn(txCap))),
 				GasFeeCap: ethgo.Gwei(uint64(rand.Intn(txCap) + txCap)),
+				ChainID:   big.NewInt(backend.Config().ChainID),
 			})
 
 			tx, err := signer.SignTx(tx, senderKey)
diff --git a/jsonrpc/testsuite/block-with-txn-full.json b/jsonrpc/testsuite/block-with-txn-full.json
index 6f2a00489b..171bfebee5 100644
--- a/jsonrpc/testsuite/block-with-txn-full.json
+++ b/jsonrpc/testsuite/block-with-txn-full.json
@@ -33,7 +33,8 @@
             "blockHash": "0x7935c790bdff1ec20912f28c9f7722eed41837c478a1f9ce0dc49f5d4a2d7c88",
             "blockNumber": "0x14",
             "transactionIndex": "0x0",
-            "type": "0x0"
+            "type": "0x0",
+            "chainId": "0x7fffffffffffffef"
         },
         {
             "nonce": "0x0",
@@ -50,7 +51,8 @@
             "blockHash": "0x7935c790bdff1ec20912f28c9f7722eed41837c478a1f9ce0dc49f5d4a2d7c88",
             "blockNumber": "0x14",
             "transactionIndex": "0x1",
-            "type": "0x0"
+            "type": "0x0",
+            "chainId": "0x7fffffffffffffef"
         }
     ],
     "uncles": [],