diff -Nru dstat-0.7.4/debian/changelog dstat-0.7.4/debian/changelog
--- dstat-0.7.4/debian/changelog	2019-08-01 16:26:34.000000000 +0000
+++ dstat-0.7.4/debian/changelog	2019-08-04 18:47:20.000000000 +0000
@@ -1,3 +1,20 @@
+dstat (0.7.4-6) unstable; urgency=medium
+
+  * debian/patches/make-test-no-plugins: there is a misterious failure to test
+    all plugins on buildds. As we do test successfully --all-plugins with
+    autopkgtest anyways, disable it for now.
+
+ -- Emanuele Rocca <ema@debian.org>  Sun, 04 Aug 2019 20:47:20 +0200
+
+dstat (0.7.4-5) unstable; urgency=medium
+
+  * Add debian/tests/all-plugins.
+  * Print plugin name upon errors in o.extract().
+  * Docs artifacts are included in upstream tarball. Do not run make docs
+    clean.
+
+ -- Emanuele Rocca <ema@debian.org>  Fri, 02 Aug 2019 16:32:29 +0200
+
 dstat (0.7.4-4) unstable; urgency=medium
 
   * Source-only upload to make sure the package migrates to bullseye.
diff -Nru dstat-0.7.4/debian/patches/docs_no_make_clean dstat-0.7.4/debian/patches/docs_no_make_clean
--- dstat-0.7.4/debian/patches/docs_no_make_clean	1970-01-01 00:00:00.000000000 +0000
+++ dstat-0.7.4/debian/patches/docs_no_make_clean	2019-08-03 06:26:43.000000000 +0000
@@ -0,0 +1,17 @@
+Docs artifacts are included in upstream tarball. Do not run make docs clean.
+Author: Emanuele Rocca <ema@debian.org>
+Last-Update: 2019-08-03
+
+diff --git Makefile Makefile
+index c371f62..e1d5358 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ docs-install:
+ 
+ clean:
+ 	rm -f examples/*.pyc plugins/*.pyc
+-	$(MAKE) -C docs clean
++	#$(MAKE) -C docs clean
+ 
+ test:
+ 	./dstat --version
diff -Nru dstat-0.7.4/debian/patches/extract-print-plugin-name dstat-0.7.4/debian/patches/extract-print-plugin-name
--- dstat-0.7.4/debian/patches/extract-print-plugin-name	1970-01-01 00:00:00.000000000 +0000
+++ dstat-0.7.4/debian/patches/extract-print-plugin-name	2019-08-03 06:26:43.000000000 +0000
@@ -0,0 +1,20 @@
+Description: print plugin name upon errors in o.extract
+Author: Emanuele Rocca <ema@debian.org>
+Last-Update: 2019-08-03
+
+--- a/dstat
++++ b/dstat
+@@ -2777,7 +2794,12 @@ def perform(update):
+         line = newline
+         oline = ''
+         for o in totlist:
+-            o.extract()
++            try:
++                o.extract()
++            except Exception as err:
++                print("\n* Exception in plugin", o.name)
++                print(err)
++
+             if o in vislist:
+                 line = line + o.show() + o.showend(totlist, vislist)
+             if op.output and step == op.delay:
diff -Nru dstat-0.7.4/debian/patches/make-test-no-plugins dstat-0.7.4/debian/patches/make-test-no-plugins
--- dstat-0.7.4/debian/patches/make-test-no-plugins	1970-01-01 00:00:00.000000000 +0000
+++ dstat-0.7.4/debian/patches/make-test-no-plugins	2019-08-04 18:46:30.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,6 @@ clean:
+ test:
+ 	./dstat --version
+ 	./dstat -taf 1 5
+-	./dstat -t --all-plugins 1 5
+ 
+ dist: clean
+ 	$(MAKE) -C docs dist
diff -Nru dstat-0.7.4/debian/patches/series dstat-0.7.4/debian/patches/series
--- dstat-0.7.4/debian/patches/series	2019-07-29 17:14:17.000000000 +0000
+++ dstat-0.7.4/debian/patches/series	2019-08-04 18:47:03.000000000 +0000
@@ -4,3 +4,6 @@
 python3
 collections_abc
 name_error
+docs_no_make_clean
+extract-print-plugin-name
+make-test-no-plugins
diff -Nru dstat-0.7.4/debian/tests/all-plugins dstat-0.7.4/debian/tests/all-plugins
--- dstat-0.7.4/debian/tests/all-plugins	1970-01-01 00:00:00.000000000 +0000
+++ dstat-0.7.4/debian/tests/all-plugins	2019-08-03 06:26:43.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dstat -t --all-plugins 1 5
diff -Nru dstat-0.7.4/debian/tests/control dstat-0.7.4/debian/tests/control
--- dstat-0.7.4/debian/tests/control	2019-08-01 16:26:34.000000000 +0000
+++ dstat-0.7.4/debian/tests/control	2019-08-03 06:26:43.000000000 +0000
@@ -1,2 +1,6 @@
 Tests: cpu-header, mem-header
 Depends: dstat
+
+Tests: all-plugins
+Depends: dstat
+Restrictions: allow-stderr