diff --git a/pkg/executor/test/oomtest/oom_test.go b/pkg/executor/test/oomtest/oom_test.go
index 3a836b8606..1da27313b8 100644
--- a/pkg/executor/test/oomtest/oom_test.go
+++ b/pkg/executor/test/oomtest/oom_test.go
@@ -96,6 +96,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
 
 	tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
 	require.Equal(t, "", oom.GetTracker())
+	oom.ClearMessageFilter()
 	oom.AddMessageFilter("expensive_query during bootstrap phase")
 	tk.Session().GetSessionVars().MemQuotaQuery = 1
 	tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
@@ -111,6 +112,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
 
 	tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec select * from t")
 	require.Equal(t, "", oom.GetTracker())
+	oom.ClearMessageFilter()
 	oom.AddMessageFilter("expensive_query during bootstrap phase")
 	tk.Session().GetSessionVars().MemQuotaQuery = 1
 	tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec select * from t")
@@ -122,6 +124,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
 
 	tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec select * from t")
 	require.Equal(t, "", oom.GetTracker())
+	oom.ClearMessageFilter()
 	oom.AddMessageFilter("expensive_query during bootstrap phase")
 	tk.Session().GetSessionVars().MemQuotaQuery = 1
 	tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec select * from t")
@@ -136,6 +139,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
 
 	tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
 	require.Equal(t, "", oom.GetTracker())
+	oom.ClearMessageFilter()
 	oom.AddMessageFilter("expensive_query during bootstrap phase")
 	tk.Session().GetSessionVars().MemQuotaQuery = 1
 	tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
@@ -149,6 +153,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
 
 	tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
 	require.Equal(t, "", oom.GetTracker())
+	oom.ClearMessageFilter()
 	oom.AddMessageFilter("expensive_query during bootstrap phase")
 	tk.Session().GetSessionVars().MemQuotaQuery = 1
 	tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
@@ -269,7 +274,7 @@ func (h *oomCapture) Write(entry zapcore.Entry, fields []zapcore.Field) error {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	// They are just common background task and not related to the oom.
-	if !h.messageFilter.Empty() && !h.messageFilter.Exist(entry.Message) {
+	if !h.messageFilter.Exist(entry.Message) {
 		return nil
 	}
 	h.tracker = entry.Message