diff --git a/trunk/configure b/trunk/configure
index a725d3f89..7f5edd6ed 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -375,20 +375,18 @@ fi
 #
 # utest, the unit-test cases of srs, base on gtest1.6
 if [[ $SRS_UTEST == YES ]]; then
-    MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_kernel" "srs_utest_core"
+    MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_kernel" "srs_utest_core" "srs_utest_srt"
         "srs_utest_config" "srs_utest_rtmp" "srs_utest_http" "srs_utest_avc" "srs_utest_reload"
         "srs_utest_mp4" "srs_utest_service" "srs_utest_app_rtc2rtmp" "srs_utest_rtc" "srs_utest_config2"
-        "srs_utest_config3" "srs_utest_config4" "srs_utest_protocol" "srs_utest_protocol2" "srs_utest_kernel2"
-        "srs_utest_st" "srs_utest_rtc2" "srs_utest_rtc3" "srs_utest_fmp4" "srs_utest_source_lock"
-        "srs_utest_stream_token" "srs_utest_rtc_recv_track" "srs_utest_st2" "srs_utest_hevc_structs"
-        "srs_utest_coworkers" "srs_utest_pithy_print" "srs_utest_kernel3" "srs_utest_protocol4"
-        "srs_utest_protocol3" "srs_utest_app" "srs_utest_app2" "srs_utest_app3" "srs_utest_app4"
-        "srs_utest_app5" "srs_utest_app6" "srs_utest_app7" "srs_utest_app8" "srs_utest_app9"
-        "srs_utest_app10" "srs_utest_app11" "srs_utest_app15" "srs_utest_app16" "srs_utest_app17" 
-        "srs_utest_mock" "srs_utest_rtc_playstream" "srs_utest_rtc_publishstream" "srs_utest_rtc_conn" 
-        "srs_utest_rtmp_conn")
-    # Always include SRT utest
-    MODULE_FILES+=("srs_utest_srt")
+        "srs_utest_protocol" "srs_utest_protocol2" "srs_utest_kernel2" "srs_utest_st" "srs_utest_fmp4" 
+        "srs_utest_source_lock" "srs_utest_stream_token" "srs_utest_rtc_recv_track" "srs_utest_st2" 
+        "srs_utest_hevc_structs" "srs_utest_coworkers" "srs_utest_pithy_print" "srs_utest_protocol3" 
+        "srs_utest_app" "srs_utest_mock" "srs_utest_rtc_playstream" "srs_utest_rtc_publishstream" 
+        "srs_utest_rtc_conn" "srs_utest_rtmp_conn")
+    MODULE_FILES+=("srs_utest_ai01" "srs_utest_ai02" "srs_utest_ai03" "srs_utest_ai04" "srs_utest_ai05" 
+        "srs_utest_ai06" "srs_utest_ai07" "srs_utest_ai08" "srs_utest_ai09" "srs_utest_ai10" "srs_utest_ai11" 
+        "srs_utest_ai12" "srs_utest_ai13" "srs_utest_ai14" "srs_utest_ai15" "srs_utest_ai16" "srs_utest_ai17" 
+        "srs_utest_ai18" "srs_utest_ai19")
     if [[ $SRS_GB28181 == YES ]]; then
         MODULE_FILES+=("srs_utest_gb28181" "srs_utest_app14")
     fi
diff --git a/trunk/src/utest/srs_utest_config3.cpp b/trunk/src/utest/srs_utest_ai01.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_config3.cpp
rename to trunk/src/utest/srs_utest_ai01.cpp
index a1d7c2b91..eff8f0915 100644
--- a/trunk/src/utest/srs_utest_config3.cpp
+++ b/trunk/src/utest/srs_utest_ai01.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_config.hpp>
+#include <srs_utest_ai01.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_config3.hpp b/trunk/src/utest/srs_utest_ai01.hpp
similarity index 58%
rename from trunk/src/utest/srs_utest_config3.hpp
rename to trunk/src/utest/srs_utest_ai01.hpp
index cd150d1b4..9d9857483 100644
--- a/trunk/src/utest/srs_utest_config3.hpp
+++ b/trunk/src/utest/srs_utest_ai01.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_CONFIG3_HPP
-#define SRS_UTEST_CONFIG3_HPP
+#ifndef SRS_UTEST_AI01_HPP
+#define SRS_UTEST_AI01_HPP
 
 /*
-#include <srs_utest_config3.hpp>
+#include <srs_utest_ai01.hpp>
 */
 #include <srs_utest_config.hpp>
 
