diff --git a/testsuites/include/iCunit_config.h b/testsuites/include/iCunit_config.h
index cbf9389b..8daaae5a 100644
--- a/testsuites/include/iCunit_config.h
+++ b/testsuites/include/iCunit_config.h
@@ -38,8 +38,11 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-
+#if defined(__XTENSA_LX6__) || defined(__CSKY_V2__) // system ram is low, reduce memory usage
+#define ICUNIT_CASE_SIZE 200
+#else
 #define ICUNIT_CASE_SIZE 1500
+#endif
 #define ICUNIT_SUIT_SIZE 200
 
 
diff --git a/testsuites/include/osTest.h b/testsuites/include/osTest.h
index c1e76e74..27fab219 100644
--- a/testsuites/include/osTest.h
+++ b/testsuites/include/osTest.h
@@ -224,6 +224,8 @@ extern EVENT_CB_S g_exampleEvent;
 
 #ifdef __RISC_V__
 #define OS_TSK_TEST_STACK_SIZE 0x9000
+#elif  __XTENSA_LX6__
+#define OS_TSK_TEST_STACK_SIZE 0x800
 #else
 #define OS_TSK_TEST_STACK_SIZE 0x1000
 #endif
@@ -285,12 +287,20 @@ extern UINT32 TaskUsedCountGet(VOID);
 #define HWI_NUM_TEST1 34
 #define HWI_NUM_TEST2 35
 #define HWI_NUM_TEST3 36
+#define LOS_KERNEL_MULTI_HWI_TEST 1 // default enable multiple hwi number test case
+#elif __CSKY_V2__
+#define HWI_NUM_TEST 31 // csky_v2 only suppport one software interrupt number
+#define LOS_KERNEL_MULTI_HWI_TEST 0 // csky_v2 not support multiple hwi number test case
+#elif __XTENSA_LX6__
+#define HWI_NUM_TEST 7 // xtensa_lx6 only suppport one software interrupt number
+#define LOS_KERNEL_MULTI_HWI_TEST 0 // xtensa_lx6 not support multiple hwi number test case
 #else
+#define HWI_NUM_TEST  HWI_NUM_INT7
 #define HWI_NUM_TEST0 HWI_NUM_INT1
-#define HWI_NUM_TEST HWI_NUM_INT7
 #define HWI_NUM_TEST1 HWI_NUM_INT11
 #define HWI_NUM_TEST2 HWI_NUM_INT12
 #define HWI_NUM_TEST3 HWI_NUM_INT14
+#define LOS_KERNEL_MULTI_HWI_TEST 1 // default enable multiple hwi number test case
 #endif
 
 #define LOSCFG_BASE_IPC_QUEUE_CONFIG LOSCFG_BASE_IPC_QUEUE_LIMIT
