2 files changed, 37 insertions, 3 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 27a3a6c..1e38cb1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,5 @@
-Tests: debian-testing
+Features: test-name=debian-testing-minbase
+Test-Command: ./debian/tests/debian-testing minbase
 Depends:
  debootstrap,
  libdistro-info-perl,
@@ -8,6 +9,35 @@ Depends:
  systemd [linux-any],
  systemd-container [linux-any],
  ca-certificates,
+ distro-info,
+Restrictions: allow-stderr, needs-root
+
+Features: test-name=debian-testing-buildd
+Test-Command: ./debian/tests/debian-testing buildd
+Depends:
+ debootstrap,
+ libdistro-info-perl,
+ libdpkg-perl,
+ libipc-run-perl,
+ perl,
+ systemd [linux-any],
+ systemd-container [linux-any],
+ ca-certificates,
+ distro-info,
+Restrictions: allow-stderr, needs-root
+
+Features: test-name=debian-testing-default
+Test-Command: ./debian/tests/debian-testing -
+Depends:
+ debootstrap,
+ libdistro-info-perl,
+ libdpkg-perl,
+ libipc-run-perl,
+ perl,
+ systemd [linux-any],
+ systemd-container [linux-any],
+ ca-certificates,
+ distro-info,
 Restrictions: allow-stderr, needs-root
 
 Tests: unsorted-packages-files
diff --git a/debian/tests/debian-testing b/debian/tests/debian-testing
index df94254..126cb82 100755
--- a/debian/tests/debian-testing
+++ b/debian/tests/debian-testing
@@ -16,6 +16,10 @@ use Dpkg::Version;
 use IPC::Run qw(run);
 use Test::More;
 
+if (scalar @ARGV != 1) {
+    die "usage: $0 [minbase|-|buildd]"
+}
+my $variant = $ARGV[0];
 my $srcdir = getcwd;
 
 sub verbose_run {
@@ -335,7 +339,7 @@ my $testing = $distro_info->testing;
 # Should specify multiple components for checking (see Bug#898738)
 if (!verbose_run([length($ENV{DEBOOTSTRAP_SCRIPT}) ? $ENV{DEBOOTSTRAP_SCRIPT} : 'debootstrap',
             '--include=debootstrap,debian-archive-keyring,gnupg,hello,systemd',
-            '--variant=minbase',
+            "--variant=$variant",
             '--components=main,contrib,non-free',
             $testing, 'chroot.d', $mirror], '>&2')) {
     BAIL_OUT("debootstrap failed: $?");
@@ -370,7 +374,7 @@ else {
             '--bind-ro=/usr/sbin/debootstrap',
             '--bind-ro=/usr/share/debootstrap',
             '--',
-            'debootstrap', '--include=hello', '--variant=minbase',
+            'debootstrap', '--include=hello', "--variant=$variant",
             $testing, '/mnt/from-nspawn.d', $mirror], '>&2')) {
         BAIL_OUT("debootstrap wrapped in systemd-nspawn failed: $?");
     }