diff --git a/trunk/src/utest/srs_utest_config4.cpp b/trunk/src/utest/srs_utest_ai02.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_config4.cpp
rename to trunk/src/utest/srs_utest_ai02.cpp
index 0c4e11286..7e137362c 100644
--- a/trunk/src/utest/srs_utest_config4.cpp
+++ b/trunk/src/utest/srs_utest_ai02.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_config4.hpp>
+#include <srs_utest_ai02.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_rtc3.hpp b/trunk/src/utest/srs_utest_ai02.hpp
similarity index 59%
rename from trunk/src/utest/srs_utest_rtc3.hpp
rename to trunk/src/utest/srs_utest_ai02.hpp
index 9fd1375c7..37788184c 100644
--- a/trunk/src/utest/srs_utest_rtc3.hpp
+++ b/trunk/src/utest/srs_utest_ai02.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_RTC3_HPP
-#define SRS_UTEST_RTC3_HPP
+#ifndef SRS_UTEST_AI02_HPP
+#define SRS_UTEST_AI02_HPP
 
 /*
-#include <srs_utest_rtc3.hpp>
+#include <srs_utest_ai02.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_rtc2.cpp b/trunk/src/utest/srs_utest_ai03.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_rtc2.cpp
rename to trunk/src/utest/srs_utest_ai03.cpp
index d16dc3922..563dbe357 100644
--- a/trunk/src/utest/srs_utest_rtc2.cpp
+++ b/trunk/src/utest/srs_utest_ai03.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_rtc2.hpp>
+#include <srs_utest_ai03.hpp>
 
 #include <srs_app_rtc_source.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/utest/srs_utest_rtc2.hpp b/trunk/src/utest/srs_utest_ai03.hpp
similarity index 59%
rename from trunk/src/utest/srs_utest_rtc2.hpp
rename to trunk/src/utest/srs_utest_ai03.hpp
index 1d796340a..a5b4ae179 100644
--- a/trunk/src/utest/srs_utest_rtc2.hpp
+++ b/trunk/src/utest/srs_utest_ai03.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_RTC2_HPP
-#define SRS_UTEST_RTC2_HPP
+#ifndef SRS_UTEST_AI03_HPP
+#define SRS_UTEST_AI03_HPP
 
 /*
-#include <srs_utest_rtc2.hpp>
+#include <srs_utest_ai03.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_rtc3.cpp b/trunk/src/utest/srs_utest_ai04.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_rtc3.cpp
rename to trunk/src/utest/srs_utest_ai04.cpp
index 2408e74a9..4bfc3ee24 100644
--- a/trunk/src/utest/srs_utest_rtc3.cpp
+++ b/trunk/src/utest/srs_utest_ai04.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_rtc3.hpp>
+#include <srs_utest_ai04.hpp>
 
 #include <srs_app_rtc_source.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/utest/srs_utest_config4.hpp b/trunk/src/utest/srs_utest_ai04.hpp
similarity index 57%
rename from trunk/src/utest/srs_utest_config4.hpp
rename to trunk/src/utest/srs_utest_ai04.hpp
index 99725f5a1..6987cba10 100644
--- a/trunk/src/utest/srs_utest_config4.hpp
+++ b/trunk/src/utest/srs_utest_ai04.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_CONFIG4_HPP
-#define SRS_UTEST_CONFIG4_HPP
+#ifndef SRS_UTEST_AI04_HPP
+#define SRS_UTEST_AI04_HPP
 
 /*
-#include <srs_utest_config4.hpp>
+#include <srs_utest_ai04.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_kernel3.cpp b/trunk/src/utest/srs_utest_ai05.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_kernel3.cpp
rename to trunk/src/utest/srs_utest_ai05.cpp
index cc6aa3866..5ca8402db 100644
--- a/trunk/src/utest/srs_utest_kernel3.cpp
+++ b/trunk/src/utest/srs_utest_ai05.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_kernel3.hpp>
+#include <srs_utest_ai05.hpp>
 
 #include <srs_app_utility.hpp>
 #include <srs_core_time.hpp>
diff --git a/trunk/src/utest/srs_utest_kernel3.hpp b/trunk/src/utest/srs_utest_ai05.hpp
similarity index 96%
rename from trunk/src/utest/srs_utest_kernel3.hpp
rename to trunk/src/utest/srs_utest_ai05.hpp
index f7101f4fe..daa18c1a1 100644
--- a/trunk/src/utest/srs_utest_kernel3.hpp
+++ b/trunk/src/utest/srs_utest_ai05.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_KERNEL3_HPP
-#define SRS_UTEST_KERNEL3_HPP
+#ifndef SRS_UTEST_AI05_HPP
+#define SRS_UTEST_AI05_HPP
 
 /*
-#include <srs_utest_kernel3.hpp>
+#include <srs_utest_ai05.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_protocol4.cpp b/trunk/src/utest/srs_utest_ai06.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_protocol4.cpp
rename to trunk/src/utest/srs_utest_ai06.cpp
index 223500b50..fd4b1368c 100644
--- a/trunk/src/utest/srs_utest_protocol4.cpp
+++ b/trunk/src/utest/srs_utest_ai06.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_protocol4.hpp>
+#include <srs_utest_ai06.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_protocol4.hpp b/trunk/src/utest/srs_utest_ai06.hpp
similarity index 55%
rename from trunk/src/utest/srs_utest_protocol4.hpp
rename to trunk/src/utest/srs_utest_ai06.hpp
index 569cf897e..b1b56af09 100644
--- a/trunk/src/utest/srs_utest_protocol4.hpp
+++ b/trunk/src/utest/srs_utest_ai06.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_PROTOCOL4_HPP
-#define SRS_UTEST_PROTOCOL4_HPP
+#ifndef SRS_UTEST_AI06_HPP
+#define SRS_UTEST_AI06_HPP
 
 /*
-#include <srs_utest_protocol4.hpp>
+#include <srs_utest_ai06.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_app2.cpp b/trunk/src/utest/srs_utest_ai07.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app2.cpp
rename to trunk/src/utest/srs_utest_ai07.cpp
index 321d0f03b..3b19d53d6 100644
--- a/trunk/src/utest/srs_utest_app2.cpp
+++ b/trunk/src/utest/srs_utest_ai07.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app2.hpp>
+#include <srs_utest_ai07.hpp>
 
 #include <srs_app_circuit_breaker.hpp>
 #include <srs_app_rtc_source.hpp>
diff --git a/trunk/src/utest/srs_utest_app2.hpp b/trunk/src/utest/srs_utest_ai07.hpp
similarity index 98%
rename from trunk/src/utest/srs_utest_app2.hpp
rename to trunk/src/utest/srs_utest_ai07.hpp
index 9a7ac129f..d668bdf71 100644
--- a/trunk/src/utest/srs_utest_app2.hpp
+++ b/trunk/src/utest/srs_utest_ai07.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP2_HPP
-#define SRS_UTEST_APP2_HPP
+#ifndef SRS_UTEST_AI07_HPP
+#define SRS_UTEST_AI07_HPP
 
 /*
-#include <srs_utest_app2.hpp>
+#include <srs_utest_ai07.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_app3.cpp b/trunk/src/utest/srs_utest_ai08.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app3.cpp
rename to trunk/src/utest/srs_utest_ai08.cpp
index 8d5509c5c..606211f98 100644
--- a/trunk/src/utest/srs_utest_app3.cpp
+++ b/trunk/src/utest/srs_utest_ai08.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app3.hpp>
+#include <srs_utest_ai08.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_app3.hpp b/trunk/src/utest/srs_utest_ai08.hpp
similarity index 95%
rename from trunk/src/utest/srs_utest_app3.hpp
rename to trunk/src/utest/srs_utest_ai08.hpp
index a98c51db9..0657ab903 100644
--- a/trunk/src/utest/srs_utest_app3.hpp
+++ b/trunk/src/utest/srs_utest_ai08.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP3_HPP
-#define SRS_UTEST_APP3_HPP
+#ifndef SRS_UTEST_AI08_HPP
+#define SRS_UTEST_AI08_HPP
 
 /*
-#include <srs_utest_app3.hpp>
+#include <srs_utest_ai08.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -18,7 +18,7 @@
 #include <srs_protocol_format.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 
-#include <srs_utest_app4.hpp>
+#include <srs_utest_ai09.hpp>
 
 // Forward declarations
 class SrsMediaPacket;
diff --git a/trunk/src/utest/srs_utest_app4.cpp b/trunk/src/utest/srs_utest_ai09.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app4.cpp
rename to trunk/src/utest/srs_utest_ai09.cpp
index 3e6bf895e..03c5498ab 100644
--- a/trunk/src/utest/srs_utest_app4.cpp
+++ b/trunk/src/utest/srs_utest_ai09.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app4.hpp>
+#include <srs_utest_ai09.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_app4.hpp b/trunk/src/utest/srs_utest_ai09.hpp
similarity index 96%
rename from trunk/src/utest/srs_utest_app4.hpp
rename to trunk/src/utest/srs_utest_ai09.hpp
index 76d5f0291..df79788ec 100644
--- a/trunk/src/utest/srs_utest_app4.hpp
+++ b/trunk/src/utest/srs_utest_ai09.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP4_HPP
-#define SRS_UTEST_APP4_HPP
+#ifndef SRS_UTEST_AI09_HPP
+#define SRS_UTEST_AI09_HPP
 
 /*
-#include <srs_utest_app4.hpp>
+#include <srs_utest_ai09.hpp>
 */
 #include <srs_utest.hpp>
 
