diff --git a/agent-simulator/scripts/zucchini/setup.py b/agent-simulator/scripts/zucchini/setup.py
index e69207f937a..233f782de5f 100644
--- a/agent-simulator/scripts/zucchini/setup.py
+++ b/agent-simulator/scripts/zucchini/setup.py
@@ -44,10 +44,10 @@ def getGlobalSettings():
                        'use.user.concentrated.pod.allocation':'false',
                        'vm.allocation.algorithm':'firstfit',
                        'capacity.check.period':'0',
-                       'host.stats.interval':'-1',
-                       'vm.stats.interval':'-1',
-                       'storage.stats.interval':'-1',
-                       'router.stats.interval':'-1',
+#                       'host.stats.interval':'-1',
+#                       'vm.stats.interval':'-1',
+#                       'storage.stats.interval':'-1',
+#                       'router.stats.interval':'-1',
                        'vm.op.wait.interval':'5',
                        'xen.public.network.device':'10.10.10.10', #only a dummy for the simulator
                        'guest.domain.suffix':'zcloud.simulator',
@@ -55,7 +55,7 @@ def getGlobalSettings():
                        'direct.agent.load.size':'1000',
                        'default.page.size':'10000',
                        'linkLocalIp.nums':'4',
-                       'systemvm.use.local.storage':'true',
+                       'system.vm.use.local.storage':'true',
                        'use.local.storage':'true',
                        'check.pod.cidrs':'false',
                       }
diff --git a/agent-simulator/scripts/zucchini/tests/testListVm.py b/agent-simulator/scripts/zucchini/tests/testListVm.py
new file mode 100644
index 00000000000..12fdb869eb6
--- /dev/null
+++ b/agent-simulator/scripts/zucchini/tests/testListVm.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+'''
+List Virtual Machine tests
+'''
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+import timeit
+import random
+from cloudstackAPI import *
+from cloudstackTestCase import *
+
+class ListVmTests(cloudstackTestCase):
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_listAllVm(self):
+        numVms = 0
+        def time_listAllVm():
+            api = self.testClient.getApiClient()
+            listVmCmd = listVirtualMachines.listVirtualMachinesCmd()
+            listVmCmd.account = 'admin'
+            listVmCmd.zoneid = 1
+            listVmCmd.domainid = 1
+            numVms = len(api.listVirtualMachines(listVmCmd))
+
+        t = timeit.Timer(time_listAllVm)
+        l = t.repeat(5, 5)
+        self.debug("Number of VMs: " + str(len(numVms)) + ", time for last 5 listVM calls : " + str(l))
diff --git a/tools/testClient/cloudstackTestCase.py b/tools/testClient/cloudstackTestCase.py
index 39696b2ca9f..8625d683cb5 100644
--- a/tools/testClient/cloudstackTestCase.py
+++ b/tools/testClient/cloudstackTestCase.py
@@ -1,5 +1,8 @@
 from cloudstackAPI import *
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import cloudstackTestClient
 class cloudstackTestCase(unittest.case.TestCase):
     def __init__(self, args):