=== modified file 'Makefile'
--- Makefile	2019-07-14 23:09:25 +0000
+++ Makefile	2019-07-15 01:59:36 +0000
@@ -282,9 +282,12 @@
 maintainer-clean: clean
 	-rm --force --recursive keydir confdir statedir
 
-check:	all
+check: all
 	./mandos --check
 	./mandos-ctl --check
+	./mandos-keygen --version
+	./plugin-runner --version
+	./plugin-helpers/mandos-client-iprouteadddel --version
 
 # Run the client with a local config and key
 run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem

=== modified file 'debian/control'
--- debian/control	2019-02-11 06:14:29 +0000
+++ debian/control	2019-07-15 01:59:36 +0000
@@ -16,6 +16,7 @@
 Vcs-Browser: https://bzr.recompile.se/loggerhead/mandos/trunk/files
 Homepage: https://www.recompile.se/mandos
 Rules-Requires-Root: binary-targets
+Testsuite: autopkgtest
 
 Package: mandos
 Architecture: all

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2019-07-15 01:59:36 +0000
@@ -0,0 +1,24 @@
+Test-Command: /usr/sbin/mandos --check
+Restrictions: superficial
+Features: test-name=mandos-check
+Depends: mandos
+
+Test-Command: /usr/sbin/mandos-ctl --check --verbose
+Restrictions: allow-stderr
+Features: test-name=mandos-ctl
+Depends: mandos
+
+Test-Command: /usr/sbin/mandos-keygen --version
+Restrictions: superficial
+Features: test-name=mandos-keygen-version
+Depends: mandos-client
+
+Test-Command: /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-runner --version
+Restrictions: needs-root, superficial
+Features: test-name=plugin-runner-version
+Depends: mandos-client
+
+Test-Command: /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-helpers/mandos-client-iprouteadddel --version
+Restrictions: needs-root, superficial
+Features: test-name=mandos-client-iprouteadddel-version
+Depends: mandos-client