diff --git a/src/os/os_chmod_test.go b/src/os/os_chmod_test.go
new file mode 100644
index 00000000..eef507c3
--- /dev/null
+++ b/src/os/os_chmod_test.go
@@ -0,0 +1,27 @@
+// +build !baremetal,!js,!wasi
+
+// TODO: Move this into os_test.go (as upstream has it) when wasi supports chmod
+
+package os_test
+
+import (
+	. "os"
+	"runtime"
+	"testing"
+)
+
+func TestChmod(t *testing.T) {
+	f := newFile("TestChmod", t)
+	defer Remove(f.Name())
+	defer f.Close()
+	// Creation mode is read write
+
+	fm := FileMode(0456)
+	if runtime.GOOS == "windows" {
+		fm = FileMode(0444) // read-only file
+	}
+	if err := Chmod(f.Name(), fm); err != nil {
+		t.Fatalf("chmod %s %#o: %s", f.Name(), fm, err)
+	}
+	checkMode(t, f.Name(), fm)
+}
diff --git a/src/os/os_test.go b/src/os/os_test.go
index c061bf51..03e1bf42 100644
--- a/src/os/os_test.go
+++ b/src/os/os_test.go
@@ -34,22 +34,6 @@ func checkMode(t *testing.T, path string, mode FileMode) {
 	}
 }
 
-func TestChmod(t *testing.T) {
-	f := newFile("TestChmod", t)
-	defer Remove(f.Name())
-	defer f.Close()
-	// Creation mode is read write
-
-	fm := FileMode(0456)
-	if runtime.GOOS == "windows" {
-		fm = FileMode(0444) // read-only file
-	}
-	if err := Chmod(f.Name(), fm); err != nil {
-		t.Fatalf("chmod %s %#o: %s", f.Name(), fm, err)
-	}
-	checkMode(t, f.Name(), fm)
-}
-
 func TestReadAt(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Log("TODO: implement Pread for Windows")