diff --git a/tests/solo5/blk.dhall b/tests/solo5/blk.dhall
index 4bb73cf..66c5e58 100644
--- a/tests/solo5/blk.dhall
+++ b/tests/solo5/blk.dhall
@@ -13,6 +13,7 @@ in  { config =
               { solo5 =
                   Genode.Init.Start::{
                   , binary = "solo5-test_blk"
+                  , exitPropagate = True
                   , resources = { caps = 256, ram = Genode.units.MiB 3 }
                   , routes =
                       [ Genode.ServiceRoute.parent "Timer"
diff --git a/tests/solo5/default.nix b/tests/solo5/default.nix
index a2e6bf3..0cc3245 100644
--- a/tests/solo5/default.nix
+++ b/tests/solo5/default.nix
@@ -54,7 +54,7 @@ let
       name = "net";
       testConfig = ./net.dhall;
       testScript = ''
-        run_genode_until {child "ping" exited with exit value 0} 30
+        run_genode_until {child "init" exited with exit value 0} 30
       '';
       qemuMem = 64;
     }
@@ -63,7 +63,7 @@ let
       name = "net_2if";
       testConfig = ./net_2if.dhall;
       testScript = ''
-        run_genode_until {child "clients" exited with exit value 0} 30
+        run_genode_until {child "init" exited with exit value 0} 30
       '';
       qemuMem = 64;
     }
diff --git a/tests/solo5/net.dhall b/tests/solo5/net.dhall
index a19b920..7dd1777 100644
--- a/tests/solo5/net.dhall
+++ b/tests/solo5/net.dhall
@@ -49,6 +49,7 @@ in  { config =
               , ping =
                   Genode.Init.Start::{
                   , binary = "ping"
+                  , exitPropagate = True
                   , resources = { caps = 128, ram = Genode.units.MiB 6 }
                   , routes =
                       [ Genode.ServiceRoute.parent "Timer"
diff --git a/tests/solo5/net_2if.dhall b/tests/solo5/net_2if.dhall
index 7f4ef2a..12bc82b 100644
--- a/tests/solo5/net_2if.dhall
+++ b/tests/solo5/net_2if.dhall
@@ -52,6 +52,7 @@ in  { config =
               , clients =
                   Genode.Init.Start::{
                   , binary = "sequence"
+                  , exitPropagate = True
                   , resources = { caps = 256, ram = Genode.units.MiB 8 }
                   , routes =
                       [ Genode.ServiceRoute.parent "Timer"
diff --git a/tests/solo5/time.dhall b/tests/solo5/time.dhall
index ffbe06e..ef1eca8 100644
--- a/tests/solo5/time.dhall
+++ b/tests/solo5/time.dhall
@@ -15,6 +15,7 @@ in  { config =
               { solo5 =
                   Genode.Init.Start::{
                   , binary = test.mapKey
+                  , exitPropagate = True
                   , resources = { caps = 256, ram = Genode.units.MiB 3 }
                   , routes =
                       [ Genode.ServiceRoute.parent "Timer"