diff --git a/multibuild.py b/multibuild.py
index 4d1bb83..c02a12b 100644
--- a/multibuild.py
+++ b/multibuild.py
@@ -56,7 +56,9 @@ def add_child_sh_steps(build_factory, directory=".buildbot"):
     build_factory.addStep(
         steps.ShellCommand(
             name=util.Interpolate("build_%(prop:jobname)s"),
-            command=util.Interpolate("%(kw:directory)s/%(prop:jobname)s/build.sh", directory=directory),
+            command=util.Interpolate("%(kw:directory)s/"
+                                     "%(prop:jobname)s/build.sh",
+                                     directory=directory),
             doStepIf=is_build_script_available,
             hideStepIf=isnt_build_script_available,
         )
@@ -65,7 +67,11 @@ def add_child_sh_steps(build_factory, directory=".buildbot"):
     build_factory.addStep(
         steps.ShellCommand(
             name=util.Interpolate("test_%(prop:jobname)s"),
-            command=util.Interpolate("%(kw:directory)s/%(prop:jobname)s/test.sh", directory=directory),
+            command=util.Interpolate("%(kw:directory)s/"
+                                     "%(prop:jobname)s/test.sh",
+                                     directory=directory),
+            haltOnFailure=False,
+            flunkOnFailure=True,
             doStepIf=is_test_script_available,
             hideStepIf=isnt_test_script_available,
         )
@@ -78,7 +84,7 @@ def add_child_sh_steps(build_factory, directory=".buildbot"):
                     "-type f -printf '%P\n'",
             workdir="out",
             hideStepIf=True,
-            decodeRC={0:SUCCESS, 1:SUCCESS},
+            decodeRC={0: SUCCESS, 1: SUCCESS},
             property="files_to_upload"
         )
     )