diff --git a/testsuites/sample/kernel/hwi/It_los_hwi.c b/testsuites/sample/kernel/hwi/It_los_hwi.c
index 3804aad7..d1225569 100644
--- a/testsuites/sample/kernel/hwi/It_los_hwi.c
+++ b/testsuites/sample/kernel/hwi/It_los_hwi.c
@@ -35,18 +35,11 @@ VOID ItSuiteLosHwi()
 {
     ItLosHwi001();
     ItLosHwi002();
-    ItLosHwi003();
     ItLosHwi004();
-    ItLosHwi005();
     ItLosHwi006();
     ItLosHwi007();
     ItLosHwi008();
-    ItLosHwi009();
     ItLosHwi010();
-    ItLosHwi011();
-    ItLosHwi012();
-    ItLosHwi013();
-    ItLosHwi014();
     ItLosHwi015();
     ItLosHwi016();
     ItLosHwi017();
@@ -61,11 +54,20 @@ VOID ItSuiteLosHwi()
     ItLosHwi026();
 #endif
     ItLosHwi027();
-    ItLosHwi028();
-    ItLosHwi029();
     ItLosHwi030();
     ItLosHwi031();
+    ItLosHwi034();
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+    ItLosHwi003();
+    ItLosHwi005();
+    ItLosHwi009();
+    ItLosHwi011();
+    ItLosHwi012();
+    ItLosHwi013();
+    ItLosHwi014();
+    ItLosHwi028();
+    ItLosHwi029();
     ItLosHwi032();
     ItLosHwi033();
-    ItLosHwi034();
+#endif
 }
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi.h b/testsuites/sample/kernel/hwi/it_los_hwi.h
index b93df294..45e7dff2 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi.h
+++ b/testsuites/sample/kernel/hwi/it_los_hwi.h
@@ -51,18 +51,11 @@ extern "C" {
 
 extern VOID ItLosHwi001(VOID);
 extern VOID ItLosHwi002(VOID);
-extern VOID ItLosHwi003(VOID);
 extern VOID ItLosHwi004(VOID);
-extern VOID ItLosHwi005(VOID);
 extern VOID ItLosHwi006(VOID);
 extern VOID ItLosHwi007(VOID);
 extern VOID ItLosHwi008(VOID);
-extern VOID ItLosHwi009(VOID);
 extern VOID ItLosHwi010(VOID);
-extern VOID ItLosHwi011(VOID);
-extern VOID ItLosHwi012(VOID);
-extern VOID ItLosHwi013(VOID);
-extern VOID ItLosHwi014(VOID);
 extern VOID ItLosHwi015(VOID);
 extern VOID ItLosHwi016(VOID);
 extern VOID ItLosHwi017(VOID);
@@ -76,15 +69,25 @@ extern VOID ItLosHwi024(VOID);
 extern VOID ItLosHwi025(VOID);
 extern VOID ItLosHwi026(VOID);
 extern VOID ItLosHwi027(VOID);
-extern VOID ItLosHwi028(VOID);
-extern VOID ItLosHwi029(VOID);
 extern VOID ItLosHwi030(VOID);
 extern VOID ItLosHwi031(VOID);
-extern VOID ItLosHwi032(VOID);
-extern VOID ItLosHwi033(VOID);
 extern VOID ItLosHwi034(VOID);
 extern VOID LltLosHwi035(VOID);
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+extern VOID ItLosHwi003(VOID);
+extern VOID ItLosHwi005(VOID);
+extern VOID ItLosHwi009(VOID);
+extern VOID ItLosHwi011(VOID);
+extern VOID ItLosHwi012(VOID);
+extern VOID ItLosHwi013(VOID);
+extern VOID ItLosHwi014(VOID);
+extern VOID ItLosHwi028(VOID);
+extern VOID ItLosHwi029(VOID);
+extern VOID ItLosHwi032(VOID);
+extern VOID ItLosHwi033(VOID);
+#endif
+
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_003.c b/testsuites/sample/kernel/hwi/it_los_hwi_003.c
index 5d06258e..1de76ec5 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_003.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_003.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF01(VOID)
 {
@@ -82,3 +83,4 @@ VOID ItLosHwi003(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi003", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL0, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_004.c b/testsuites/sample/kernel/hwi/it_los_hwi_004.c
index 82a39ed9..55fa0ad1 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_004.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_004.c
@@ -41,7 +41,7 @@ static VOID HwiF01(VOID)
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
 
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_005.c b/testsuites/sample/kernel/hwi/it_los_hwi_005.c
index d75482ae..799a760d 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_005.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_005.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 #ifdef __RISC_V__
 #define HWI_NUM_INT0 HWI_NUM_TEST2
@@ -84,3 +85,4 @@ VOID ItLosHwi005(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi005", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL0, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_009.c b/testsuites/sample/kernel/hwi/it_los_hwi_009.c
index bbb2e774..92096378 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_009.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_009.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -104,3 +105,4 @@ VOID ItLosHwi009(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi009", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL1, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_011.c b/testsuites/sample/kernel/hwi/it_los_hwi_011.c
index 98160e97..e1984223 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_011.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_011.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -117,3 +118,4 @@ VOID ItLosHwi011(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi011", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL1, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_012.c b/testsuites/sample/kernel/hwi/it_los_hwi_012.c
index fc4ab8a8..9edd365d 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_012.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_012.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -117,3 +118,4 @@ VOID ItLosHwi012(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi012", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL1, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_013.c b/testsuites/sample/kernel/hwi/it_los_hwi_013.c
index ea1a7212..d9249c6d 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_013.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_013.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -116,3 +117,4 @@ VOID ItLosHwi013(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi013", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL1, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_014.c b/testsuites/sample/kernel/hwi/it_los_hwi_014.c
index 81015320..0edfc29a 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_014.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_014.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -106,3 +107,4 @@ VOID ItLosHwi014(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi014", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL2, TEST_FUNCTION);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_017.c b/testsuites/sample/kernel/hwi/it_los_hwi_017.c
index 0afb9277..9c1ebf69 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_017.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_017.c
@@ -84,7 +84,7 @@ static VOID HwiF01(VOID)
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
 
@@ -97,7 +97,6 @@ static UINT32 Testcase(VOID)
     ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // Compare wiht the expected value 2.
 
 EXIT:
-    TestHwiDelete(HWI_NUM_TEST3);
     TestHwiDelete(HWI_NUM_TEST);
 
     return LOS_OK;
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_018.c b/testsuites/sample/kernel/hwi/it_los_hwi_018.c
index c78e0f05..6b28b622 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_018.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_018.c
@@ -67,7 +67,7 @@ EXIT:
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
     TSK_INIT_PARAM_S task;
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_019.c b/testsuites/sample/kernel/hwi/it_los_hwi_019.c
index 6e4cb6f7..4b4d8e3e 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_019.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_019.c
@@ -76,7 +76,7 @@ EXIT:
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
     TSK_INIT_PARAM_S task;
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_020.c b/testsuites/sample/kernel/hwi/it_los_hwi_020.c
index 40b4b2c3..0bb09106 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_020.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_020.c
@@ -94,7 +94,7 @@ EXIT:
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
     TSK_INIT_PARAM_S task;
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_021.c b/testsuites/sample/kernel/hwi/it_los_hwi_021.c
index 37a7f121..e4c714fe 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_021.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_021.c
@@ -86,7 +86,7 @@ EXIT:
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
     TSK_INIT_PARAM_S task;
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_024.c b/testsuites/sample/kernel/hwi/it_los_hwi_024.c
index afe7c4f2..4842ed5e 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_024.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_024.c
@@ -80,7 +80,7 @@ static UINT32 Testcase(VOID)
 {
     UINT32 ret;
     UINT32 semCount = 1;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
     TSK_INIT_PARAM_S task;
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_027.c b/testsuites/sample/kernel/hwi/it_los_hwi_027.c
index eef41a17..2c61806c 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_027.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_027.c
@@ -43,7 +43,7 @@ static UINT32 Testcase(VOID)
     UINT32 ret;
     UINT32 index;
     UINT32 loop;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
 
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_028.c b/testsuites/sample/kernel/hwi/it_los_hwi_028.c
index 80652e4b..8e65191e 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_028.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_028.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -55,7 +56,7 @@ static UINT32 Testcase(VOID)
 {
     UINT32 ret;
     UINT32 loop;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
     UINT32 intSave1;
@@ -121,3 +122,4 @@ VOID ItLosHwi028(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi028", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL3, TEST_PRESSURE);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_029.c b/testsuites/sample/kernel/hwi/it_los_hwi_029.c
index 4866ab92..c3a20692 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_029.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_029.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF03(VOID)
 {
@@ -108,3 +109,4 @@ VOID ItLosHwi029(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi029", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL3, TEST_PRESSURE);
 }
+#endif
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_032.c b/testsuites/sample/kernel/hwi/it_los_hwi_032.c
index 6e193a34..fba1c8d1 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_032.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_032.c
@@ -30,8 +30,9 @@
  */
  
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static int g_uwIndex;
 #ifdef __RISC_V__
@@ -60,7 +61,7 @@ static VOID HwiF01(VOID)
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
 
@@ -96,3 +97,4 @@ VOID ItLosHwi032(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi032", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL3, TEST_PRESSURE);
 }
+#endif
\ No newline at end of file
diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_033.c b/testsuites/sample/kernel/hwi/it_los_hwi_033.c
index d820b212..3fea4975 100644
--- a/testsuites/sample/kernel/hwi/it_los_hwi_033.c
+++ b/testsuites/sample/kernel/hwi/it_los_hwi_033.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "it_los_hwi.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "it_los_hwi.h"
 
 static VOID HwiF01(VOID)
 {
@@ -48,7 +49,7 @@ static UINT32 Testcase(VOID)
     UINT32 ret;
     UINT32 index;
     UINT32 loop;
-    HWI_PRIOR_T hwiPrio = 7;
+    HWI_PRIOR_T hwiPrio = OS_HWI_PRIO_LOWEST;
     HWI_MODE_T mode = 0;
     HWI_ARG_T arg = 0;
 
@@ -72,4 +73,5 @@ VOID ItLosHwi033(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosHwi033", Testcase, TEST_LOS, TEST_HWI, TEST_LEVEL3, TEST_PRESSURE);
 }
+#endif
 
diff --git a/testsuites/sample/kernel/mux/It_los_mutex_007.c b/testsuites/sample/kernel/mux/It_los_mutex_007.c
index 9cdbf1cb..1173cc16 100644
--- a/testsuites/sample/kernel/mux/It_los_mutex_007.c
+++ b/testsuites/sample/kernel/mux/It_los_mutex_007.c
@@ -82,7 +82,7 @@ static UINT32 Testcase(VOID)
     task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
     task.usTaskPrio = (TASK_PRIO_TEST - 1); // 1, set new task priority, it is higher than the current task.
     task.pcName = "VMuteB2_1";
-    task.uwStackSize = 0x900;
+    task.uwStackSize = LOSCFG_BASE_CORE_TSK_MIN_STACK_SIZE;
     task.uwResved = 0;
 
     ret = LOS_MuxCreate(&g_mutexTest);
@@ -94,7 +94,7 @@ static UINT32 Testcase(VOID)
     task2.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02;
     task2.usTaskPrio = (TASK_PRIO_TEST - 2); // 2, set new task priority, it is higher than the current task.
     task2.pcName = "VMuteB2_2";
-    task2.uwStackSize = 0x900;
+    task2.uwStackSize = LOSCFG_BASE_CORE_TSK_MIN_STACK_SIZE;
     task2.uwResved = 0;
 
     ret = LOS_TaskCreate(&g_testTaskID02, &task2);
diff --git a/testsuites/sample/kernel/mux/It_los_mutex_020.c b/testsuites/sample/kernel/mux/It_los_mutex_020.c
index 624a03ea..28e49ed2 100644
--- a/testsuites/sample/kernel/mux/It_los_mutex_020.c
+++ b/testsuites/sample/kernel/mux/It_los_mutex_020.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "It_los_mux.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "It_los_mux.h"
 
 static VOID HwiF02(void)
 {
@@ -94,4 +95,5 @@ VOID ItLosMux020(void)
 {
     TEST_ADD_CASE("ItLosMux020", Testcase, TEST_LOS, TEST_MUX, TEST_LEVEL2, TEST_FUNCTION);
 }
+#endif
 
diff --git a/testsuites/sample/kernel/mux/It_los_mux.c b/testsuites/sample/kernel/mux/It_los_mux.c
index 4957386c..aaf49d06 100644
--- a/testsuites/sample/kernel/mux/It_los_mux.c
+++ b/testsuites/sample/kernel/mux/It_los_mux.c
@@ -72,9 +72,11 @@ VOID ItSuiteLosMux(void)
     ItLosMux017();
     ItLosMux019();
 #ifndef __RISC_V__
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
     ItLosMux020();
 #endif
 #endif
 #endif
+#endif
 }
 
diff --git a/testsuites/sample/kernel/mux/It_los_mux.h b/testsuites/sample/kernel/mux/It_los_mux.h
index 57e00f0d..a5760b1d 100644
--- a/testsuites/sample/kernel/mux/It_los_mux.h
+++ b/testsuites/sample/kernel/mux/It_los_mux.h
@@ -61,7 +61,6 @@ VOID ItLosMux016(void);
 VOID ItLosMux017(void);
 VOID ItLosMux018(void);
 VOID ItLosMux019(void);
-VOID ItLosMux020(void);
 VOID ItLosMux021(void);
 VOID ItLosMux022(void);
 VOID ItLosMux023(void);
@@ -78,6 +77,9 @@ VOID ItLosMux034(void);
 
 VOID ItSuiteLosMux(void);
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+VOID ItLosMux020(void);
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/testsuites/sample/kernel/queue/It_los_queue.c b/testsuites/sample/kernel/queue/It_los_queue.c
index 913e3112..6830e418 100644
--- a/testsuites/sample/kernel/queue/It_los_queue.c
+++ b/testsuites/sample/kernel/queue/It_los_queue.c
@@ -156,7 +156,9 @@ VOID ItSuiteLosQueue(VOID)
 #if (LOS_KERNEL_HWI_TEST == 1)
     ItLosQueue044();
     ItLosQueue045();
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
     ItLosQueue046();
+#endif
     ItLosQueue047();
     ItLosQueue048();
     ItLosQueue050();
diff --git a/testsuites/sample/kernel/queue/It_los_queue.h b/testsuites/sample/kernel/queue/It_los_queue.h
index 3e2d9fb0..9df2de2e 100644
--- a/testsuites/sample/kernel/queue/It_los_queue.h
+++ b/testsuites/sample/kernel/queue/It_los_queue.h
@@ -94,7 +94,6 @@ extern VOID ItLosQueue042(VOID);
 extern VOID ItLosQueue043(VOID);
 extern VOID ItLosQueue044(VOID);
 extern VOID ItLosQueue045(VOID);
-extern VOID ItLosQueue046(VOID);
 extern VOID ItLosQueue047(VOID);
 extern VOID ItLosQueue048(VOID);
 extern VOID ItLosQueue050(VOID);
@@ -185,6 +184,10 @@ extern VOID ItLosQueueHead040(VOID);
 extern VOID ItLosQueueHead041(VOID);
 extern VOID ItLosQueueHead042(VOID);
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+extern VOID ItLosQueue046(VOID);
+#endif
+
 #ifdef __cplusplus
 #if __cplusplus
 }
diff --git a/testsuites/sample/kernel/queue/It_los_queue_046.c b/testsuites/sample/kernel/queue/It_los_queue_046.c
index 5663397d..26d13c52 100644
--- a/testsuites/sample/kernel/queue/It_los_queue_046.c
+++ b/testsuites/sample/kernel/queue/It_los_queue_046.c
@@ -29,8 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "It_los_queue.h"
+#include "osTest.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "It_los_queue.h"
 
 static VOID HwiF01(VOID)
 {
@@ -103,4 +105,5 @@ VOID ItLosQueue046(VOID)
 {
     TEST_ADD_CASE("ItLosQueue046", Testcase, TEST_LOS, TEST_QUE, TEST_LEVEL1, TEST_FUNCTION);
 }
+#endif
 
diff --git a/testsuites/sample/kernel/swtmr/BUILD.gn b/testsuites/sample/kernel/swtmr/BUILD.gn
index ac996688..4afcd483 100644
--- a/testsuites/sample/kernel/swtmr/BUILD.gn
+++ b/testsuites/sample/kernel/swtmr/BUILD.gn
@@ -106,6 +106,7 @@ static_library("test_swtmr") {
     "It_los_swtmr_076.c",
     "It_los_swtmr_077.c",
     "It_los_swtmr_078.c",
+    "It_los_swtmr_079.c",
     "It_los_swtmr_Align_001.c",
     "It_los_swtmr_Align_002.c",
     "It_los_swtmr_Align_003.c",
diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c
index 3cd7e675..47f34cda 100644
--- a/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c
+++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c
@@ -33,7 +33,7 @@
 #include "It_los_swtmr.h"
 
 
-#ifdef __RISC_V__
+#if defined(__RISC_V__) || defined(__XTENSA_LX6__) || defined(__CSKY_V2__)
 #define HWI_NUM_INT31 HWI_NUM_TEST
 #define HWI_NUM_INT14 HWI_NUM_TEST
 #endif
diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c
index 48aa66d2..40facfcd 100644
--- a/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c
+++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c
@@ -33,7 +33,7 @@
 #include "It_los_swtmr.h"
 
 
-#ifdef __RISC_V__
+#if defined(__RISC_V__) || defined(__XTENSA_LX6__) || defined(__CSKY_V2__)
 #define HWI_NUM_INT31 HWI_NUM_TEST
 #define HWI_NUM_INT14 HWI_NUM_TEST
 #endif
diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c
index a2d134b2..4a9e37db 100644
--- a/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c
+++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c
@@ -33,7 +33,7 @@
 #include "It_los_swtmr.h"
 
 
-#ifdef __RISC_V__
+#if defined(__RISC_V__) || defined(__XTENSA_LX6__) || defined(__CSKY_V2__)
 #define HWI_NUM_INT11 HWI_NUM_TEST
 #endif
 
diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c
index 4ce52228..1e7cdbd7 100644
--- a/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c
+++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c
@@ -33,7 +33,7 @@
 #include "It_los_swtmr.h"
 
 
-#ifdef __RISC_V__
+#if defined(__RISC_V__) || defined(__XTENSA_LX6__) || defined(__CSKY_V2__)
 #define HWI_NUM_INT12 HWI_NUM_TEST
 #endif
 
diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_069.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_069.c
index bd5920e3..526ff72c 100644
--- a/testsuites/sample/kernel/swtmr/It_los_swtmr_069.c
+++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_069.c
@@ -79,8 +79,8 @@ static UINT32 Testcase(VOID)
     ret = LOS_SwtmrTimeGet(g_swtmrId1, &tick);
     ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
 
-    // 2, assert that uwTick is equal to this.
-    ICUNIT_GOTO_EQUAL(tick, 2, tick, EXIT);
+    // 1, assert that uwTick is equal to this.
+    ICUNIT_GOTO_EQUAL(tick, 1, tick, EXIT);
 
     // 2, Here, assert that g_testCount is equal to this .
     ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT);
diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_Delay_004.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_Delay_004.c
index 01c67f60..c1d9ab0e 100644
--- a/testsuites/sample/kernel/swtmr/It_los_swtmr_Delay_004.c
+++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_Delay_004.c
@@ -68,7 +68,7 @@ static UINT32 Testcase(VOID)
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
 
     id2 = swtmrId1;
-    ICUNIT_GOTO_EQUAL(id1, id2, id2, EXIT);
+    ICUNIT_GOTO_NOT_EQUAL(id1, id2, id2, EXIT);
 
     ret = LOS_SwtmrDelete(id2);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
diff --git a/testsuites/sample/kernel/task/It_los_task_080.c b/testsuites/sample/kernel/task/It_los_task_080.c
index a65b3b00..5dd48a77 100644
--- a/testsuites/sample/kernel/task/It_los_task_080.c
+++ b/testsuites/sample/kernel/task/It_los_task_080.c
@@ -61,7 +61,7 @@ static VOID TaskF01(VOID)
     UINT32 ret;
     TSK_INIT_PARAM_S task1 = { 0 };
     task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02;
-    task1.uwStackSize = 0x400; // Set reasonable stack space
+    task1.uwStackSize = TASK_STACK_SIZE_TEST; // Set reasonable stack space
     task1.pcName = "Tsk080B";
     task1.usTaskPrio = TASK_PRIO_TEST - 1;
     task1.uwResved = LOS_TASK_STATUS_DETACHED;
@@ -95,7 +95,7 @@ static UINT32 TestCase(VOID)
     UINT32 ret;
     TSK_INIT_PARAM_S task1 = { 0 };
     task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
-    task1.uwStackSize = 0x400; // Set reasonable stack space
+    task1.uwStackSize = TASK_STACK_SIZE_TEST; // Set reasonable stack space
     task1.pcName = "Tsk080A";
     task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, set new task priority, it is higher than the current task.
     task1.uwResved = LOS_TASK_STATUS_DETACHED;
diff --git a/testsuites/sample/kernel/task/It_los_task_083.c b/testsuites/sample/kernel/task/It_los_task_083.c
index afd89c54..98b95333 100644
--- a/testsuites/sample/kernel/task/It_los_task_083.c
+++ b/testsuites/sample/kernel/task/It_los_task_083.c
@@ -55,15 +55,13 @@ static UINT32 TestCase(VOID)
     task1.uwStackSize = LOSCFG_BASE_CORE_TSK_MIN_STACK_SIZE + 0x100;
 
     if (LOSCFG_BASE_CORE_SWTMR == 1) {
-        startIndex = 3; // 3, init the index  according to LOSCFG_BASE_CORE_SWTMR.
         pro = 1;
     } else {
-        startIndex = 0;
         pro = 0;
     }
+    startIndex = TaskUsedCountGet() + 1;
 
     g_testCount = 0;
-    g_index = startIndex;
 
     LOS_TaskLock();
 
diff --git a/testsuites/sample/kernel/task/It_los_task_084.c b/testsuites/sample/kernel/task/It_los_task_084.c
index 5034a640..d154ae00 100644
--- a/testsuites/sample/kernel/task/It_los_task_084.c
+++ b/testsuites/sample/kernel/task/It_los_task_084.c
@@ -30,8 +30,9 @@
  */
 
 #include "osTest.h"
-#include "It_los_task.h"
 
+#if (LOS_KERNEL_MULTI_HWI_TEST == 1)
+#include "It_los_task.h"
 
 static VOID TaskF01(VOID)
 {
@@ -146,4 +147,5 @@ VOID ItLosTask084(VOID) // IT_Layer_ModuleORFeature_No
 {
     TEST_ADD_CASE("ItLosTask084", TestCase, TEST_LOS, TEST_TASK, TEST_LEVEL2, TEST_PRESSURE);
 }
+#endif
 
diff --git a/testsuites/sample/kernel/task/It_los_task_086.c b/testsuites/sample/kernel/task/It_los_task_086.c
index 2c68cb4f..ce6fc474 100644
--- a/testsuites/sample/kernel/task/It_los_task_086.c
+++ b/testsuites/sample/kernel/task/It_los_task_086.c
@@ -56,15 +56,13 @@ static VOID HwiF01(VOID)
     TestHwiClear(HWI_NUM_TEST);
 
     if (LOSCFG_BASE_CORE_SWTMR == 1) {
-        startIndex = 3; // 3, init the index  according to LOSCFG_BASE_CORE_SWTMR.
         pro = 1;
     } else {
-        startIndex = 0;
         pro = 0;
     }
+    startIndex = TaskUsedCountGet() + 1;
 
     g_testCount = 0;
-    g_index = startIndex;
 
     for (g_index = startIndex; g_index < LOSCFG_BASE_CORE_TSK_LIMIT + 1; pro++, g_testCount++, g_index++) {
         task1.usTaskPrio = pro;
diff --git a/testsuites/src/osTest.c b/testsuites/src/osTest.c
index 85b9040e..05b580cb 100644
--- a/testsuites/src/osTest.c
+++ b/testsuites/src/osTest.c
@@ -245,7 +245,7 @@ UINT32 los_TestInit(VOID)
     return ret;
 }
 
-UINT32 LosAppInit()
+UINT32 LosAppInit(VOID)
 {
     UINT32 ret;
 
@@ -299,7 +299,11 @@ UINT64 LosCpuCycleGet(VOID)
 #define HWI_BIT 2
 VOID TestHwiTrigger(UINT32 hwiNum)
 {
+#if defined(__CSKY_V2__) || defined(__XTENSA_LX6__)
+    HalIrqPending(hwiNum);
+#else
     *(volatile UINT32 *)(OS_NVIC_SETPEND + ((hwiNum >> HWI_SHIFT_NUM) << HWI_BIT)) = 1 << (hwiNum & 0x1F);
+#endif
 }
 
 VOID TestHwiUnTrigger(UINT32 hwiNum)