diff --git a/tests/tpm2dtests/Makefile.am b/tests/tpm2dtests/Makefile.am
index ced4a1f49..eeae39906 100644
--- a/tests/tpm2dtests/Makefile.am
+++ b/tests/tpm2dtests/Makefile.am
@@ -61,14 +61,15 @@ xcheck: tpm_server_found
 tpm_server_found:
 	@if [ -z "$(TPMSERVER)" -a -z "$(SWTPM)" -a -z "$(FORCE)" ]; then echo "ERROR: No Software TPM has been found, cannot run TPM tests.  Set FORCE=1 to force using the physical TPM"; exit 1; fi
 
-EXTRA_DIST = defs.scm shell.scm all-tests.scm start_sw_tpm.sh
+EXTRA_DIST = defs.scm shell.scm all-tests.scm run-tests.scm $(XTESTS) \
+	     start_sw_tpm.sh
 
 CLEANFILES = gpg.conf gpg-agent.conf S.gpg-agent \
 	     pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
 	     secring.gpg pubring.pkr secring.skr \
 	     gnupg-test.stop random_seed gpg-agent.log tofu.db \
 	     passphrases sshcontrol S.gpg-agent.ssh report.xml \
-	     msg.txt
+	     msg.txt *.log
 
 clean-local:
 	-rm -rf private-keys-v1.d openpgp-revocs.d