diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py
index 969b132..c59453a 100644
--- a/lib/worker_multibuild.py
+++ b/lib/worker_multibuild.py
@@ -2,7 +2,6 @@ from os import listdir, walk
 from os.path import exists, isfile, join
 import requests
 import re
-from .renderers import *
 
 
 request_data = {
@@ -85,7 +84,7 @@ def _get_dockerfile_contents(props, jobname, os_codename):
     }[os_codename]
 
 
-def trigger_child_hooks(buildbotUrl: str, os_codename: str, repository, branch, jobname, directory=".buildbot"):
+def trigger_child_hooks(buildbotUrl: str, os_codename: str, repository, branch, jobname, directory=".buildbot", is_build_script_available, is_test_script_available):
     request_url = buildbotUrl + ty
 
     # List all jobs in the directory
diff --git a/multibuild.py b/multibuild.py
index d27c139..48415db 100644
--- a/multibuild.py
+++ b/multibuild.py
@@ -18,11 +18,6 @@ from buildbot.plugins import steps, util
 
 from .lib.renderers import *
 
-addStep(steps.ShellCommand(
-    name="download worker",
-    command=["sudo", "wget", "-O", "lib/worker_multibuild.py", "worker_multibuild.py"]
-))
-
 
 def find_artifacts(directory="out"):
     """
@@ -67,24 +62,25 @@ def add_parent_step(build_factory):
     )
 
 
-def add_child_build_sh_step(build_factory, directory=".buildbot"):
+def add_child_sh_steps(build_factory, directory=".buildbot"):
     """
-    Add a step to the build factory
+        Add a step to the download, build and test factory
     """
+
+    build_factory.addStep(steps.ShellCommand(
+        name="download worker",
+        command=["sudo", "wget", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", "worker_multibuild.py"]
+    ))
+
     build_factory.addStep(
         steps.ShellCommand(
             name=util.Interpolate("build_%(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/build.sh", directory=directory),
             doStepIf=is_build_script_available,
             hideStepIf=isnt_build_script_available,
         )
     )
 
-
-def add_child_test_sh_step(build_factory, directory=".buildbot"):
-    """
-    Add a step to the build factory
-    """
     build_factory.addStep(
         steps.ShellCommand(
             name= util.Interpolate("test_%(prop:jobname)s"),
@@ -106,7 +102,7 @@ if __name__ == "__main__":
         buildbotUrl = sys.argv[4]
         os_codename = sys.argv[5]
 
-        trigger_child_hooks(buildbotUrl, os_codename, repository, branch, jobname)
+        trigger_child_hooks(buildbotUrl, os_codename, repository, branch, jobname, ".buildbot", is_build_script_available, is_test_script_available)
     else:
         print(
             "Usage: python3 multibuild.py <jobname> <repository> <branch> <buildbotUrl> <os_codename>"