diff --git a/erp5/tests/testERP5TestNode.py b/erp5/tests/testERP5TestNode.py
index a86dc47992e2291ca4997e7b6d9392e1560be624..dc1241702ed3038735e05e06ccb252505e4479f1 100644
--- a/erp5/tests/testERP5TestNode.py
+++ b/erp5/tests/testERP5TestNode.py
@@ -720,9 +720,11 @@ shared = true
     # TestNode
     test_node = self.getTestNode()
     # Modify class UnitTestRunner(or more after) method
+    def patch_prepareSlapOS(*args, **kw):
+      return {'status_code':0}
     original_prepareSlapOS = RunnerClass._prepareSlapOS
     original_runTestSuite = RunnerClass.runTestSuite
-    RunnerClass._prepareSlapOS = doNothing
+    RunnerClass._prepareSlapOS = patch_prepareSlapOS
     RunnerClass.runTestSuite = patch_runTestSuite
     SlapOSControler.initializeSlapOSControler = doNothing
     # Inside test_node a runner is created using new UnitTestRunner methods
@@ -886,7 +888,9 @@ shared = true
     else:
       RunnerClass.runTestSuite = doNothing
 
-    RunnerClass._prepareSlapOS = doNothing
+    def patch_prepareSlapOS(*args, **kw):
+      return {'status_code':0}
+    RunnerClass._prepareSlapOS = patch_prepareSlapOS
     SlapOSControler.initializeSlapOSControler = doNothing
     test_node.run()
     self.assertEquals(counter, 3)
diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py
index 2e9f8bfc6accd7867159c1ffa9e6710c6089d371..763e91c463f39fa127be774467acd85c4520695e 100644
--- a/erp5/util/testnode/testnode.py
+++ b/erp5/util/testnode/testnode.py
@@ -302,8 +302,8 @@ shared = true
           runner = runner_class(self)
           logger.info("Type of current test is %s", my_test_type)
           # master testnode gets test_suites, slaves get nothing
+          testnode_software_status_dict = runner.prepareSlapOSForTestNode(test_node_slapos)
           if not(testnode_software_successfully_built):
-            testnode_software_status_dict = runner.prepareSlapOSForTestNode(test_node_slapos)
             if testnode_software_status_dict['status_code'] == 0:
               testnode_software_successfully_built = True
               logger.info("Will now skip build of testnode software")