diff --git a/Makefile b/Makefile
index aa99f35..ba8a5cc 100644
--- a/Makefile
+++ b/Makefile
@@ -269,16 +269,13 @@ orig-tar-gz: release
 #
 #  Run the test suite.
 #
-test: update-modules
+test: non-author-test author-test
+
+non-author-test: update-modules
 	prove --shuffle t/
 
-
-#
-#  Run the test suite verbosely.
-#
-test-verbose:
-	prove --shuffle --verbose t/
-
+author-test:
+	prove xt/
 
 
 #
diff --git a/debian/changelog b/debian/changelog
index 5098bd9..5b19d84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
       higher. Fixes regression introduced with 4.5 by the fix for #754517.
       - Add new (build-)dependency on libsort-versions-perl.
     + Report all SSH fingerprints of the created DomU, not only RSA ones.
+    + Split up test suite in functionality/compatibility tests (t) and
+      author/release tests (xt).
   * Update Vcs-* headers and documentation as Gitorious closed its doors
     in June 2015 and is now only available with static contents.
   * Recommend debian-archive-keyring (for installing Debian DomUs on
diff --git a/debian/rules b/debian/rules
index 4ca03b9..118f8c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,7 @@
 %:
 	dh $@
 
+override_dh_auto_test:
+	make non-author-test
+
 override_dh_auto_build:
diff --git a/t/gitignore.t b/xt/gitignore.t
similarity index 100%
rename from t/gitignore.t
rename to xt/gitignore.t
diff --git a/t/no-tabs.t b/xt/no-tabs.t
similarity index 100%
rename from t/no-tabs.t
rename to xt/no-tabs.t
diff --git a/t/pod-coverage.t b/xt/pod-coverage.t
similarity index 100%
rename from t/pod-coverage.t
rename to xt/pod-coverage.t
diff --git a/t/portable-shell.t b/xt/portable-shell.t
similarity index 100%
rename from t/portable-shell.t
rename to xt/portable-shell.t
diff --git a/t/quoted-strings.t b/xt/quoted-strings.t
similarity index 100%
rename from t/quoted-strings.t
rename to xt/quoted-strings.t
diff --git a/t/test-trailing-whitespace.t b/xt/test-trailing-whitespace.t
similarity index 100%
rename from t/test-trailing-whitespace.t
rename to xt/test-trailing-whitespace.t