diff --git a/tests/Descriptions.txt b/tests/Descriptions.txt
index b6309f3f4..8b13bb39f 100644
--- a/tests/Descriptions.txt
+++ b/tests/Descriptions.txt
@@ -4,12 +4,17 @@ test_suites
     (reference test vectors, sanity checks, malformed input for parsing
     functions, etc.) for all modules except the SSL modules.
 
+selftests
+    The 'programs/test/selftest' program runs the 'XXX_self_test()' functions
+    of each individual module. Most of them are included in the respective
+    test suite, but some slower ones are only included here.
+
 compat
     The 'tests/compat.sh' script checks interoperability with OpenSSL and
     GnuTLS (and ourselves!) for every common ciphersuite, in every TLS
     version, both ways (client/server), using client authentication or not.
     For each ciphersuite/version/side/authmode it performs a full handshake
-    and a small data exchange. 
+    and a small data exchange.
 
 ssl_opt
     The 'tests/ssl-opt.sh' script checks various options and/or operations not
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 249be3b50..8dba3ecab 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -74,6 +74,7 @@ cleanup
 cmake -D CMAKE_BUILD_TYPE:String=ASan .
 make
 make test
+programs/test/selftest
 cd tests
 ./compat.sh
 ./ssl-opt.sh