diff --git a/ssl_mgmt/tests/Makefile b/ssl_mgmt/tests/Makefile
index 357735f..cedb0fa 100644
--- a/ssl_mgmt/tests/Makefile
+++ b/ssl_mgmt/tests/Makefile
@@ -10,7 +10,10 @@ TESTS := $(sort $(TESTS))
 
 check: $(patsubst %,test%,$(TESTS))
 
-test%: %/init %/cmdline %/fini
+workdir/csr workdir/newcerts workdir/newkeys:
+	mkdir $@
+
+test%: %/init %/cmdline %/fini workdir/csr workdir/newcerts workdir/newkeys
 	@echo -n "Preparing test $*... " ; ./$*/init && $(DISPRES)
 	@echo -n "Running test $*... " ; $(call RUNTEST,$*) && $(DISPRES)
 	@echo -n "Cleaning test $*... " ; ./$*/fini && $(DISPRES)