diff --git a/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/RepairTests.cs b/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/RepairTests.cs
index b53d2caf85..7f44dcf809 100644
--- a/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/RepairTests.cs
+++ b/GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/RepairTests.cs
@@ -17,8 +17,8 @@ public class RepairTests : TestsWithEnlistmentPerTestCase
         public void NoFixesNeeded()
         {
             this.Enlistment.UnmountGVFS();
-
-            this.Enlistment.Repair();
+            this.Enlistment.Repair(confirm: false);
+            this.Enlistment.Repair(confirm: true);
         }
 
         [TestCase]
@@ -28,12 +28,11 @@ public void FixesCorruptHeadSha()
 
             string headFilePath = Path.Combine(this.Enlistment.RepoRoot, ".git", "HEAD");
             File.WriteAllText(headFilePath, "0000");
-
             this.Enlistment.TryMountGVFS().ShouldEqual(false, "GVFS shouldn't mount when HEAD is corrupt");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
-            this.Enlistment.MountGVFS();
+            this.RepairWithConfirmShouldFix();
         }
 
         [TestCase]
@@ -43,12 +42,11 @@ public void FixesCorruptHeadSymRef()
 
             string headFilePath = Path.Combine(this.Enlistment.RepoRoot, ".git", "HEAD");
             File.WriteAllText(headFilePath, "ref: refs");
-
             this.Enlistment.TryMountGVFS().ShouldEqual(false, "GVFS shouldn't mount when HEAD is corrupt");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
-            this.Enlistment.MountGVFS();
+            this.RepairWithConfirmShouldFix();
         }
 
         [TestCase]
@@ -58,12 +56,11 @@ public void FixesMissingGitIndex()
 
             string gitIndexPath = Path.Combine(this.Enlistment.RepoRoot, ".git", "index");
             File.Delete(gitIndexPath);
-
             this.Enlistment.TryMountGVFS().ShouldEqual(false, "GVFS shouldn't mount when git index is missing");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
-            this.Enlistment.MountGVFS();
+            this.RepairWithConfirmShouldFix();
         }
 
         [TestCase]
@@ -84,9 +81,9 @@ public void FixesGitIndexCorruptedWithBadData()
             this.Enlistment.TryMountGVFS(out output).ShouldEqual(false, "GVFS shouldn't mount when index is corrupt");
             output.ShouldContain("Index validation failed");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
-            this.Enlistment.MountGVFS();
+            this.RepairWithConfirmShouldFix();
         }
 
         [TestCase]
@@ -108,9 +105,9 @@ public void FixesGitIndexContainingAllNulls()
             this.Enlistment.TryMountGVFS(out output).ShouldEqual(false, "GVFS shouldn't mount when index is corrupt");
             output.ShouldContain("Index validation failed");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
-            this.Enlistment.MountGVFS();
+            this.RepairWithConfirmShouldFix();
         }
 
         [TestCase]
@@ -135,9 +132,9 @@ public void FixesGitIndexCorruptedByTruncation()
             this.Enlistment.TryMountGVFS(out output).ShouldEqual(false, "GVFS shouldn't mount when index is corrupt");
             output.ShouldContain("Index validation failed");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
-            this.Enlistment.MountGVFS();
+            this.RepairWithConfirmShouldFix();
         }
 
         [TestCase]
@@ -150,11 +147,11 @@ public void FixesCorruptGitConfig()
 
             this.Enlistment.TryMountGVFS().ShouldEqual(false, "GVFS shouldn't mount when git config is missing");
 
-            this.Enlistment.Repair();
+            this.RepairWithoutConfirmShouldNotFix();
 
+            this.Enlistment.Repair(confirm: true);
             ProcessResult result = GitProcess.InvokeProcess(this.Enlistment.RepoRoot, "remote add origin " + this.Enlistment.RepoUrl);
-            result.ExitCode.ShouldEqual(0, result.Errors);
-            
+            result.ExitCode.ShouldEqual(0, result.Errors);            
             this.Enlistment.MountGVFS();
         }
 
@@ -170,5 +167,17 @@ private void CreateCorruptIndexAndRename(string indexPath, Action<FileStream, Fi
             File.Delete(indexPath);
             File.Move(tempIndexPath, indexPath);
         }
+
+        private void RepairWithConfirmShouldFix()
+        {
+            this.Enlistment.Repair(confirm: true);
+            this.Enlistment.MountGVFS();
+        }
+
+        private void RepairWithoutConfirmShouldNotFix()
+        {
+            this.Enlistment.Repair(confirm: false);
+            this.Enlistment.TryMountGVFS().ShouldEqual(false, "Repair without confirm should not fix the enlistment");
+        }
     }
 }
diff --git a/GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs b/GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
index 7ec39205a1..d3a86e6f4e 100644
--- a/GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
+++ b/GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
@@ -68,7 +68,7 @@ public void RepairFixesCorruptBlobSizesDatabase()
             enlistment.UnmountGVFS();
 
             // Repair on a healthy enlistment should succeed
-            enlistment.Repair();
+            enlistment.Repair(confirm: true);
 
             string blobSizesRoot = GVFSHelpers.GetPersistedBlobSizesRoot(enlistment.DotGVFSRoot).ShouldNotBeNull();
             string blobSizesDbPath = Path.Combine(blobSizesRoot, "BlobSizes.sql");
@@ -76,7 +76,7 @@ public void RepairFixesCorruptBlobSizesDatabase()
             this.fileSystem.WriteAllText(blobSizesDbPath, "0000");
 
             enlistment.TryMountGVFS().ShouldEqual(false, "GVFS shouldn't mount when blob size db is corrupt");
-            enlistment.Repair();
+            enlistment.Repair(confirm: true);
             enlistment.MountGVFS();
         }
 
diff --git a/GVFS/GVFS.FunctionalTests/Tools/GVFSFunctionalTestEnlistment.cs b/GVFS/GVFS.FunctionalTests/Tools/GVFSFunctionalTestEnlistment.cs
index 427fef7b28..3c89638fac 100644
--- a/GVFS/GVFS.FunctionalTests/Tools/GVFSFunctionalTestEnlistment.cs
+++ b/GVFS/GVFS.FunctionalTests/Tools/GVFSFunctionalTestEnlistment.cs
@@ -197,9 +197,9 @@ public string Prefetch(string args, bool failOnError = true)
             return this.gvfsProcess.Prefetch(args, failOnError);
         }
 
-        public void Repair()
+        public void Repair(bool confirm)
         {
-            this.gvfsProcess.Repair();
+            this.gvfsProcess.Repair(confirm);
         }
 
         public string Diagnose()
diff --git a/GVFS/GVFS.FunctionalTests/Tools/GVFSProcess.cs b/GVFS/GVFS.FunctionalTests/Tools/GVFSProcess.cs
index 51f466bb42..d9acce87d7 100644
--- a/GVFS/GVFS.FunctionalTests/Tools/GVFSProcess.cs
+++ b/GVFS/GVFS.FunctionalTests/Tools/GVFSProcess.cs
@@ -47,10 +47,11 @@ public string Prefetch(string args, bool failOnError)
             return this.CallGVFS("prefetch \"" + this.enlistmentRoot + "\" " + args, failOnError);
         }
 
-        public void Repair()
+        public void Repair(bool confirm)
         {
+            string confirmArg = confirm ? "--confirm " : string.Empty;
             this.CallGVFS(
-                "repair --confirm \"" + this.enlistmentRoot + "\"", 
+                "repair " + confirmArg + "\"" + this.enlistmentRoot + "\"",
                 failOnError: true);
         }