diff --git a/trunk/src/utest/srs_utest_app5.cpp b/trunk/src/utest/srs_utest_ai10.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app5.cpp
rename to trunk/src/utest/srs_utest_ai10.cpp
index e2fddcc63..a95ffbbcd 100644
--- a/trunk/src/utest/srs_utest_app5.cpp
+++ b/trunk/src/utest/srs_utest_ai10.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app5.hpp>
+#include <srs_utest_ai10.hpp>
 
 using namespace std;
 
@@ -17,7 +17,7 @@ using namespace std;
 #include <srs_kernel_rtc_rtp.hpp>
 #include <srs_protocol_format.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Helper functions
 SrsRtpPacket *create_test_rtp_packet(uint16_t seq, uint32_t ts, uint32_t ssrc, bool marker)
diff --git a/trunk/src/utest/srs_utest_app5.hpp b/trunk/src/utest/srs_utest_ai10.hpp
similarity index 86%
rename from trunk/src/utest/srs_utest_app5.hpp
rename to trunk/src/utest/srs_utest_ai10.hpp
index 1cf9b0693..58947a425 100644
--- a/trunk/src/utest/srs_utest_app5.hpp
+++ b/trunk/src/utest/srs_utest_ai10.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP5_HPP
-#define SRS_UTEST_APP5_HPP
+#ifndef SRS_UTEST_AI10_HPP
+#define SRS_UTEST_AI10_HPP
 
 /*
-#include <srs_utest_app5.hpp>
+#include <srs_utest_ai10.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -19,7 +19,7 @@
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_format.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_utest_app4.hpp>
+#include <srs_utest_ai09.hpp>
 
 // Forward declarations
 class SrsMediaPacket;
diff --git a/trunk/src/utest/srs_utest_app6.cpp b/trunk/src/utest/srs_utest_ai11.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app6.cpp
rename to trunk/src/utest/srs_utest_ai11.cpp
index 35d98a136..9d8893587 100644
--- a/trunk/src/utest/srs_utest_app6.cpp
+++ b/trunk/src/utest/srs_utest_ai11.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 
 using namespace std;
 
@@ -15,7 +15,7 @@ using namespace std;
 #include <srs_app_srt_source.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_sdp.hpp>
-#include <srs_utest_app2.hpp>
+#include <srs_utest_ai07.hpp>
 
 // Mock ISrsResourceManager implementation
 MockResourceManagerForBindSession::MockResourceManagerForBindSession()
diff --git a/trunk/src/utest/srs_utest_app6.hpp b/trunk/src/utest/srs_utest_ai11.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app6.hpp
rename to trunk/src/utest/srs_utest_ai11.hpp
index 1404f654f..249dcd9fa 100644
--- a/trunk/src/utest/srs_utest_app6.hpp
+++ b/trunk/src/utest/srs_utest_ai11.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP6_HPP
-#define SRS_UTEST_APP6_HPP
+#ifndef SRS_UTEST_AI11_HPP
+#define SRS_UTEST_AI11_HPP
 
 /*
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -22,7 +22,7 @@
 #include <srs_app_srt_source.hpp>
 #include <srs_app_statistic.hpp>
 #include <srs_protocol_sdp.hpp>
-#include <srs_utest_app2.hpp>
+#include <srs_utest_ai07.hpp>
 #include <srs_utest_protocol3.hpp>
 
 // Mock ISrsResourceManager for testing SrsGbMediaTcpConn::bind_session
diff --git a/trunk/src/utest/srs_utest_app7.cpp b/trunk/src/utest/srs_utest_ai12.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app7.cpp
rename to trunk/src/utest/srs_utest_ai12.cpp
index 428d00cbb..f784526d9 100644
--- a/trunk/src/utest/srs_utest_app7.cpp
+++ b/trunk/src/utest/srs_utest_ai12.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_app7.hpp>
+#include <srs_utest_ai12.hpp>
 
 using namespace std;
 
@@ -14,8 +14,8 @@ using namespace std;
 #include <srs_kernel_rtc_rtp.hpp>
 #include <srs_protocol_rtc_stun.hpp>
 #include <srs_protocol_sdp.hpp>
-#include <srs_utest_app5.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai10.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Forward declarations for H.264 SDP functions (defined in srs_app_rtc_conn.cpp)
 extern bool srs_sdp_has_h264_profile(const SrsMediaPayloadType &payload_type, const string &profile);
diff --git a/trunk/src/utest/srs_utest_app7.hpp b/trunk/src/utest/srs_utest_ai12.hpp
similarity index 96%
rename from trunk/src/utest/srs_utest_app7.hpp
rename to trunk/src/utest/srs_utest_ai12.hpp
index 39c19be6d..d07f83d20 100644
--- a/trunk/src/utest/srs_utest_app7.hpp
+++ b/trunk/src/utest/srs_utest_ai12.hpp
@@ -4,20 +4,20 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP7_HPP
-#define SRS_UTEST_APP7_HPP
+#ifndef SRS_UTEST_AI12_HPP
+#define SRS_UTEST_AI12_HPP
 
 /*
-#include <srs_utest_app7.hpp>
+#include <srs_utest_ai12.hpp>
 */
 #include <srs_utest.hpp>
 
 #include <srs_app_rtc_conn.hpp>
 #include <srs_app_rtc_source.hpp>
 #include <srs_kernel_rtc_queue.hpp>
