diff --git a/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java b/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
index aba696edc2d..c69b8ab03b6 100644
--- a/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
+++ b/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
@@ -60,6 +60,7 @@ public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase {
 
     CommitUpdateCommand cmtCmd = new CommitUpdateCommand(false);
     updater.commit(cmtCmd);
+    updater.commit(cmtCmd);  // commit twice to give systems such as windows a chance to delete the old files
 
     String indexDir = core.getIndexDir();
     assertNumSegments(indexDir, 500);
@@ -68,6 +69,7 @@ public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase {
     cmtCmd = new CommitUpdateCommand(true);
     cmtCmd.maxOptimizeSegments = 250;
     updater.commit(cmtCmd);
+    updater.commit(cmtCmd);
     assertNumSegments(indexDir, 250);
 
     cmtCmd.maxOptimizeSegments = -1;
@@ -78,6 +80,7 @@ public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase {
     }
     cmtCmd.maxOptimizeSegments = 1;
     updater.commit(cmtCmd);
+    updater.commit(cmtCmd);
     assertNumSegments(indexDir, 1);
   }