diff --git a/bazel/labgrid/runner/runner.py b/bazel/labgrid/runner/runner.py
index db8096ff0f1fe333014b7f87782780be3a62ba25..a8167c9bbddf08766ef9e0f4195d14d65bd050af 100644
--- a/bazel/labgrid/runner/runner.py
+++ b/bazel/labgrid/runner/runner.py
@@ -119,7 +119,7 @@ class Runner:
         for line in err:
             stderr.write(f"{line}{linesep}")
 
-        return code
+        return (code, linesep.join(out))
 
     def __enter__(self):
         # Get a unique temporary directory, avoiding concurrent instances
diff --git a/labgrid/run/run.py b/labgrid/run/run.py
index e7a04dbcb3a3974f1429e2208a1ed718b7041ff2..5dc907742ebaf6e9e0d5018858626500b80db1ed 100644
--- a/labgrid/run/run.py
+++ b/labgrid/run/run.py
@@ -22,7 +22,7 @@ def run(
         cmd = join((f"./{program.name}", *arguments))
 
         r.put(uploads)
-        code = r.run(cmd, env)
+        code, _ = r.run(cmd, env)
         r.get(downloads, code)
 
         return code