diff --git a/debian/control b/debian/control
index 8b6124bd..fb71fff6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,40 +1,42 @@
 Source: dulwich
 Section: python
 Priority: optional
 Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Homepage: https://www.dulwich.io/
 Build-Depends: debhelper-compat (= 12),
                dh-python,
                git [!alpha !ppc64 !sparc64 !x32 !ia64],
+               gnupg,
                python3-all-dbg,
                python3-all-dev,
                python3-certifi,
                python3-fastimport,
+               python3-gpg,
                python3-urllib3 (>= 1.24.1)
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/python-team/packages/dulwich.git
 Vcs-Browser: https://salsa.debian.org/python-team/packages/dulwich
 Rules-Requires-Root: no
 
 Package: python3-dulwich
 Architecture: any
 Depends: python3-certifi,
          python3-urllib3 (>= 1.24.1),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
 Breaks: python3-breezy (<< 3.0.0~bzr7268)
 Recommends: python3-fastimport
 Suggests: python3-gpg
 Description: Python Git library - Python3 module
  Dulwich is a Python implementation of the file formats and protocols
  used by the Git version control system. It can currently read from and write
  to existing Git repositories and implements the protocol for pushing and
  receiving packs from remote servers.
  .
  All functionality is available in pure Python, but for improved performance
  replacements of some modules written in C are also available. This package
  includes the high performance versions.
  .
  This package contains the module built for Python version 3.x.
diff --git a/debian/patches/02_skip_flappy_test b/debian/patches/02_skip_flappy_test
index ab9adff2..b447fe6e 100644
--- a/debian/patches/02_skip_flappy_test
+++ b/debian/patches/02_skip_flappy_test
@@ -1,15 +1,15 @@
 === modified file 'dulwich/tests/test_porcelain.py'
 Index: dulwich/dulwich/tests/test_porcelain.py
 ===================================================================
 --- dulwich.orig/dulwich/tests/test_porcelain.py
 +++ dulwich/dulwich/tests/test_porcelain.py
-@@ -941,6 +941,9 @@ class PushTests(PorcelainTestCase):
+@@ -1324,6 +1324,9 @@ class PushTests(PorcelainTestCase):
          clone the remote, commit a file to the clone, then push the changes
          back to the remote.
          """
 +        self.skipTest(
 +            'test is flappy - '
 +            'see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913037')
          outstream = BytesIO()
          errstream = BytesIO()
  
diff --git a/debian/patches/disable-tcp-client-test.diff b/debian/patches/disable-tcp-client-test.diff
index be805796..484968c7 100644
--- a/debian/patches/disable-tcp-client-test.diff
+++ b/debian/patches/disable-tcp-client-test.diff
@@ -1,10 +1,12 @@
---- a/dulwich/tests/compat/test_client.py
-+++ b/dulwich/tests/compat/test_client.py
-@@ -344,6 +344,7 @@ class DulwichTCPClientTest(CompatTestCas
+Index: dulwich/dulwich/tests/compat/test_client.py
+===================================================================
+--- dulwich.orig/dulwich/tests/compat/test_client.py
++++ dulwich/dulwich/tests/compat/test_client.py
+@@ -367,6 +367,7 @@ class DulwichTCPClientTest(CompatTestCas
      def setUp(self):
          CompatTestCase.setUp(self)
          DulwichClientTestBase.setUp(self)
 +        raise SkipTest('skipped for a first build')
          if check_for_daemon(limit=1):
-             raise SkipTest('git-daemon was already running on port %s' %
-                            protocol.TCP_GIT_PORT)
+             raise SkipTest(
+                 "git-daemon was already running on port %s" % protocol.TCP_GIT_PORT
diff --git a/debian/tests/control b/debian/tests/control
index 0a8194e4..4772f8a6 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: testsuite3
-Depends: python3-dulwich, git
+Depends: python3-dulwich, git, gnupg, python3-gpg
 Restrictions: allow-stderr