diff --git a/packages.config b/packages.config
index 22cc87bb7..e2fc37402 100644
--- a/packages.config
+++ b/packages.config
@@ -19,7 +19,7 @@
   <package id="Microsoft.WSL.Dependencies.amd64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
   <package id="Microsoft.WSL.Dependencies.arm64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
   <package id="Microsoft.WSL.DeviceHost" version="1.2.10-0" />
-  <package id="Microsoft.WSL.Kernel" version="6.6.114.1-1" targetFramework="native" />
+  <package id="Microsoft.WSL.Kernel" version="6.18.20.1-1" targetFramework="native" />
   <package id="Microsoft.WSL.LinuxSdk" version="1.20.0" targetFramework="native" />
   <package id="Microsoft.WSL.TestDistro" version="2.7.1-1" />
   <package id="Microsoft.WSLg" version="1.0.73" />
diff --git a/test/linux/unit_tests/lxtfs.c b/test/linux/unit_tests/lxtfs.c
index 661a75293..9862fb099 100644
--- a/test/linux/unit_tests/lxtfs.c
+++ b/test/linux/unit_tests/lxtfs.c
@@ -285,7 +285,7 @@ Return Value:
             snprintf(
                 Plan9Options,
                 sizeof(Plan9Options),
-                "aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=5,access=client,msize=262144,trans=virtio",
+                "aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=0x5,access=client,msize=262144,trans=virtio",
                 Plan9Source,
                 Temp);
         }
@@ -294,7 +294,7 @@ Return Value:
             snprintf(
                 Plan9Options,
                 sizeof(Plan9Options),
-                "aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=5,access=client,msize=65536,trans=fd,rfd=*,wfd=*",
+                "aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=0x5,access=client,msize=65536,trans=fd,rfd=*,wfd=*",
                 Plan9Source,
                 Temp);
         }
@@ -3652,8 +3652,6 @@ Return Value:
     // Test an invalid buffer after a valid buffer. The writev call should return the
     // number of bytes written until the invalid buffer.
     //
-    // N.B. The plan 9 client does not follow this behavior, and will write nothing.
-    //
 
     LxtCheckErrno(FileDescriptor = open(TestFile, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU));
     memset(Iov, 0, sizeof(Iov));
@@ -3664,11 +3662,6 @@ Return Value:
     Iov[2].iov_base = ContentB;
     Iov[2].iov_len = sizeof(ContentB);
     LxtLogInfo("%d", g_LxtFsInfo.FsType);
-    if (g_LxtFsInfo.FsType == LxtFsTypePlan9)
-    {
-        LxtCheckErrnoFailure(Bytes = writev(FileDescriptor, Iov, 3), EFAULT);
-    }
-    else
     {
         LxtCheckErrno(Bytes = writev(FileDescriptor, Iov, 3));
         LxtCheckEqual(Bytes, sizeof(ContentA), "%d");
diff --git a/test/windows/UnitTests.cpp b/test/windows/UnitTests.cpp
index ee14a5ffe..66d5e7570 100644
--- a/test/windows/UnitTests.cpp
+++ b/test/windows/UnitTests.cpp
@@ -1774,7 +1774,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND
             VERIFY_ARE_EQUAL(
                 LxsstuLaunchWsl(
                     L"mount | grep -iF '" TEXT(
-                        LXSS_GPU_DRIVERS_SHARE) L" on /usr/lib/wsl/drivers type 9p (ro,nosuid,nodev,noatime,aname=" TEXT(LXSS_GPU_DRIVERS_SHARE) L";fmask=222;dmask=222,cache=5,access=client,msize=65536,trans=fd,rfd=8,wfd=8)'",
+                        LXSS_GPU_DRIVERS_SHARE) L" on /usr/lib/wsl/drivers type 9p (ro,nosuid,nodev,noatime,aname=" TEXT(LXSS_GPU_DRIVERS_SHARE) L";fmask=222;dmask=222,cache=0x5,access=client,msize=65536,trans=fd,rfd=8,wfd=8)'",
                     nullptr,
                     nullptr,
                     nullptr,