diff --git a/powermgr/battery_manager/Test.json b/powermgr/battery_manager/Test.json
index fa78e7e02851dace7b5efe17e9cfe9996620b863..016fbda4121bd9a29a53e367a4d04317cd0ec5bc 100755
--- a/powermgr/battery_manager/Test.json
+++ b/powermgr/battery_manager/Test.json
@@ -2,9 +2,9 @@
     "description": "Configuration for powermgr battery Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "90000",
         "package": "com.example.mybatteryapp",
-        "shell-timeout": "60000"
+        "shell-timeout": "90000"
     },
     "kits": [
         {
diff --git a/powermgr/thermal_manager/src/main/js/default/test/thermal_unittest.test.js b/powermgr/thermal_manager/src/main/js/default/test/thermal_unittest.test.js
index 4b7459c15eb30c0fde7a2e6bb61e70d6c707bcc7..4e748ed6121a66f93020a0b9056eb3f44c34c9bd 100644
--- a/powermgr/thermal_manager/src/main/js/default/test/thermal_unittest.test.js
+++ b/powermgr/thermal_manager/src/main/js/default/test/thermal_unittest.test.js
@@ -37,7 +37,7 @@ function test14() {
             setTimeout(() => {
                 let level = thermal.getThermalLevel();
                 console.info("level is: " + level);
-                expect(level == -1).assertTrue();
+                expect(level >= 0 && level <= 6).assertTrue();
                 resolve();
                 done();
             }, MSEC_1000 * 4);
@@ -54,7 +54,7 @@ function test15() {
     it('Thermal_015', 0, async function (done) {
         thermal.subscribeThermalLevel((level) => {
             console.info("level is: " + level);
-            expect(level == -1).assertTrue();
+              expect(level >= 0 && level <= 6).assertTrue();
             done();
         })
         await new Promise((resolve, reject) => {