diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index 1b39b385d4d6..0d0a4975ba4f 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -235,8 +235,7 @@ def buildlist(self):
                 continue
             self.devlist.append(vals[0])
 
-    def waitfordevice(self, timeout=15):
-        """ Wait up to 15 seconds for a device to become available """
+    def waitfordevice(self, timeout=2):
         count = 0
         while count < timeout:
             if self.dev in self.devlist: