diff --git a/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/SubDirContextThemeWrapperTest.java b/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/SubDirContextThemeWrapperTest.java
index a1110faca..13d018264 100644
--- a/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/SubDirContextThemeWrapperTest.java
+++ b/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/SubDirContextThemeWrapperTest.java
@@ -18,6 +18,10 @@
 
 package com.tencent.shadow.test.cases.plugin_main;
 
+import static android.content.Context.MODE_PRIVATE;
+import static android.os.Environment.DIRECTORY_MUSIC;
+import static android.os.Environment.DIRECTORY_PODCASTS;
+
 import android.content.SharedPreferences;
 import android.os.Build;
 
@@ -30,10 +34,6 @@
 import java.io.FilenameFilter;
 import java.util.Arrays;
 
-import static android.content.Context.MODE_PRIVATE;
-import static android.os.Environment.DIRECTORY_MUSIC;
-import static android.os.Environment.DIRECTORY_PODCASTS;
-
 abstract class SubDirContextThemeWrapperTest extends PluginMainAppTest {
 
     private static final String PREFIX = "ShadowPlugin";
@@ -324,9 +324,9 @@ public void testGetDatabasePath() {
     @Test
     public void testDatabaseList() {
         String dbName = EXPECT_NAME + "_bar";
-        matchTextWithViewTag(
+        matchSubstringWithViewTag(
                 "TAG_DATABASE_LIST",
-                "[" + dbName + "]"
+                dbName
         );
     }
 
diff --git a/projects/test/plugin/general-cases/general-cases-lib/src/main/java/com/tencent/shadow/test/plugin/general_cases/lib/gallery/TestApplication.java b/projects/test/plugin/general-cases/general-cases-lib/src/main/java/com/tencent/shadow/test/plugin/general_cases/lib/gallery/TestApplication.java
index 67fe26304..832145808 100644
--- a/projects/test/plugin/general-cases/general-cases-lib/src/main/java/com/tencent/shadow/test/plugin/general_cases/lib/gallery/TestApplication.java
+++ b/projects/test/plugin/general-cases/general-cases-lib/src/main/java/com/tencent/shadow/test/plugin/general_cases/lib/gallery/TestApplication.java
@@ -77,8 +77,12 @@ public void onActivityPreCreated(@NonNull Activity activity, @Nullable Bundle sa
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            TestActivityLifecycleCallbacks testForRegisterInPreCreatedCallback = new TestActivityLifecycleCallbacks("TestForRegisterInPreCreatedCallback");
             TestApplication.getInstance().registerActivityLifecycleCallbacks(
-                    new TestActivityLifecycleCallbacks("TestForRegisterInPreCreatedCallback")
+                    testForRegisterInPreCreatedCallback
+            );
+            TestApplication.getInstance().unregisterActivityLifecycleCallbacks(
+                    testForRegisterInPreCreatedCallback
             );
         }
     }