diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index fa30c2f5..e968d14d 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -188,7 +188,7 @@ def move_in_build_dir(self, src, dst):
         if os.path.exists(self.build_dir + '/' + src):
             shutil.move(self.build_dir + '/' + src, self.build_dir + '/' + dst)
 
-    def bitbake(self, target, bitbake_cmd=None, **kwargs):
+    def bitbake(self, target, bitbake_cmd=None, sig_handler=None, **kwargs):
         self.check_init()
         self.log.info('===================================================')
         self.log.info('Building ' + str(target))
@@ -200,6 +200,9 @@ def bitbake(self, target, bitbake_cmd=None, **kwargs):
         if bitbake_cmd:
             cmdline.append('-c')
             cmdline.append(bitbake_cmd)
+        if sig_handler:
+            cmdline.append('-S')
+            cmdline.append(sig_handler)
         if isinstance(target, list):
             cmdline.extend(target)
         else: