diff --git a/IMPROVEMENTS.md b/IMPROVEMENTS.md
index 0bcf298..d2a647e 100644
--- a/IMPROVEMENTS.md
+++ b/IMPROVEMENTS.md
@@ -158,11 +158,11 @@ Acceptance criteria:
 - [x] Run CI on pull requests as well as pushes.
 - [x] Add macOS CI because macOS is an advertised platform.
 - [x] Fix the Unix-socket path test that currently fails on a local macOS run.
-- [ ] Replace nonexistent issue references in `xfail` markers with real tracked
+- [x] Replace nonexistent issue references in `xfail` markers with real tracked
   work, then remove the markers as fixes land.
 - [ ] Add subprocess-based concurrency, signal, interruption, and fault tests.
 - [ ] Add filesystem-boundary and build/install smoke tests.
-- [ ] Fix tests that change global state or assert against the wrong path.
+- [x] Fix tests that change global state or assert against the wrong path.
 
 Acceptance criteria:
 
diff --git a/tests/test_fs.py b/tests/test_fs.py
index 7f42769..9b524b1 100644
--- a/tests/test_fs.py
+++ b/tests/test_fs.py
@@ -48,8 +48,12 @@ class TestHardlinkDir:
         src_dir, dst_dir = hardlink_dirs
         cf_relpath = relpath(create_file(src_dir), src_dir, dst_dir)
         sl2cf_relpath = "symlink_to_common_file"
-        os.chdir(src_dir)
-        os.symlink(cf_relpath, sl2cf_relpath)
+        original_cwd = os.getcwd()
+        try:
+            os.chdir(src_dir)
+            os.symlink(cf_relpath, sl2cf_relpath)
+        finally:
+            os.chdir(original_cwd)
 
         fs.hardlink_dir(src_dir, dst_dir)