diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index 25f37e811c..39820c1e6d 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_test.go
@@ -160,7 +160,7 @@ func (b *testBackend) NewMatcherBackend() filtermaps.MatcherBackend {
 
 func (b *testBackend) startFilterMaps(history uint64, noHistory bool, params filtermaps.Params) {
 	head := b.CurrentBlock()
-	b.fm = filtermaps.NewFilterMaps(b.db, filtermaps.NewStoredChainView(b, head.Number.Uint64(), head.Hash()), params, history, 1, noHistory, "")
+	b.fm = filtermaps.NewFilterMaps(b.db, filtermaps.NewChainView(b, head.Number.Uint64(), head.Hash()), params, history, 1, noHistory, "")
 	b.fm.Start()
 	b.fm.WaitIdle()
 }
diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go
index f2ea5fad62..10a73a137c 100644
--- a/eth/filters/filter_test.go
+++ b/eth/filters/filter_test.go
@@ -476,7 +476,7 @@ func TestRangeLogs(t *testing.T) {
 
 	updateHead := func() {
 		head := bc.CurrentBlock()
-		backend.fm.TargetViewCh <- filtermaps.NewStoredChainView(backend, head.Number.Uint64(), head.Hash())
+		backend.fm.SetTargetView(filtermaps.NewChainView(backend, head.Number.Uint64(), head.Hash()))
 		backend.fm.WaitIdle()
 	}