diff --git a/test/stat/test_chmod.c b/test/stat/test_chmod.c
index dd2ecc126201c..d312584b1cff7 100644
--- a/test/stat/test_chmod.c
+++ b/test/stat/test_chmod.c
@@ -146,6 +146,9 @@ void test() {
   lstat("file-link", &s);
   assert(s.st_mode == link_mode);
 
+  // TODO: lchmod is not supported in NODEFS but it chmods the link target
+  // instead of raising an error. Will fix in a follow up to #23058.
+#ifndef NODEFS
   //
   // chmod the actual symlink
   //
@@ -157,6 +160,7 @@ void test() {
   // make sure the file it references didn't change
   stat("file-link", &s);
   assert(s.st_mode == (S_IRUSR | S_IFREG));
+#endif
 #endif // WASMFS
 
   assert(stat("", &s) == -1);
diff --git a/test/test_core.py b/test/test_core.py
index 48867a3f41998..561d176c8da33 100644
--- a/test/test_core.py
+++ b/test/test_core.py
@@ -5529,7 +5529,7 @@ def test_stat_chmod(self):
     nodefs = '-DNODEFS' in self.emcc_args or '-DNODERAWFS' in self.emcc_args
     if nodefs and WINDOWS:
       self.skipTest('mode bits work differently on windows')
-    if self.get_setting('WASMFS') and self.get_setting('NODERAWFS'):
+    if nodefs and self.get_setting('WASMFS'):
       self.skipTest('test requires symlink creation which currently missing from wasmfs+noderawfs')
     self.do_runf('stat/test_chmod.c', 'success')