diff --git a/multimedia/medialibrary/mediaLibrary_album/Test.json b/multimedia/medialibrary/mediaLibrary_album/Test.json
index 73570ded8173fcda23ee49db0db181137c657057..ce5cab2687c3f7bac2eb7b5f73500d656c43c4db 100644
--- a/multimedia/medialibrary/mediaLibrary_album/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_album/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_base/Test.json b/multimedia/medialibrary/mediaLibrary_base/Test.json
index bc985fe7d54ceffa00bd5df1d3c144a58a21f8f8..dba3a98e861bd20f610c3abfbe9d00f1d7c4f986 100644
--- a/multimedia/medialibrary/mediaLibrary_base/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_base/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_favorite/Test.json b/multimedia/medialibrary/mediaLibrary_favorite/Test.json
index 16b1f02ebb2633ba86a4fecbaabc3dd2a3752de3..cdfbde66dfcdb5682af7d8b2a5bef68fae63fe18 100644
--- a/multimedia/medialibrary/mediaLibrary_favorite/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_favorite/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_file/Test.json b/multimedia/medialibrary/mediaLibrary_file/Test.json
index feb7f62429c832115801ac7e00598e9c1f242d71..e5d926288cb228c90478cbc3c83acb8a5f880584 100644
--- a/multimedia/medialibrary/mediaLibrary_file/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_file/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -60,6 +63,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json b/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json
index cbca915aa7fbee0f205cd3d8a7c54360be621045..a015a0e25f1813a1167c195f3260c561aece9603 100644
--- a/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -60,6 +63,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_fileKey/Test.json b/multimedia/medialibrary/mediaLibrary_fileKey/Test.json
index 496635b55f7c2f23ffe9015e479dd393044b89ce..acc8e07e3cbb5fd8d424a7ed4b85d34eb98be7db 100644
--- a/multimedia/medialibrary/mediaLibrary_fileKey/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_fileKey/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -52,6 +55,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_fileResult/Test.json b/multimedia/medialibrary/mediaLibrary_fileResult/Test.json
index fbafbc0423766b756ac4ee60ed936ba69e33856f..ee646532e75293e51334a5eda0c7f2f7a91cde40 100644
--- a/multimedia/medialibrary/mediaLibrary_fileResult/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_fileResult/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json b/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json
index 697318cb9afdd707eea8653c5969d7360734bbe7..b956bc71de904aca202d30e0d94f3d29df766436 100644
--- a/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -53,6 +56,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json
index d3b44b55923129a4e4e0f3b617e30ef36a521fe4..de4499c9c6f92233d04cdf6a44dd2144d0fc8437 100644
--- a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",
diff --git a/multimedia/medialibrary/mediaLibrary_trash/Test.json b/multimedia/medialibrary/mediaLibrary_trash/Test.json
index d6a979bd474dc10eddb1961232d6d0c5ecc8d6ad..b334c3fc728e8bd56d1032015d408b749e841687 100644
--- a/multimedia/medialibrary/mediaLibrary_trash/Test.json
+++ b/multimedia/medialibrary/mediaLibrary_trash/Test.json
@@ -13,9 +13,12 @@
             "type": "ShellKit",
             "pre-push": [],
             "run-command": [
-                "rm -rf /storage/media/100/local/files/*",
-                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*",
-                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
                 "mkdir -p /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 0",
                 "reboot",
@@ -56,6 +59,13 @@
                 "sleep 10"
             ],
             "teardown-command": [
+                "rm -rf /storage/media/100/local/files/Audios/*",
+                "rm -rf /storage/media/100/local/files/Camera/*",
+                "rm -rf /storage/media/100/local/files/Documents/*",
+                "rm -rf /storage/media/100/local/files/Download/*",
+                "rm -rf /storage/media/100/local/files/Pictures/*",
+                "rm -rf /storage/media/100/local/files/Videos/*",
+                "rm -rf /storage/media/100/local/temp",
                 "param set persist.sys.suspend_manager_enabled 1",
                 "reboot",
                 "hilog -b X -D 0xD002B70",