diff -Nru dh-python-4.20200315/debian/changelog dh-python-4.20200315ubuntu1/debian/changelog
--- dh-python-4.20200315/debian/changelog	2020-03-15 20:46:09.000000000 +0100
+++ dh-python-4.20200315ubuntu1/debian/changelog	2020-06-19 19:18:12.000000000 +0200
@@ -1,3 +1,13 @@
+dh-python (4.20200315ubuntu1) groovy; urgency=medium
+
+  * Fix autopkgtests (Closes: #956190) (LP: #1883297)
+    - Cherry-pick upstream commit that isn't released in Debian yet
+      (https://salsa.debian.org/python-team/tools/dh-python/-/commit/e289c25)
+    - Disable the Python2 tests (tests/Makefile) as was done in version
+      4.20191017ubuntu4 in focal
+
+ -- Olivier Tilloy <olivier.tilloy@canonical.com>  Fri, 19 Jun 2020 19:18:12 +0200
+
 dh-python (4.20200315) unstable; urgency=medium
 
   [ Piotr Ożarowski ]
diff -Nru dh-python-4.20200315/dhpython/interpreter.py dh-python-4.20200315ubuntu1/dhpython/interpreter.py
--- dh-python-4.20200315/dhpython/interpreter.py	2020-03-15 20:46:09.000000000 +0100
+++ dh-python-4.20200315ubuntu1/dhpython/interpreter.py	2020-06-19 19:15:20.000000000 +0200
@@ -408,13 +408,7 @@
 
     @property
     def symlinked_include_dir(self):
-        """Return path to symlinked include directory.
-
-        >>> Interpreter('python3.7').symlinked_include_dir
-        '/usr/include/python3.7'
-        >>> Interpreter('python3.8').symlinked_include_dir
-
-        """
+        """Return path to symlinked include directory."""
         if self.impl in ('cpython2', 'pypy') or self.debug \
            or self.version >> '3.7' or self.version << '3.3':
             # these interpreters do not provide symlink,
diff -Nru dh-python-4.20200315/tests/Makefile dh-python-4.20200315ubuntu1/tests/Makefile
--- dh-python-4.20200315/tests/Makefile	2020-03-14 22:01:51.000000000 +0100
+++ dh-python-4.20200315ubuntu1/tests/Makefile	2020-06-19 19:14:27.000000000 +0200
@@ -8,7 +8,7 @@
 export DEBPYTHON3_SUPPORTED=3.7,3.8
 
 # enable or disable tests here:
-TESTS := test101 test201 test202 test203 test204 test205 test206 test207 test301 test302 test303 test304
+TESTS := test101 test301 test302 test303 test304
 
 all: $(TESTS)