diff -Nru debomatic-0.22/debian/changelog debomatic-0.22/debian/changelog
--- debomatic-0.22/debian/changelog	2017-06-24 12:32:24.000000000 +0000
+++ debomatic-0.22/debian/changelog	2017-07-02 08:45:48.000000000 +0000
@@ -1,3 +1,18 @@
+debomatic (0.22-3) unstable; urgency=medium
+
+  * debian/control:
+    - Remove dh-systemd from Build-Depends, its components are merged
+      into debhelper.
+    - texlive-generic-extra is now replaced by texlive-plain-generic.
+  * debian/tests/build:
+    - Improve code to be more reliable.
+  * debian/tests/command-rebuild:
+    - Implement a DEP8 test which rebuilds a source package.
+  * debian/tests/control:
+    - Add fakeroot to Depends list.
+
+ -- Luca Falavigna <dktrkranz@debian.org>  Sun, 02 Jul 2017 10:45:48 +0200
+
 debomatic (0.22-2r1) unstable; urgency=medium
 
   * debian/control:
diff -Nru debomatic-0.22/debian/control debomatic-0.22/debian/control
--- debomatic-0.22/debian/control	2017-06-24 12:32:24.000000000 +0000
+++ debomatic-0.22/debian/control	2017-06-25 08:14:45.000000000 +0000
@@ -6,14 +6,12 @@
 Build-Depends: debhelper (>= 10),
                python3 (>= 3.2~),
                dh-python,
-               dh-systemd,
                python3-sphinx,
                texlive-latex-base,
                texlive-latex-recommended,
                texlive-fonts-recommended,
                texlive-latex-extra,
-               texlive-generic-extra,
-               gettext
+               texlive-plain-generic
 X-Python3-Version: >= 3.2
 Standards-Version: 4.0.0
 Homepage: https://debomatic.github.io
diff -Nru debomatic-0.22/debian/tests/build debomatic-0.22/debian/tests/build
--- debomatic-0.22/debian/tests/build	2017-06-24 12:22:00.000000000 +0000
+++ debomatic-0.22/debian/tests/build	2017-07-01 11:01:31.000000000 +0000
@@ -5,12 +5,14 @@
 
 sed -i 's/modules: True/modules: False/' /etc/debomatic/debomatic.conf
 grep /etc/debomatic/debomatic.conf -e "modules: False" || exit 1
+sed -i "s|incoming: /incoming|incoming: $ADTTMP/incoming|" /etc/debomatic/debomatic.conf
+grep /etc/debomatic/debomatic.conf -e "incoming: $ADTTMP/incoming" || exit 1
 
 mkdir -p $HOME/.dput.d/profiles
 cat > $HOME/.dput.d/profiles/local.json << EOF
 {
     "meta": "debomatic",
-    "incoming": "/incoming",
+    "incoming": "$ADTTMP/incoming",
     "method": "local",
     "check-debs": {
         "skip": true
@@ -18,14 +20,14 @@
 }
 EOF
 
-mkdir /incoming
+mkdir "$ADTTMP"/incoming
 version=$(rmadison -u debian -a source -s unstable hello | cut -d"|" -f 2 | xargs)
 upstream=$(echo $version | cut -d"-" -f1 | xargs)
 component=$(rmadison -u debian -a source -s unstable hello | cut -d"|" -f 3 | cut -d"/" -f2 | sed 's/unstable/main/' | xargs)
 dget -u http://deb.debian.org/debian/pool/$component/h/hello/hello_$version.dsc
 cd hello-$upstream/
-debuild -S -uc -us
+debuild -S -d -uc -us
 dput local ../hello_"$version"_source.changes
-debomatic -c /etc/debomatic/debomatic.conf -o /incoming/hello_"$version"_source.changes -i
-cat /incoming/unstable/pool/hello_$version/hello_$version.buildlog
-grep /incoming/unstable/pool/hello_$version/hello_$version.buildlog -e "Status: successful" || exit 1
+debomatic -c /etc/debomatic/debomatic.conf -o "$ADTTMP"/incoming/hello_"$version"_source.changes -i
+cat "$ADTTMP"/incoming/unstable/pool/hello_$version/hello_$version.buildlog
+grep "$ADTTMP"/incoming/unstable/pool/hello_$version/hello_$version.buildlog -e "Status: successful" || exit 1
diff -Nru debomatic-0.22/debian/tests/command-rebuild debomatic-0.22/debian/tests/command-rebuild
--- debomatic-0.22/debian/tests/command-rebuild	1970-01-01 00:00:00.000000000 +0000
+++ debomatic-0.22/debian/tests/command-rebuild	2017-07-02 08:44:36.000000000 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+cd "$ADTTMP"
+
+sed -i 's/modules: True/modules: False/' /etc/debomatic/debomatic.conf
+grep /etc/debomatic/debomatic.conf -e "modules: False" || exit 1
+sed -i "s|incoming: /incoming|incoming: $ADTTMP/incoming|" /etc/debomatic/debomatic.conf
+grep /etc/debomatic/debomatic.conf -e "incoming: $ADTTMP/incoming" || exit 1
+
+mkdir "$ADTTMP"/incoming
+version=$(rmadison -u debian -a source -s unstable hello | cut -d"|" -f 2 | xargs)
+echo "rebuild hello_$version unstable" > "$ADTTMP"/incoming/rebuild.commands
+debomatic -c /etc/debomatic/debomatic.conf -o /$ADTTMP/incoming/rebuild.commands -i
+cat /$ADTTMP/incoming/unstable/pool/hello_$version/hello_$version.buildlog
+grep /$ADTTMP/incoming/unstable/pool/hello_$version/hello_$version.buildlog -e "Status: successful" || exit 1
+
diff -Nru debomatic-0.22/debian/tests/control debomatic-0.22/debian/tests/control
--- debomatic-0.22/debian/tests/control	2017-06-24 12:22:00.000000000 +0000
+++ debomatic-0.22/debian/tests/control	2017-07-02 08:44:36.000000000 +0000
@@ -2,9 +2,18 @@
 Depends: debomatic,
          debhelper,
          devscripts,
+         fakeroot,
          wget,
          liburi-perl,
          ca-certificates,
          debian-archive-keyring,
          dput-ng
 Restrictions: needs-root, allow-stderr
+
+Tests: command-rebuild
+Depends: debomatic,
+         devscripts,
+         wget,
+         liburi-perl,
+         ca-certificates,
+Restrictions: needs-root, allow-stderr