diff --git a/lldb/test/make/Makefile.rules b/lldb/test/make/Makefile.rules
index 1f911293cb2d..d7855021aaa0 100644
--- a/lldb/test/make/Makefile.rules
+++ b/lldb/test/make/Makefile.rules
@@ -533,7 +533,7 @@ endif
 dsym:	$(DSYM)
 all:	$(EXE) $(DSYM)
 clean::
-	$(RM) "$(EXE)" $(OBJECTS) $(PREREQS) $(PREREQS:.d=.d.tmp) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS)
+	$(RM) $(OBJECTS) $(PREREQS) $(PREREQS:.d=.d.tmp) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS)
 ifneq "$(DYLIB_NAME)" ""
 	$(RM) -r $(DYLIB_FILENAME).dSYM
 	$(RM) $(DYLIB_OBJECTS) $(DYLIB_PREREQS) $(DYLIB_PREREQS:.d=.d.tmp) $(DYLIB_FILENAME) $(DYLIB_FILENAME).debug
@@ -542,10 +542,14 @@ ifneq "$(DSYM)" ""
 	$(RM) -r "$(DSYM)"
 endif
 ifeq "$(OS)" "Windows_NT"
+# http://llvm.org/pr24589
+	IF EXIST "$(EXE)" del "$(EXE)"
 	$(RM) $(wildcard *.manifest *.pdb *.ilk)
-  ifneq "$(DYLIB_NAME)" ""
+ifneq "$(DYLIB_NAME)" ""
 	$(RM) $(DYLIB_NAME).lib $(DYLIB_NAME).exp
-  endif
+endif
+else
+	$(RM) "$(EXE)"
 endif
 
 #----------------------------------------------------------------------