diff --git a/test/Makefile b/test/Makefile
index eb968095a..c13f2212d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -13,7 +13,8 @@ ifdef CMD_EXE
   EXE := .exe
   DEL = del /f $(subst /,\,$1)
   MKDIR = mkdir $(subst /,\,$1)
-  RMDIR = rmdir /s /q $(subst /,\,$1)
+  DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir))))
+  RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
 else
   EXE :=
   DEL = $(RM) $1