-#include <srs_utest_app2.hpp>
-#include <srs_utest_app6.hpp>
-#include <srs_utest_kernel3.hpp>
+#include <srs_utest_ai07.hpp>
+#include <srs_utest_ai11.hpp>
+#include <srs_utest_ai05.hpp>
 #include <srs_utest_service.hpp>
 
 // Mock video recv track for testing check_send_nacks
diff --git a/trunk/src/utest/srs_utest_app8.cpp b/trunk/src/utest/srs_utest_ai13.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app8.cpp
rename to trunk/src/utest/srs_utest_ai13.cpp
index b1019360a..5c5e0c29a 100644
--- a/trunk/src/utest/srs_utest_app8.cpp
+++ b/trunk/src/utest/srs_utest_ai13.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_app8.hpp>
+#include <srs_utest_ai13.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_app8.hpp b/trunk/src/utest/srs_utest_ai13.hpp
similarity index 97%
rename from trunk/src/utest/srs_utest_app8.hpp
rename to trunk/src/utest/srs_utest_ai13.hpp
index 4a04c9265..5f5cb6ba8 100644
--- a/trunk/src/utest/srs_utest_app8.hpp
+++ b/trunk/src/utest/srs_utest_ai13.hpp
@@ -4,15 +4,18 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP8_HPP
-#define SRS_UTEST_APP8_HPP
+#ifndef SRS_UTEST_AI13_HPP
+#define SRS_UTEST_AI13_HPP
 
