diff --git a/debian/control b/debian/control
index 08bdb03..d94ed40 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@
                dh-elpa
 Standards-Version: 4.4.0
 Rules-Requires-Root: no
-Testsuite: autopkgtest-pkg-elpa
 Homepage: https://github.com/kiwanami/emacs-deferred
 Vcs-Browser: https://salsa.debian.org/emacsen-team/emacs-deferred
 Vcs-Git: https://salsa.debian.org/emacsen-team/emacs-deferred.git
diff --git a/debian/elpa-test b/debian/elpa-test
new file mode 100644
index 0000000..3bb166e
--- /dev/null
+++ b/debian/elpa-test
@@ -0,0 +1,4 @@
+# Do not run concurrent tests by means of dh_elpa_test
+ert_exclude = test/concurrent-test.el
+# Keep contents of the test directory
+autopkgtest_keep = test/*
diff --git a/debian/rules b/debian/rules
index 72cdafb..cc7f49d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,8 @@
 override_dh_auto_build:
 	@echo skipping upstream build
 
-.PHONY: override_dh_auto_build
+override_dh_elpa_test:
+	/usr/bin/emacs -batch -Q -L . -l deferred -l concurrent -l test/concurrent-test.el -f cc:test-all
+	/usr/bin/dh_elpa_test
+
+.PHONY: override_dh_auto_build override_dh_elpa_test
diff --git a/debian/tests/all b/debian/tests/all
new file mode 100755
index 0000000..f0ff044
--- /dev/null
+++ b/debian/tests/all
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Run concurrent and deferred tests without dh_elpa_test
+/usr/bin/emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -l test/concurrent-test.el -f cc:test-all &> /dev/stdout
+
+/usr/bin/emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -l test/deferred-test.el --eval \(ert-run-tests-batch-and-exit\) &> /dev/stdout
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..d340621
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: all
+Depends: emacs, elpa-deferred, elpa-concurrent