diff --git a/ChangeLog b/ChangeLog
index 47a5a06aaf59e8cb39c367d349fefe12f4e3eaa9..14ecb84bc279ae9b6885a21f7db16a155416d0f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2023-10-03  Niels Möller  <nisse@lysator.liu.se>
 
+	* Makefile.in (check-fat): Reduce tests to run to TS_FAT, to speed
+	up tests.
+
+	* testsuite/Makefile.in (TS_FAT): Define list of tests relevant
+	for testing algorithm variants in fat builds.
+
 	* testsuite/ecc-mod-arith-test.c: Reduce test count, aiming to get
 	test to complete in roughly 0.1s.
 	* testsuite/ecc-mod-test.c: Likewise.
diff --git a/Makefile.in b/Makefile.in
index f031e195859246d96daae32c91bfc27dbc1e05e7..2d38ae8579ce632516eeb5f915b3bc79e582b9ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,7 +63,7 @@ check-fat:
 	[ -z "$(FAT_TEST_LIST)" ] || \
 	  set -e; cd testsuite && for f in $(FAT_TEST_LIST) ; do \
 	    echo NETTLE_FAT_OVERRIDE=$$f ; \
-	    NETTLE_FAT_OVERRIDE=$$f $(MAKE) check ; \
+	    NETTLE_FAT_OVERRIDE=$$f $(MAKE) check TS_ALL='$$(TS_FAT)' ; \
 	  done
 
 all-here: $(TARGETS) $(DOCTARGETS)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 60c413cd482aa3c18b7374c5e37674e1e5d9376d..2aa1dd810d918649be28929b05048e65f02ea93a 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -68,6 +68,12 @@ TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT))
 TARGETS = $(TS_C) $(TS_CXX)
 TS_SH = symbols-test
 TS_ALL = $(TARGETS) $(TS_SH) @IF_DLOPEN_TEST@ dlopen-test$(EXEEXT)
+
+TS_FAT = $(patsubst %, %$(EXEEXT), aes-test cbc-test \
+	chacha-test salsa20-test memxor-test \
+	sha1-test sha256-test sha512-test sha3-permute-test sha3-512-test \
+	umac-test gcm-test siv-gcm-test)
+
 EXTRA_SOURCES = sha1-huge-test.c
 EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))