+/*
+#include <srs_utest_ai13.hpp>
+*/
 #include <srs_utest.hpp>
 
 #include <srs_app_factory.hpp>
 #include <srs_app_hls.hpp>
 #include <srs_app_rtmp_source.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_kernel.hpp>
 
 // Extended mock app config for HLS notify testing
diff --git a/trunk/src/utest/srs_utest_app9.cpp b/trunk/src/utest/srs_utest_ai14.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app9.cpp
rename to trunk/src/utest/srs_utest_ai14.cpp
index 2c8f8bfac..b9c6e3aa9 100644
--- a/trunk/src/utest/srs_utest_app9.cpp
+++ b/trunk/src/utest/srs_utest_ai14.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_app9.hpp>
+#include <srs_utest_ai14.hpp>
 
 using namespace std;
 
@@ -20,8 +20,8 @@ using namespace std;
 #include <srs_kernel_packet.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_rtmp_msg_array.hpp>
-#include <srs_utest_app6.hpp>
-#include <srs_utest_app8.hpp>
+#include <srs_utest_ai11.hpp>
+#include <srs_utest_ai13.hpp>
 #include <srs_utest_config.hpp>
 #include <srs_utest_coworkers.hpp>
 #include <srs_utest_protocol2.hpp>
diff --git a/trunk/src/utest/srs_utest_app9.hpp b/trunk/src/utest/srs_utest_ai14.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app9.hpp
rename to trunk/src/utest/srs_utest_ai14.hpp
index 94d92e424..4018cb7f8 100644
--- a/trunk/src/utest/srs_utest_app9.hpp
+++ b/trunk/src/utest/srs_utest_ai14.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP9_HPP
-#define SRS_UTEST_APP9_HPP
+#ifndef SRS_UTEST_AI14_HPP
+#define SRS_UTEST_AI14_HPP
 
 /*
-#include <srs_utest_app9.hpp>
+#include <srs_utest_ai14.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -24,7 +24,7 @@
 #include <srs_app_statistic.hpp>
 #include <srs_kernel_packet.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 #ifdef SRS_HDS
 #include <srs_app_hds.hpp>
 #endif
diff --git a/trunk/src/utest/srs_utest_app10.cpp b/trunk/src/utest/srs_utest_ai15.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app10.cpp
rename to trunk/src/utest/srs_utest_ai15.cpp
index f8f522044..28fb0efef 100644
--- a/trunk/src/utest/srs_utest_app10.cpp
+++ b/trunk/src/utest/srs_utest_ai15.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_app10.hpp>
+#include <srs_utest_ai15.hpp>
 
 using namespace std;
 
@@ -23,8 +23,8 @@ using namespace std;
 #include <srs_protocol_json.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_st.hpp>
-#include <srs_utest_app6.hpp>
-#include <srs_utest_app9.hpp>
+#include <srs_utest_ai11.hpp>
+#include <srs_utest_ai14.hpp>
 #include <sys/socket.h>
 
 // Mock config implementation for SrsServer::listen() testing
diff --git a/trunk/src/utest/srs_utest_app10.hpp b/trunk/src/utest/srs_utest_ai15.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app10.hpp
rename to trunk/src/utest/srs_utest_ai15.hpp
index a0bfd23e0..835cfe9c6 100644
--- a/trunk/src/utest/srs_utest_app10.hpp
+++ b/trunk/src/utest/srs_utest_ai15.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP10_HPP
-#define SRS_UTEST_APP10_HPP
+#ifndef SRS_UTEST_AI15_HPP
+#define SRS_UTEST_AI15_HPP
 
 /*
-#include <srs_utest_app10.hpp>
+#include <srs_utest_ai15.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -19,7 +19,7 @@
 #include <srs_app_security.hpp>
 #include <srs_kernel_hourglass.hpp>
 #include <srs_protocol_http_stack.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Mock config for testing SrsServer::listen()
 class MockAppConfigForServerListen : public MockAppConfig
diff --git a/trunk/src/utest/srs_utest_app11.cpp b/trunk/src/utest/srs_utest_ai16.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app11.cpp
rename to trunk/src/utest/srs_utest_ai16.cpp
index acef808a6..64c3efbf0 100644
--- a/trunk/src/utest/srs_utest_app11.cpp
+++ b/trunk/src/utest/srs_utest_ai16.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-#include <srs_utest_app11.hpp>
+#include <srs_utest_ai16.hpp>
 
 using namespace std;
 
@@ -18,8 +18,8 @@ using namespace std;
 #include <srs_kernel_packet.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_json.hpp>
-#include <srs_utest_app10.hpp>
-#include <srs_utest_app9.hpp>
+#include <srs_utest_ai15.hpp>
+#include <srs_utest_ai14.hpp>
 #include <srs_utest_http.hpp>
 #include <srs_utest_kernel.hpp>
 #include <vector>
diff --git a/trunk/src/utest/srs_utest_app11.hpp b/trunk/src/utest/srs_utest_ai16.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app11.hpp
rename to trunk/src/utest/srs_utest_ai16.hpp
index 867938f5d..6ab3a6711 100644
--- a/trunk/src/utest/srs_utest_app11.hpp
+++ b/trunk/src/utest/srs_utest_ai16.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP11_HPP
-#define SRS_UTEST_APP11_HPP
+#ifndef SRS_UTEST_AI16_HPP
+#define SRS_UTEST_AI16_HPP
 
 /*
-#include <srs_utest_app11.hpp>
+#include <srs_utest_ai16.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -19,7 +19,7 @@
 #include <srs_app_server.hpp>
 #include <srs_protocol_http_conn.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Mock request class for testing SrsBufferCache
 class MockBufferCacheRequest : public ISrsRequest
diff --git a/trunk/src/utest/srs_utest_app15.cpp b/trunk/src/utest/srs_utest_ai17.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app15.cpp
rename to trunk/src/utest/srs_utest_ai17.cpp
index 77c0af54c..d12f8563e 100644
--- a/trunk/src/utest/srs_utest_app15.cpp
+++ b/trunk/src/utest/srs_utest_ai17.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app15.hpp>
+#include <srs_utest_ai17.hpp>
 
 using namespace std;
 
@@ -19,10 +19,10 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_json.hpp>
-#include <srs_utest_app10.hpp>
-#include <srs_utest_app11.hpp>
+#include <srs_utest_ai15.hpp>
+#include <srs_utest_ai16.hpp>
 #include <srs_utest_app14.hpp>
-#include <srs_utest_app8.hpp>
+#include <srs_utest_ai13.hpp>
 #include <srs_utest_coworkers.hpp>
 #include <srs_utest_fmp4.hpp>
 #include <srs_utest_http.hpp>
diff --git a/trunk/src/utest/srs_utest_app15.hpp b/trunk/src/utest/srs_utest_ai17.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app15.hpp
rename to trunk/src/utest/srs_utest_ai17.hpp
index 11993998e..2d14645ee 100644
--- a/trunk/src/utest/srs_utest_app15.hpp
+++ b/trunk/src/utest/srs_utest_ai17.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP15_HPP
-#define SRS_UTEST_APP15_HPP
+#ifndef SRS_UTEST_AI17_HPP
+#define SRS_UTEST_AI17_HPP
 
 /*
-#include <srs_utest_app15.hpp>
+#include <srs_utest_ai17.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -24,9 +24,9 @@
 #include <srs_protocol_http_conn.hpp>
 #include <srs_protocol_http_stack.hpp>
 #include <srs_protocol_sdp.hpp>
-#include <srs_utest_app10.hpp>
-#include <srs_utest_app11.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai15.hpp>
+#include <srs_utest_ai16.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Mock ISrsMpdWriter for testing MPD fragment generation
 class MockMpdWriter : public ISrsMpdWriter
diff --git a/trunk/src/utest/srs_utest_app16.cpp b/trunk/src/utest/srs_utest_ai18.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app16.cpp
rename to trunk/src/utest/srs_utest_ai18.cpp
index 82938660b..0f448adfb 100644
--- a/trunk/src/utest/srs_utest_app16.cpp
+++ b/trunk/src/utest/srs_utest_ai18.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app16.hpp>
+#include <srs_utest_ai18.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/utest/srs_utest_app16.hpp b/trunk/src/utest/srs_utest_ai18.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app16.hpp
rename to trunk/src/utest/srs_utest_ai18.hpp
index 074a1c526..67e3e5482 100644
--- a/trunk/src/utest/srs_utest_app16.hpp
+++ b/trunk/src/utest/srs_utest_ai18.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP16_HPP
-#define SRS_UTEST_APP16_HPP
+#ifndef SRS_UTEST_AI18_HPP
+#define SRS_UTEST_AI18_HPP
 
 /*
-#include <srs_utest_app16.hpp>
+#include <srs_utest_ai18.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -18,9 +18,9 @@
 #include <srs_app_rtc_conn.hpp>
 #include <srs_app_stream_token.hpp>
 #include <srs_protocol_srt.hpp>
-#include <srs_utest_app10.hpp>
-#include <srs_utest_app11.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai15.hpp>
+#include <srs_utest_ai16.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Mock ISrsSrtSocket for testing SrsSrtConnection
 class MockSrtSocket : public ISrsSrtSocket
diff --git a/trunk/src/utest/srs_utest_app17.cpp b/trunk/src/utest/srs_utest_ai19.cpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app17.cpp
rename to trunk/src/utest/srs_utest_ai19.cpp
index a58603d70..6baeaf3cc 100644
--- a/trunk/src/utest/srs_utest_app17.cpp
+++ b/trunk/src/utest/srs_utest_ai19.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <srs_utest_app17.hpp>
+#include <srs_utest_ai19.hpp>
 
 using namespace std;
 
@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_utest_coworkers.hpp>
 #include <srs_utest_http.hpp>
-#include <srs_utest_kernel3.hpp>
+#include <srs_utest_ai05.hpp>
 
 // Mock ISrsAppConfig implementation
 MockAppConfigForUdpCaster::MockAppConfigForUdpCaster()
diff --git a/trunk/src/utest/srs_utest_app17.hpp b/trunk/src/utest/srs_utest_ai19.hpp
similarity index 99%
rename from trunk/src/utest/srs_utest_app17.hpp
rename to trunk/src/utest/srs_utest_ai19.hpp
index 91e9c18e4..85a2f813f 100644
--- a/trunk/src/utest/srs_utest_app17.hpp
+++ b/trunk/src/utest/srs_utest_ai19.hpp
@@ -4,11 +4,11 @@
 // SPDX-License-Identifier: MIT
 //
 
-#ifndef SRS_UTEST_APP17_HPP
-#define SRS_UTEST_APP17_HPP
+#ifndef SRS_UTEST_AI19_HPP
+#define SRS_UTEST_AI19_HPP
 
 /*
-#include <srs_utest_app17.hpp>
+#include <srs_utest_ai19.hpp>
 */
 #include <srs_utest.hpp>
 
