diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 5b098a3e01..0c9649301c 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -71,6 +71,7 @@ def main():
 
         [Service]
         StandardOutput=journal+console
+        ExecStart=/usr/lib/systemd/tests/testdata/units/end.sh
         """
     )
 
diff --git a/test/units/end.service b/test/units/end.service
index 50a68b9dd4..5455a8f33b 100644
--- a/test/units/end.service
+++ b/test/units/end.service
@@ -3,6 +3,7 @@
 Description=End the test
 After=testsuite.target
 OnFailure=poweroff.target
+OnSuccess=poweroff.target
 OnFailureJobMode=replace-irreversibly
 
 [Service]
diff --git a/test/units/end.sh b/test/units/end.sh
index cc1d7ee11e..a18c9473ea 100755
--- a/test/units/end.sh
+++ b/test/units/end.sh
@@ -13,5 +13,4 @@ set -o pipefail
 (! journalctl -q -o short-monotonic --grep "[F]ailed to parse serialized line" >>/failed)
 (! journalctl -q -o short-monotonic --grep "[F]ailed to (de)?serialize \w+" >>/failed)
 
-systemctl poweroff --no-block
 exit 0