diff -Nru aptly-1.3.0/debian/changelog aptly-1.3.0/debian/changelog
--- aptly-1.3.0/debian/changelog	2018-06-27 03:01:36.000000000 +0000
+++ aptly-1.3.0/debian/changelog	2018-06-29 22:11:41.000000000 +0000
@@ -1,3 +1,9 @@
+aptly (1.3.0-6) unstable; urgency=medium
+
+  * Combine autodep8 and autopkgtest.
+
+ -- Alexandre Viau <aviau@debian.org>  Fri, 29 Jun 2018 18:11:41 -0400
+
 aptly (1.3.0-5) unstable; urgency=medium
 
   * Fix syntax-error-in-dep5-copyright.
diff -Nru aptly-1.3.0/debian/control aptly-1.3.0/debian/control
--- aptly-1.3.0/debian/control	2018-06-27 03:01:36.000000000 +0000
+++ aptly-1.3.0/debian/control	2018-06-29 22:11:41.000000000 +0000
@@ -13,6 +13,7 @@
 Vcs-Git: https://salsa.debian.org/debian/aptly.git
 Vcs-Browser: https://salsa.debian.org/debian/aptly
 XS-Go-Import-Path: github.com/aptly-dev/aptly
+Testsuite: autopkgtest-pkg-go
 
 Package: aptly
 Architecture: any
diff -Nru aptly-1.3.0/debian/tests/control aptly-1.3.0/debian/tests/control
--- aptly-1.3.0/debian/tests/control	2018-06-27 03:01:36.000000000 +0000
+++ aptly-1.3.0/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-Test-Command: /usr/bin/dh_golang_autopkgtest
-Depends: @, @builddeps@, dh-golang
-Restrictions: allow-stderr
-
-Test-Command: aptly repo create autopkgtest
-Restrictions: allow-stderr
diff -Nru aptly-1.3.0/debian/tests/control.autodep8 aptly-1.3.0/debian/tests/control.autodep8
--- aptly-1.3.0/debian/tests/control.autodep8	1970-01-01 00:00:00.000000000 +0000
+++ aptly-1.3.0/debian/tests/control.autodep8	2018-06-29 22:11:41.000000000 +0000
@@ -0,0 +1,8 @@
+# This file is an addition to the autodep8 tests.
+#
+# See autodep8(1):
+# > If `debian/tests/control.autodep8` exists, autodep8
+# > will prepend the contents of that file to its own output.
+
+Test-Command: aptly repo create autopkgtest
+Restrictions: allow-stderr