@@ -24,9 +24,9 @@
 #include <srs_protocol_http_client.hpp>
 #include <srs_protocol_raw_avc.hpp>
 #include <srs_protocol_rtmp_conn.hpp>
-#include <srs_utest_app10.hpp>
-#include <srs_utest_app11.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai15.hpp>
+#include <srs_utest_ai16.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_kernel.hpp>
 
 // Mock ISrsAppConfig for testing SrsUdpCasterListener
diff --git a/trunk/src/utest/srs_utest_app12.cpp b/trunk/src/utest/srs_utest_app12.cpp
index 948a155f3..406d7aba3 100644
--- a/trunk/src/utest/srs_utest_app12.cpp
+++ b/trunk/src/utest/srs_utest_app12.cpp
@@ -18,10 +18,10 @@ using namespace std;
 #include <srs_kernel_packet.hpp>
 #include <srs_kernel_ts.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_utest_app2.hpp>
-#include <srs_utest_app3.hpp>
-#include <srs_utest_app5.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai07.hpp>
+#include <srs_utest_ai08.hpp>
+#include <srs_utest_ai10.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_config.hpp>
 #include <srs_utest_coworkers.hpp>
 
diff --git a/trunk/src/utest/srs_utest_app12.hpp b/trunk/src/utest/srs_utest_app12.hpp
index 03c6fb98d..6b0fea758 100644
--- a/trunk/src/utest/srs_utest_app12.hpp
+++ b/trunk/src/utest/srs_utest_app12.hpp
@@ -17,7 +17,7 @@
 #endif
 #include <srs_app_stream_bridge.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Mock frame target for testing SrsSrtFrameBuilder
 class MockSrtFrameTarget : public ISrsFrameTarget
