diff --git a/GVFS/GVFS.Common/Git/RequiredGitConfig.cs b/GVFS/GVFS.Common/Git/RequiredGitConfig.cs
index a9159e663..8f40e2dd3 100644
--- a/GVFS/GVFS.Common/Git/RequiredGitConfig.cs
+++ b/GVFS/GVFS.Common/Git/RequiredGitConfig.cs
@@ -183,6 +183,9 @@ public static Dictionary<string, string> GetRequiredSettings(GVFSEnlistment enli
 
                 // Disable the builtin FS Monitor in case it was enabled globally.
                 { "core.useBuiltinFSMonitor", "false" },
+
+                // Disable the FS Monitor in case it was enabled globally.
+                { "core.fsmonitor", "false" },
             };
         }
     }
diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
index bd884d979..11e1d972d 100644
--- a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
+++ b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
@@ -77,6 +77,7 @@ private void InitializeCore()
             GitProcess.Invoke(this.RootPath, "config core.abbrev 40");
             GitProcess.Invoke(this.RootPath, "config checkout.workers 0");
             GitProcess.Invoke(this.RootPath, "config core.useBuiltinFSMonitor false");
+            GitProcess.Invoke(this.RootPath, "config core.fsmonitor false");
             GitProcess.Invoke(this.RootPath, "config pack.useSparse true");
             GitProcess.Invoke(this.RootPath, "config reset.quiet true");
             GitProcess.Invoke(this.RootPath, "config status.aheadbehind false");