diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index d4dd7f431901..b117cc472864 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -3053,7 +3053,7 @@ func testSendingStateChangeEvents(t *testing.T, numberOfEventsToSend int) {
 		key2, _    = crypto.HexToECDSA("8a1f9a8f95be41cd7ccb6168179afb4504aefe388d1e14474d32c45c72ce7b7a")
 		addr2      = crypto.PubkeyToAddress(key2.PublicKey)
 		db         = rawdb.NewMemoryDatabase()
-		gspec      = &Genesis{Config: params.TestChainConfig, Alloc: GenesisAlloc{addr1: {Balance: big.NewInt(10000000000000)}}}
+		gspec      = &Genesis{Config: params.TestChainConfig, Alloc: GenesisAlloc{addr1: {Balance: big.NewInt(100000000000000)}}}
 		genesis    = gspec.MustCommit(db)
 		signer     = types.NewEIP155Signer(gspec.Config.ChainID)
 		newEventCh = make(chan bool)
@@ -3067,7 +3067,7 @@ func testSendingStateChangeEvents(t *testing.T, numberOfEventsToSend int) {
 
 	// create numberOfEventsToSend blocks that include State Changes
 	chain, _ := GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), db, numberOfEventsToSend, func(i int, block *BlockGen) {
-		tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(addr1), addr2, big.NewInt(10000), params.TxGas, nil, nil), signer, key1)
+		tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(addr1), addr2, big.NewInt(10000), params.TxGas, block.header.BaseFee, nil), signer, key1)
 		block.AddTx(tx)
 	})
 
diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index b4d73557559f..49ecfd2bb135 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_test.go
@@ -690,11 +690,13 @@ func flattenLogs(pl [][]*types.Log) []*types.Log {
 }
 
 func TestStateChangeSubscription(t *testing.T) {
+	t.Parallel()
+
 	var (
 		db             = rawdb.NewMemoryDatabase()
 		backend        = &testBackend{db: db}
-		api            = NewPublicFilterAPI(backend, false)
-		genesis        = new(core.Genesis).MustCommit(db)
+		api            = NewPublicFilterAPI(backend, false, deadline)
+		genesis        = (&core.Genesis{BaseFee: big.NewInt(params.InitialBaseFee)}).MustCommit(db)
 		numberOfBlocks = 3
 		chain, _       = core.GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), db, numberOfBlocks, func(i int, gen *core.BlockGen) {})