diff --git a/trunk/src/utest/srs_utest_app13.cpp b/trunk/src/utest/srs_utest_app13.cpp
index 430b2c02d..6b9c6c879 100644
--- a/trunk/src/utest/srs_utest_app13.cpp
+++ b/trunk/src/utest/srs_utest_app13.cpp
@@ -20,8 +20,8 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_utest_app10.hpp>
-#include <srs_utest_app11.hpp>
+#include <srs_utest_ai15.hpp>
+#include <srs_utest_ai16.hpp>
 #include <srs_utest_config.hpp>
 #include <srs_utest_fmp4.hpp>
 #include <srs_utest_kernel.hpp>
diff --git a/trunk/src/utest/srs_utest_app13.hpp b/trunk/src/utest/srs_utest_app13.hpp
index 32b95f01c..bff07d070 100644
--- a/trunk/src/utest/srs_utest_app13.hpp
+++ b/trunk/src/utest/srs_utest_app13.hpp
@@ -35,7 +35,7 @@
 #include <srs_protocol_rtsp_stack.hpp>
 #endif
 #include <srs_utest_app12.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 
 // Mock request class for testing edge upstream
 class MockEdgeRequest : public ISrsRequest
diff --git a/trunk/src/utest/srs_utest_app14.cpp b/trunk/src/utest/srs_utest_app14.cpp
index 75a52e2e4..745aa3e4b 100644
--- a/trunk/src/utest/srs_utest_app14.cpp
+++ b/trunk/src/utest/srs_utest_app14.cpp
@@ -24,7 +24,7 @@ using namespace std;
 #include <srs_protocol_rtc_stun.hpp>
 #include <srs_protocol_rtmp_conn.hpp>
 #include <srs_protocol_sdp.hpp>
