diff --git a/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service b/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service
index 4fd7716081..e285277188 100644
--- a/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service
+++ b/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.service
@@ -3,6 +3,8 @@
 Description=Issue 14566 Repro
 
 [Service]
+Type=notify
+NotifyAccess=all
 ExecStart=/usr/lib/systemd/tests/testdata/TEST-07-PID1.units/%N.sh
 ExecStopPost=true
 KillMode=mixed
diff --git a/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.sh b/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.sh
index 74fa7605e7..ec0268e891 100755
--- a/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.sh
+++ b/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/issue14566-repro.sh
@@ -3,4 +3,5 @@
 
 sleep infinity &
 echo $! >/leakedtestpid
+systemd-notify --ready
 wait $!
diff --git a/test/units/TEST-07-PID1.issue-14566.sh b/test/units/TEST-07-PID1.issue-14566.sh
index ecc18e411b..05fade9c4c 100755
--- a/test/units/TEST-07-PID1.issue-14566.sh
+++ b/test/units/TEST-07-PID1.issue-14566.sh
@@ -14,13 +14,12 @@ if [[ -v ASAN_OPTIONS ]]; then
 fi
 
 systemctl start issue14566-repro
-sleep 4
 systemctl status issue14566-repro
 
 leaked_pid=$(cat /leakedtestpid)
 
 systemctl stop issue14566-repro
-sleep 4
+timeout 30 bash -c 'while systemctl is-active issue14566-repro; do sleep .5; done'
 
 # Leaked PID will still be around if we're buggy.
 # I personally prefer to see 42.