diff --git a/debian/control b/debian/control
index 9d29d8b43..7899ddf0f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,22 @@ Source: libgit2
 Section: libs
 Priority: optional
 Maintainer: Utkarsh Gupta <utkarsh@debian.org>
-Uploaders: Pirate Praveen <praveen@debian.org>,
-	   Mohammed Bilal <mdbilal@disroot.org>,
-	   Timo Röhling <roehling@debian.org>,
-Build-Depends: debhelper-compat (= 13),
-               python3-minimal:any,
-               pkgconf,
-               ca-certificates,
-               cmake,
-               zlib1g-dev,
-               libmbedtls-dev,
-               libssh2-1-dev,
-               libllhttp-dev,
-               libpcre2-dev,
-               libkrb5-dev,
-               ca-certificates
+Uploaders:
+ Pirate Praveen <praveen@debian.org>,
+ Mohammed Bilal <mdbilal@disroot.org>,
+ Timo Röhling <roehling@debian.org>,
+Build-Depends:
+ ca-certificates,
+ cmake,
+ debhelper-compat (= 13),
+ libkrb5-dev,
+ libllhttp-dev,
+ libmbedtls-dev,
+ libpcre2-dev,
+ libssh2-1-dev,
+ pkgconf,
+ python3-minimal:any,
+ zlib1g-dev,
 Standards-Version: 4.6.2
 Homepage: https://libgit2.github.com/
 Vcs-Git: https://salsa.debian.org/debian/libgit2.git
@@ -27,13 +28,14 @@ Package: libgit2-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
-Depends: libgit2-1.8 (= ${binary:Version}),
-         zlib1g-dev,
-         libmbedtls-dev,
-         libssh2-1-dev,
-         libllhttp-dev,
-         libpcre2-dev,
-         ${misc:Depends},
+Depends:
+ libgit2-1.8 (= ${binary:Version}),
+ libllhttp-dev,
+ libmbedtls-dev,
+ libpcre2-dev,
+ libssh2-1-dev,
+ zlib1g-dev,
+ ${misc:Depends},
 Description: low-level Git library (development files)
  libgit2 is a portable, pure C implementation of the Git
  distributed version control system core methods provided as a
@@ -44,9 +46,11 @@ Description: low-level Git library (development files)
 Package: libgit2-1.8
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: low-level Git library
  libgit2 is a portable, pure C implementation of the Git
  distributed version control system core methods provided as a
@@ -55,8 +59,10 @@ Description: low-level Git library
 Package: libgit2-fixtures
 Architecture: all
 Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
 Description: low-level Git library - test suite examples
  libgit2 is a portable, pure C implementation of the Git
  distributed version control system core methods provided as a
diff --git a/debian/tests/control b/debian/tests/control
index 241da9a2c..6bd421a00 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,6 @@
 Test-Command: cmake debian/tests;make;./libgit2_test
-Depends: @, cmake, gcc, g++
+Depends:
+ cmake,
+ g++,
+ gcc,
+ @,