-#include <srs_utest_app11.hpp>
+#include <srs_utest_ai16.hpp>
 #include <srs_utest_http.hpp>
 #include <srs_utest_kernel.hpp>
 #include <srs_utest_protocol.hpp>
diff --git a/trunk/src/utest/srs_utest_app14.hpp b/trunk/src/utest/srs_utest_app14.hpp
index 5ac7ac54b..0816ff718 100644
--- a/trunk/src/utest/srs_utest_app14.hpp
+++ b/trunk/src/utest/srs_utest_app14.hpp
@@ -23,8 +23,8 @@
 #include <srs_protocol_http_stack.hpp>
 #include <srs_protocol_raw_avc.hpp>
 #include <srs_protocol_rtmp_conn.hpp>
-#include <srs_utest_app11.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai16.hpp>
+#include <srs_utest_ai11.hpp>
 
 #ifdef SRS_RTSP
 #include <srs_app_rtsp_conn.hpp>
diff --git a/trunk/src/utest/srs_utest_app_rtc2rtmp.cpp b/trunk/src/utest/srs_utest_app_rtc2rtmp.cpp
index 30774a686..36d124c1d 100644
--- a/trunk/src/utest/srs_utest_app_rtc2rtmp.cpp
+++ b/trunk/src/utest/srs_utest_app_rtc2rtmp.cpp
@@ -15,7 +15,7 @@
 #include <srs_kernel_rtc_rtp.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 
-#include <srs_utest_app4.hpp>
+#include <srs_utest_ai09.hpp>
 #include <srs_utest_service.hpp>
 
 #include <vector>
diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp
index 18fa233de..fd83ea40a 100644
--- a/trunk/src/utest/srs_utest_rtc.cpp
+++ b/trunk/src/utest/srs_utest_rtc.cpp
@@ -15,7 +15,7 @@
 #include <srs_kernel_rtc_rtp.hpp>
 #include <srs_protocol_conn.hpp>
 
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_protocol3.hpp>
 #include <srs_utest_service.hpp>
 
diff --git a/trunk/src/utest/srs_utest_rtc_conn.cpp b/trunk/src/utest/srs_utest_rtc_conn.cpp
index c374d3ba1..2a65644c3 100644
--- a/trunk/src/utest/srs_utest_rtc_conn.cpp
+++ b/trunk/src/utest/srs_utest_rtc_conn.cpp
@@ -30,7 +30,7 @@
 #include <srs_app_stream_token.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_mock.hpp>
 #include <srs_utest_service.hpp>
 
diff --git a/trunk/src/utest/srs_utest_rtc_playstream.cpp b/trunk/src/utest/srs_utest_rtc_playstream.cpp
index 7ba5c42a3..7565fd104 100644
--- a/trunk/src/utest/srs_utest_rtc_playstream.cpp
+++ b/trunk/src/utest/srs_utest_rtc_playstream.cpp
@@ -10,7 +10,7 @@
 #include <srs_app_rtc_source.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_utest_app.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_mock.hpp>
 
 // This test is used to verify the basic workflow of the RTC play stream.
diff --git a/trunk/src/utest/srs_utest_rtc_publishstream.cpp b/trunk/src/utest/srs_utest_rtc_publishstream.cpp
index 25ce9021c..f68692de9 100644
--- a/trunk/src/utest/srs_utest_rtc_publishstream.cpp
+++ b/trunk/src/utest/srs_utest_rtc_publishstream.cpp
@@ -26,7 +26,7 @@
 #include <srs_app_rtc_conn.hpp>
 #include <srs_app_rtc_source.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_mock.hpp>
 
 // This test is used to verify the basic workflow of the RTC publish stream.
diff --git a/trunk/src/utest/srs_utest_rtmp_conn.cpp b/trunk/src/utest/srs_utest_rtmp_conn.cpp
index 358c0362d..2b5ac0760 100644
--- a/trunk/src/utest/srs_utest_rtmp_conn.cpp
+++ b/trunk/src/utest/srs_utest_rtmp_conn.cpp
@@ -28,10 +28,10 @@
 #include <srs_protocol_io.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_st.hpp>
-#include <srs_utest_app10.hpp>
+#include <srs_utest_ai15.hpp>
 #include <srs_utest_app13.hpp>
-#include <srs_utest_app16.hpp>
-#include <srs_utest_app6.hpp>
+#include <srs_utest_ai18.hpp>
+#include <srs_utest_ai11.hpp>
 #include <srs_utest_mock.hpp>
 #include <srs_utest_service.hpp>