diff --git a/CONTRIBUTING b/CONTRIBUTING
index 5ab7bcce..588f87dd 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -58,6 +58,9 @@ tests in parallel to make whole thing go faster by doing:
 
   make -jN -lN check
 
+distcheck
+---------
+
 If you want to test the fabrication of the distribution tarball (this
 is important, because that is how we do to actually release the
 tarball of the project that you can download from the internet) then
@@ -85,19 +88,14 @@ Please make sure you always launch "make distcheck-fast" before sending a
 patch, so that you are sure that we can always build a tarball after
 your patch is applied to the source tree.
 
-A complementary regression checking target is "check-self-compare".
-You invoke it by doing "make check-self-compare".  That target
-analyzes the ABI of the libabigail.so shared object, serializes it
+tests/runtestselfcompare.sh
+---------------------------
+
+This one analyzes the ABI of the libabigail.so shared object, serializes it
 into the ABIXML format and then compares the ABI internal
 representation gathered from the libabigail.so binary against the one
 gathered from the ABIXML format.  The two should be equal if
-everything goes right.  This is an important regression test.  The
-problem is that it can take a considerable amount of time.
-So we've put it into its own separate target.
-
-So, to be complete the regression checking command to run against your
-patch should be: "make check-self-compare distcheck-fast -j16", if you have
-a machine with a 16 threads processors, for instance.
+everything goes right.  This is an important regression test.
 
 Launching regression tests in Valgrind
 --------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 65a1b121..99353e82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,17 +80,10 @@ tarball-and-tag-and-upload: tarball-and-all
 tarball-and-all: tag-and-all
 	$(MAKE) tarball
 
-tag-and-all: distcheck check-self-compare
+tag-and-all: distcheck
 	$(MAKE) tag-release-only
 
 # the default for GZIP_ENV is --best, which is pretty slow for check runs
 # distcheck-fast therefore compresses with --fast instead
 distcheck-fast:
 	$(MAKE) distcheck GZIP_ENV="--fast"
-
-# This makes us compare libabigail.so against its own ABIXML
-# representation.  It's super slow (more than 5 minutes on one of my
-# old boxes) so I do this only before releases.
-check-self-compare:
-	$(MAKE) -C tests check-self-compare
-
diff --git a/configure.ac b/configure.ac
index 29130175..1172a9fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -969,8 +969,8 @@ libabigail.pc
 dnl Some test scripts are generated by autofoo.
 AC_CONFIG_FILES([tests/runtestcanonicalizetypes.sh],
 		[chmod +x tests/runtestcanonicalizetypes.sh])
-		AC_CONFIG_FILES([tests/runtestslowselfcompare.sh],
-		[chmod +x tests/runtestslowselfcompare.sh])
+AC_CONFIG_FILES([tests/runtestselfcompare.sh],
+		[chmod +x tests/runtestselfcompare.sh])
 AC_CONFIG_FILES([tests/mockfedabipkgdiff],
 		[chmod +x tests/mockfedabipkgdiff])
 AC_CONFIG_FILES([tests/runtestfedabipkgdiff.py],
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 17e2d4b4..27ecb623 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,11 +12,9 @@ FEDABIPKGDIFF_TEST += runtestfedabipkgdiff.py
 endif
 endif
 
-RUN_TEST_SLOW_SELF_COMPARE=runtestslowselfcompare.sh
-
 # rather expensive tests (keep in this order), > 1s runtime
 TESTS=				\
-$(RUN_TEST_SLOW_SELF_COMPARE)   \
+runtestselfcompare.sh		\
 runtestdiffsuppr		\
 runtesttypesstability		\
 runtestdiffpkg			\
@@ -60,7 +58,7 @@ endif
 EXTRA_DIST = \
 runtestcanonicalizetypes.sh.in \
 runtestfedabipkgdiff.py.in \
-runtestslowselfcompare.sh.in \
+runtestselfcompare.sh.in \
 mockfedabipkgdiff.in \
 test-valgrind-suppressions.supp
 
@@ -183,8 +181,8 @@ testdiff2_LDADD=$(top_builddir)/src/libabigail.la
 printdifftree_SOURCES = print-diff-tree.cc
 printdifftree_LDADD = $(top_builddir)/src/libabigail.la
 
-runtestslowselfcompare_sh_SOURCES =
-runtestslowselfcompare.sh$(EXEEXT):
+runtestselfcompare_sh_SOURCES =
+runtestselfcompare.sh$(EXEEXT):
 
 runtestcanonicalizetypes_sh_SOURCES =
 runtestcanonicalizetypes.sh$(EXEEXT):
@@ -242,7 +240,3 @@ check-valgrind-memcheck-recursive:
 
 check-valgrind-helgrind-recursive:
 	$(MAKE) check-valgrind-helgrind VALGRIND_FLAGS="${RECURSIVE_VALGRIND_FLAGS}"
-
-check-self-compare:
-	$(MAKE) check TESTS=runtestslowselfcompare.sh ENABLE_SLOW_TEST=yes
-
diff --git a/tests/runtestslowselfcompare.sh.in b/tests/runtestselfcompare.sh.in
similarity index 61%
rename from tests/runtestslowselfcompare.sh.in
rename to tests/runtestselfcompare.sh.in
index 3d0ef123..a6f16009 100644
--- a/tests/runtestslowselfcompare.sh.in
+++ b/tests/runtestselfcompare.sh.in
@@ -5,9 +5,4 @@
 abidw=@top_builddir@/tools/abidw
 objdir=@top_builddir@/src/.libs
 
-echo "ENABLE_SLOW_TEST="$ENABLE_SLOW_TEST
-
-if test x$ENABLE_SLOW_TEST != x; then
-    `$abidw --abidiff $objdir/libabigail.so`
-fi
-
+`$abidw --abidiff $objdir/libabigail.so`
