diff --git a/components/idf_test/integration_test/TestEnvAll.yml b/components/idf_test/integration_test/TestEnvAll.yml
index 6b21760150..b8a2a497c6 100644
--- a/components/idf_test/integration_test/TestEnvAll.yml
+++ b/components/idf_test/integration_test/TestEnvAll.yml
@@ -202,6 +202,12 @@ test environment:
     SSC2', additional param list: '', basic param list: '', script path: EnvBase.py,
   tag: SSC_T2_GPIO3, test environment detail: '[TBD] 2个ESP_8266通过UART连到PC, ESP_8266之间需要测试的Target_GPIO相连',
   test script: EnvBase}
+- {PC OS: '', Special: N, Target Count: 2.0, script path: EnvBase.py, tag: SSC_T2_JAP,
+  test environment detail: 'PC has 1 wired NIC connected to APC.
+
+    APC control the power supply of multiple APs.
+
+    2 SSC target connect with PC by UART.', test script: EnvBase}
 - {PC OS: '', Special: N, Target Count: 2.0, script path: EnvBase.py, tag: SSC_T2_PhyMode,
   test environment detail: '2 SSC target connect with PC by UART.
 
diff --git a/components/idf_test/unit_test/CIConfigs/UT_Function_SYS_01.yml b/components/idf_test/unit_test/CIConfigs/UT_Function_SYS_01.yml
index 86e191cedf..c3561aa0c5 100644
--- a/components/idf_test/unit_test/CIConfigs/UT_Function_SYS_01.yml
+++ b/components/idf_test/unit_test/CIConfigs/UT_Function_SYS_01.yml
@@ -2,7 +2,7 @@ Config: {execute count: 1, execute order: in order}
 DUT: [UT1]
 Filter:
 - Add:
-    ID: [SYS_OS_0101, SYS_OS_0102, SYS_MISC_0103, SYS_MISC_0102, SYS_MISC_0105, SYS_MISC_0104,
+    ID: [SYS_OS_0102, SYS_MISC_0103, SYS_MISC_0102, SYS_MISC_0105, SYS_MISC_0104,
       SYS_MISC_0107, SYS_MISC_0106, SYS_MISC_0109, SYS_MISC_0108, SYS_MISC_0112, SYS_MISC_0113,
       SYS_MISC_0110, SYS_MISC_0111, SYS_MISC_0115, SYS_LIB_0103, SYS_LIB_0102, SYS_LIB_0101,
       SYS_LIB_0106, SYS_LIB_0105, SYS_LIB_0104]
diff --git a/components/idf_test/unit_test/TestCaseAll.yml b/components/idf_test/unit_test/TestCaseAll.yml
index 8732296bfc..6f974e0bf5 100644
--- a/components/idf_test/unit_test/TestCaseAll.yml
+++ b/components/idf_test/unit_test/TestCaseAll.yml
@@ -2,12 +2,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_LIB_0101
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "12"
+  - - test_case = "check if ROM is used for functions"
     - [dummy]
   comment: check if ROM is used for functions
   execution time: 0
@@ -25,12 +25,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_LIB_0102
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "13"
+  - - test_case = "test time functions"
     - [dummy]
   comment: test time functions
   execution time: 0
@@ -48,12 +48,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_LIB_0103
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "14"
+  - - test_case = "test sscanf function"
     - [dummy]
   comment: test sscanf function
   execution time: 0
@@ -71,12 +71,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_LIB_0104
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "15"
+  - - test_case = "test sprintf function"
     - [dummy]
   comment: test sprintf function
   execution time: 0
@@ -94,12 +94,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_LIB_0105
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "16"
+  - - test_case = "test atoX functions"
     - [dummy]
   comment: test atoX functions
   execution time: 0
@@ -117,12 +117,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_LIB_0106
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "17"
+  - - test_case = "test ctype functions"
     - [dummy]
   comment: test ctype functions
   execution time: 0
@@ -140,12 +140,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0102
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "21"
+  - - test_case = "mbedtls MPI self-tests"
     - [dummy]
   comment: mbedtls MPI self-tests
   execution time: 0
@@ -163,12 +163,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0103
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "25"
+  - - test_case = "test AES thread safety"
     - [dummy]
   comment: test AES thread safety
   execution time: 0
@@ -186,12 +186,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0104
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "26"
+  - - test_case = "test AES acceleration"
     - [dummy]
   comment: test AES acceleration
   execution time: 0
@@ -209,12 +209,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0105
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "27"
+  - - test_case = "test SHA thread safety"
     - [dummy]
   comment: test SHA thread safety
   execution time: 0
@@ -232,12 +232,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0106
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "33"
+  - - test_case = "context switch saves FP registers"
     - [dummy]
   comment: context switch saves FP registers
   execution time: 0
@@ -255,12 +255,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0107
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "34"
+  - - test_case = "test FP sqrt"
     - [dummy]
   comment: test FP sqrt
   execution time: 0
@@ -278,12 +278,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0108
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "35"
+  - - test_case = "test FP div"
     - [dummy]
   comment: test FP div
   execution time: 0
@@ -301,12 +301,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0109
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "36"
+  - - test_case = "test FP mul"
     - [dummy]
   comment: test FP mul
   execution time: 0
@@ -324,12 +324,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0110
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "37"
+  - - test_case = "test FP add"
     - [dummy]
   comment: test FP add
   execution time: 0
@@ -347,12 +347,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0111
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "3"
+  - - test_case = "Test JPEG decompression library"
     - [dummy]
   comment: Test JPEG decompression library
   execution time: 0
@@ -370,12 +370,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0112
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "22"
+  - - test_case = "mbedtls AES self-tests"
     - [dummy]
   comment: mbedtls AES self-tests
   execution time: 0
@@ -393,12 +393,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0113
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "17"
+  - - test_case = "mbedtls SHA self-tests"
     - [dummy]
   comment: mbedtls SHA self-tests
   execution time: 0
@@ -416,12 +416,12 @@ test cases:
 - CI ready: 'Yes'
   ID: SYS_MISC_0115
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "28"
+  - - test_case = "test SHA acceleration"
     - [dummy]
   comment: test SHA acceleration
   execution time: 0
@@ -436,38 +436,15 @@ test cases:
   test point 1: basic function
   test point 2: SHA acceleration
   version: v1 (2016-10-31)
-- CI ready: 'Yes'
-  ID: SYS_OS_0101
-  SDK: ESP32_IDF
-  Test App: testje
-  auto test: 'Yes'
-  category: Function
-  cmd set:
-  - IDFUnitTest/UnitTest
-  - - test_case = "31"
-    - [dummy]
-  comment: FreeRTOS Event Groups
-  execution time: 0
-  expected result: 1. set succeed
-  initial condition: UTINIT1
-  level: Unit
-  module: System
-  steps: 1. run freertos test
-  sub module: OS
-  summary: freertos unit test
-  test environment: UT_T1_1
-  test point 1: basic function
-  test point 2: freertos
-  version: v1 (2016-10-26)
 - CI ready: 'Yes'
   ID: SYS_OS_0102
   SDK: ESP32_IDF
-  Test App: testje
+  Test App: UT
   auto test: 'Yes'
   category: Function
   cmd set:
   - IDFUnitTest/UnitTest
-  - - test_case = "2"
+  - - test_case = "Freertos TLS delete cb"
     - [dummy]
   comment: Freertos TLS delete cb
   execution time: 0
diff --git a/components/idf_test/unit_test/TestCaseScript/IDFUnitTest/UnitTest.py b/components/idf_test/unit_test/TestCaseScript/IDFUnitTest/UnitTest.py
index 6e7cac4109..2af4747e5d 100644
--- a/components/idf_test/unit_test/TestCaseScript/IDFUnitTest/UnitTest.py
+++ b/components/idf_test/unit_test/TestCaseScript/IDFUnitTest/UnitTest.py
@@ -11,7 +11,7 @@ class UnitTest(PerformanceTCBase.PerformanceTCBase):
                                                      timeout=timeout, log_path=log_path)
         
         self.test_case = None
-        self.test_timeout = 6
+        self.test_timeout = 20
                                                      
      # load param from excel
         for i in range(1, len(cmd_set)):
@@ -26,12 +26,14 @@ class UnitTest(PerformanceTCBase.PerformanceTCBase):
         
         try:
             self.serial_write_line("UT1", self.test_case)
-            time.sleep(self.test_timeout) #wait for test to run before reading result
-            data = self.serial_read_data("UT1")
-            if re.search('[^0] Tests 0 F', data): #check that number of tests run != 0 and number of tests failed == 0
-                self.set_result("Success")
+            data = ""
+            for _ in range(self.timeout):
+                time.sleep(1) #wait for test to run before reading result
+                data += self.serial_read_data("UT1")
+                if re.search('[^0] Tests 0 F', data): #check that number of tests run != 0 and number of tests failed == 0
+                    self.set_result("Success")
             else:
-               self.set_result("Fail")
+                self.set_result("Fail")
             
         except StandardError,e:
             NativeLog.add_exception_log(e)
diff --git a/components/idf_test/unit_test/TestEnvAll.yml b/components/idf_test/unit_test/TestEnvAll.yml
index 6b21760150..b8a2a497c6 100644
--- a/components/idf_test/unit_test/TestEnvAll.yml
+++ b/components/idf_test/unit_test/TestEnvAll.yml
@@ -202,6 +202,12 @@ test environment:
     SSC2', additional param list: '', basic param list: '', script path: EnvBase.py,
   tag: SSC_T2_GPIO3, test environment detail: '[TBD] 2个ESP_8266通过UART连到PC, ESP_8266之间需要测试的Target_GPIO相连',
   test script: EnvBase}
+- {PC OS: '', Special: N, Target Count: 2.0, script path: EnvBase.py, tag: SSC_T2_JAP,
+  test environment detail: 'PC has 1 wired NIC connected to APC.
+
+    APC control the power supply of multiple APs.
+
+    2 SSC target connect with PC by UART.', test script: EnvBase}
 - {PC OS: '', Special: N, Target Count: 2.0, script path: EnvBase.py, tag: SSC_T2_PhyMode,
   test environment detail: '2 SSC target connect with PC by UART.