diff --git a/library/runlevel/testsuite/tests/GetSetServiceStatus.out b/library/runlevel/testsuite/tests/GetSetServiceStatus.out
index a25a9a945..5100c2d55 100644
--- a/library/runlevel/testsuite/tests/GetSetServiceStatus.out
+++ b/library/runlevel/testsuite/tests/GetSetServiceStatus.out
@@ -1,14 +1,7 @@
 Read	.target.tmpdir "/tmp"
-Read	.target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled iscsid.service" 0
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/boot.iscsid-early.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/boot.iscsid-early.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/boot.iscsid-early.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled boot.iscsid-early.service" 0
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/iscsid.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled iscsid.service" 0
 Return	true
diff --git a/library/runlevel/testsuite/tests/ServiceAdjust.out b/library/runlevel/testsuite/tests/ServiceAdjust.out
index 461e877f2..0ff94f771 100644
--- a/library/runlevel/testsuite/tests/ServiceAdjust.out
+++ b/library/runlevel/testsuite/tests/ServiceAdjust.out
@@ -1,35 +1,20 @@
 Read	.target.tmpdir "/tmp"
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $[]
-Read	.target.stat "/run/systemd/system/aaa.service" $[]
-Read	.target.stat "/etc/systemd/system/aaa.service" $[]
-Read	.target.stat "/etc/init.d/aaa" $[]
-Log	Service aaa does not exist.
-Return	false
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Execute	.target.bash_output "/bin/systemctl  disable aaa.service" $["exit":0, "stderr":"", "stdout":""]
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Execute	.target.bash_output "/bin/systemctl  disable aaa.service" $["exit":0, "stderr":"", "stdout":""]
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
+Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
+Execute	.target.bash_output "/bin/systemctl  disable aaa.service" $["exit":0, "stderr":"", "stdout":""]
+Return	true
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Execute	.target.bash_output "/bin/systemctl enable aaa.service" $["exit":0, "stderr":"", "stdout":""]
 Return	true
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Execute	.target.bash_output "/bin/systemctl enable aaa.service" $["exit":0, "stderr":"", "stdout":""]
 Return	true
diff --git a/library/runlevel/testsuite/tests/ServiceFinetune.out b/library/runlevel/testsuite/tests/ServiceFinetune.out
index 5ee052612..0021987e8 100644
--- a/library/runlevel/testsuite/tests/ServiceFinetune.out
+++ b/library/runlevel/testsuite/tests/ServiceFinetune.out
@@ -1,8 +1,6 @@
 Read	.target.tmpdir "/tmp"
 Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Log	Cannot enable service aaa (just) in selected runlevels, enabling in all default ones
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl is-enabled aaa.service" 0
 Return	true
 Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
diff --git a/library/runlevel/testsuite/tests/ServiceFullInfo.out b/library/runlevel/testsuite/tests/ServiceFullInfo.out
index e0975fd55..6656467f3 100644
--- a/library/runlevel/testsuite/tests/ServiceFullInfo.out
+++ b/library/runlevel/testsuite/tests/ServiceFullInfo.out
@@ -4,6 +4,5 @@ Log	### Calling Service::Info is broken with systemd! ###
 Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Read	.init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
 Read	.init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl status aaa.service" $["TERM":"raw"] 3
 Return	$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"], "start":["0", "1", "3"], "started":3, "stop":["4", "5", "6"]]
diff --git a/library/runlevel/testsuite/tests/ServiceStatus.out b/library/runlevel/testsuite/tests/ServiceStatus.out
index de1659757..f79b62541 100644
--- a/library/runlevel/testsuite/tests/ServiceStatus.out
+++ b/library/runlevel/testsuite/tests/ServiceStatus.out
@@ -1,4 +1,3 @@
 Read	.target.tmpdir "/tmp"
-Read	.target.stat "/usr/lib/systemd/system/aaa.service" $["isreg":true]
 Execute	.target.bash "/bin/systemctl status aaa.service" $["TERM":"raw"] 3
 Return	3