systemd: re-add tests
Merge pull request #1002 from jonboulle/systemd

systemd: re-add tests