diff --git a/tests/blacklists/fsmonitor b/tests/blacklists/fsmonitor
--- a/tests/blacklists/fsmonitor
+++ b/tests/blacklists/fsmonitor
@@ -3,8 +3,6 @@
 # The following tests all fail because they either use extensions that conflict
 # with fsmonitor, use subrepositories, or don't anticipate the extra file in
 # the .hg directory that fsmonitor adds.
-test-basic.t
-test-commandserver.t
 test-debugextensions.t
 test-eol-add.t
 test-eol-clone.t
diff --git a/tests/test-basic.t b/tests/test-basic.t
--- a/tests/test-basic.t
+++ b/tests/test-basic.t
@@ -3,6 +3,7 @@ Create a repository:
   $ hg config
   devel.all-warnings=true
   devel.default-date=0 0
+  extensions.fsmonitor= (fsmonitor !)
   largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
   ui.slash=True
   ui.interactive=False
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -189,6 +189,7 @@ check that local configs for the cached 
   bundle.mainreporoot=$TESTTMP/repo
   devel.all-warnings=true
   devel.default-date=0 0
+  extensions.fsmonitor= (fsmonitor !)
   largefiles.usercache=$TESTTMP/.cache/largefiles
   ui.slash=True
   ui.interactive=False