diff --git a/EFCore.slnx b/EFCore.slnx
index 791bb2a9057..2b42e28a023 100644
--- a/EFCore.slnx
+++ b/EFCore.slnx
@@ -76,6 +76,7 @@
     <Project Path="test/EFCore.Tests/EFCore.Tests.csproj" />
     <Project Path="test/EFCore.VisualBasic.FunctionalTests/EFCore.VisualBasic.FunctionalTests.vbproj" />
     <Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj" />
+    <Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj" />
     <Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj" />
     <Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj" />
     <Project Path="test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj">
diff --git a/Microsoft.Data.Sqlite.slnf b/Microsoft.Data.Sqlite.slnf
index 71fd0720ad9..e34c1a88750 100644
--- a/Microsoft.Data.Sqlite.slnf
+++ b/Microsoft.Data.Sqlite.slnf
@@ -5,9 +5,8 @@
       "src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj",
       "src\\Microsoft.Data.Sqlite\\Microsoft.Data.Sqlite.csproj",
       "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.Tests.csproj",
-      "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj",
-      "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj",
       "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3.Tests.csproj",
+      "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj",
       "test\\Microsoft.Data.Sqlite.Tests\\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj"
     ]
   }
diff --git a/eng/Versions.props b/eng/Versions.props
index 088f55cedde..e8e21e7840d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -42,6 +42,7 @@
     <AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
     <OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
     <SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
+    <SQLite3MCPCLRawBundleVersion>2.3.2</SQLite3MCPCLRawBundleVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Analyzers">
diff --git a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs
index 32860f4dacd..e284f6dfcfd 100644
--- a/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs
+++ b/src/Microsoft.Data.Sqlite.Core/Properties/InternalsVisibleTo.cs
@@ -5,6 +5,8 @@
 
 [assembly: InternalsVisibleTo(
     "Microsoft.Data.Sqlite.sqlite3.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo(
+    "Microsoft.Data.Sqlite.sqlite3mc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo(
     "Microsoft.Data.Sqlite.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo(
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
index 2dcd2f6da76..54185d2e539 100644
--- a/test/Directory.Packages.props
+++ b/test/Directory.Packages.props
@@ -16,6 +16,7 @@
     <PackageVersion Include="Grpc.AspNetCore" Version="2.76.0" />
     <PackageVersion Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryVersion)" />
+    <PackageVersion Include="SQLite3MC.PCLRaw.bundle" Version="$(SQLite3MCPCLRawBundleVersion)" />
     <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="$(SQLitePCLRawVersion)" />
     <PackageVersion Include="SQLitePCLRaw.provider.winsqlite3" Version="$(SQLitePCLRawVersion)" />
   </ItemGroup>
diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj
new file mode 100644
index 00000000000..49acbe62392
--- /dev/null
+++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3mc.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(NetFrameworkCurrent)</TargetFrameworks>
+    <DefineConstants>$(DefineConstants);SQLITE3MC</DefineConstants>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkCurrent)' ">
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SQLite3MC.PCLRaw.bundle" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs b/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
index e635608043b..b4e182af617 100644
--- a/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
+++ b/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
@@ -266,7 +266,7 @@ public void Open_works_when_password()
     {
 #if E_SQLITE3 || WINSQLITE3
         Open_works_when_password_unsupported();
-#elif E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
+#elif SQLITE3MC
         Open_works_when_password_supported();
 #elif SQLITE3
         Open_works_when_password_might_be_supported();
@@ -313,7 +313,7 @@ private void Open_works_when_password_might_be_supported()
         connection.Open();
     }
 
-#if E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
+#if SQLITE3MC
     [Fact]
     public void Open_decrypts_lazily_when_no_password()
     {
@@ -1287,7 +1287,7 @@ public void Open_releases_handle_when_constructor_fails()
             var ex = Assert.Throws<InvalidOperationException>(connection.Open);
             Assert.Equal(Resources.EncryptionNotSupported(GetNativeLibraryName()), ex.Message);
             Assert.Equal(ConnectionState.Closed, connection.State);
-#elif E_SQLCIPHER || E_SQLITE3MC || SQLCIPHER
+#elif SQLITE3MC
             var ex = Assert.Throws<SqliteException>(connection.Open);
             Assert.Equal(SQLITE_NOTADB, ex.SqliteErrorCode);
             Assert.Equal(ConnectionState.Closed, connection.State);
diff --git a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs
index 3e96034be5c..2e2fde52814 100644
--- a/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs
+++ b/test/Microsoft.Data.Sqlite.Tests/TestUtilities/SqliteTestFramework.cs
@@ -20,6 +20,8 @@
     "Microsoft.Data.Sqlite.winsqlite3.Tests")]
 #elif SQLITE3
     "Microsoft.Data.Sqlite.sqlite3.Tests")]
+#elif SQLITE3MC
+    "Microsoft.Data.Sqlite.sqlite3mc.Tests")]
 #else
 #error Unexpected native library
 #endif