diff --git a/ace/ace_standard/Test.json b/ace/ace_standard/Test.json
index a3430781b482cae85970b97ccce8d6ac024bced7..aa21f2afd7b28901156f0701914e7822c9c7528a 100755
--- a/ace/ace_standard/Test.json
+++ b/ace/ace_standard/Test.json
@@ -2,9 +2,9 @@
     "description": "Configuration for aceceshi Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "1000000",
+        "test-timeout": "1800000",
         "package": "com.example.aceceshi",
-        "shell-timeout": "250000"
+        "shell-timeout": "1800000"
     },
     "kits": [
         {
diff --git a/ace/ace_standard/src/main/js/default/test/List.test.js b/ace/ace_standard/src/main/js/default/test/List.test.js
index a46bfb645db8428b3557919d9d109456fffd0036..ea29db887fa608208983cdc2fd713991c71afb1e 100644
--- a/ace/ace_standard/src/main/js/default/test/List.test.js
+++ b/ace/ace_standard/src/main/js/default/test/List.test.js
@@ -26,7 +26,6 @@ require('./tabsProps.test.js')
 require('./progressProps.test.js')
 require('./dividerProps.test.js')
 require('./pickerProps.test.js')
-require('./pickerViewProps.test.js')
 require('./labelProps.test.js')
 require('./stackProps.test.js')
 require('./panelProps.test.js')
diff --git a/ace/ace_standard_video/Test.json b/ace/ace_standard_video/Test.json
index a367f9f9e2b859427501a54b2664546c65dbe270..a4a1e54f85ab407659428e6fae455f022a1fefad 100644
--- a/ace/ace_standard_video/Test.json
+++ b/ace/ace_standard_video/Test.json
@@ -2,9 +2,9 @@
     "description": "Configuration for acevideo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "250000",
+        "test-timeout": "30000",
         "package": "com.example.acevideo",
-        "shell-timeout": "250000"
+        "shell-timeout": "30000"
     },
     "kits": [
         {