diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am
index fe3d58007..ca7be13df 100644
--- a/tests/gpgme/Makefile.am
+++ b/tests/gpgme/Makefile.am
@@ -47,6 +47,8 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
+	@$(MKDIR_P) setup.scm/tests \
+	  tests/gpg lang/qt/tests lang/python/tests
 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
@@ -57,3 +59,6 @@ CLEANFILES = *.log report.xml
 # We need to depend on a couple of programs so that the tests don't
 # start before all programs are built.
 all-local: $(required_pgms)
+
+clean-local:
+	-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests