diff --git a/csharp/AdbcDrivers.Databricks.sln b/csharp/AdbcDrivers.Databricks.sln
index ca5cc734..f55a32f1 100644
--- a/csharp/AdbcDrivers.Databricks.sln
+++ b/csharp/AdbcDrivers.Databricks.sln
@@ -19,9 +19,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Arrow.Adbc.Client",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabricksBenchmarks", "Benchmarks\DatabricksBenchmarks.csproj", "{A1B2C3D4-E5F6-7890-1234-567890ABCDEF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdbcDrivers.HiveServer2", "hiveserver2\csharp\src\AdbcDrivers.HiveServer2.csproj", "{D5E6F7A8-B9C0-1234-5678-9ABCDEF01234}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdbcDrivers.HiveServer2", "hiveserver2\csharp\src\AdbcDrivers.HiveServer2\AdbcDrivers.HiveServer2.csproj", "{D5E6F7A8-B9C0-1234-5678-9ABCDEF01234}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdbcDrivers.Tests.HiveServer2", "hiveserver2\csharp\test\AdbcDrivers.Tests.HiveServer2.csproj", "{E6F7A8B9-C0D1-2345-6789-ABCDEF012345}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdbcDrivers.Tests.HiveServer2", "hiveserver2\csharp\test\AdbcDrivers.Tests.HiveServer2\AdbcDrivers.Tests.HiveServer2.csproj", "{E6F7A8B9-C0D1-2345-6789-ABCDEF012345}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
diff --git a/csharp/Directory.Packages.props b/csharp/Directory.Packages.props
index 25dc9c7c..21ddc682 100644
--- a/csharp/Directory.Packages.props
+++ b/csharp/Directory.Packages.props
@@ -25,7 +25,7 @@
     <PackageVersion Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <!-- Testing -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
diff --git a/csharp/hiveserver2 b/csharp/hiveserver2
index 7db3d859..a8ad1e45 160000
--- a/csharp/hiveserver2
+++ b/csharp/hiveserver2
@@ -1 +1 @@
-Subproject commit 7db3d859d187df6408ecd5b354e47d894cfeec24
+Subproject commit a8ad1e455ce5a4062e44a89a63fb902c367c0a39
diff --git a/csharp/src/AdbcDrivers.Databricks.csproj b/csharp/src/AdbcDrivers.Databricks.csproj
index 6116a5af..39ded3cc 100644
--- a/csharp/src/AdbcDrivers.Databricks.csproj
+++ b/csharp/src/AdbcDrivers.Databricks.csproj
@@ -27,6 +27,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\hiveserver2\csharp\src\AdbcDrivers.HiveServer2.csproj" />
+    <ProjectReference Include="..\hiveserver2\csharp\src\AdbcDrivers.HiveServer2\AdbcDrivers.HiveServer2.csproj" />
   </ItemGroup>
 </Project>
diff --git a/csharp/test/AdbcDrivers.Databricks.Tests.csproj b/csharp/test/AdbcDrivers.Databricks.Tests.csproj
index 1c6ba874..9ff79982 100644
--- a/csharp/test/AdbcDrivers.Databricks.Tests.csproj
+++ b/csharp/test/AdbcDrivers.Databricks.Tests.csproj
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\hiveserver2\csharp\arrow-adbc\csharp\test\Apache.Arrow.Adbc.Tests\Apache.Arrow.Adbc.Testing.csproj" />
-    <ProjectReference Include="..\hiveserver2\csharp\test\AdbcDrivers.Tests.HiveServer2.csproj" />
+    <ProjectReference Include="..\hiveserver2\csharp\test\AdbcDrivers.Tests.HiveServer2\AdbcDrivers.Tests.HiveServer2.csproj" />
     <ProjectReference Include="..\src\AdbcDrivers.Databricks.csproj" />
   </ItemGroup>