diff --git a/All.sln b/All.sln
index a21ec4922b0..c30cbe2273b 100644
--- a/All.sln
+++ b/All.sln
@@ -120,7 +120,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.AspNet.Sqlite.Functi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.AspNet.InMemory.FunctionalTests", "test\EFCore.AspNet.InMemory.FunctionalTests\EFCore.AspNet.InMemory.FunctionalTests.csproj", "{F1B2E5A0-8C74-414A-B262-353FEE325E9F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Trimming.Test", "test\EFCore.Trimming.Test\EFCore.Trimming.Test.csproj", "{933C8662-817C-4F45-B98B-6557E28F7BB1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Trimming.Tests", "test\EFCore.Trimming.Tests\EFCore.Trimming.Tests.csproj", "{933C8662-817C-4F45-B98B-6557E28F7BB1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Directory.Build.props b/Directory.Build.props
index 62d58cd77b5..5e985fd1e50 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,6 +3,7 @@
   <PropertyGroup Condition="'$(IsUnitTestProject)' == ''">
     <IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.FunctionalTests'))">True</IsUnitTestProject>
     <IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.Specification.Tests'))">False</IsUnitTestProject>
+    <IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.Trimming.Tests'))">False</IsUnitTestProject>
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index de093168e65..05a6d074f89 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,8 @@
 variables:
   - name: _BuildConfig
     value: Release
+  - name: _BuildTargetFramework
+    value: net6.0
   - name: _TeamName
     value: AspNetCore
   - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -100,6 +102,10 @@ stages:
                 env:
                   Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
                 name: Build
+              - script: |
+                    .dotnet\dotnet publish --configuration $(_BuildConfig) --runtime win-x64 --self-contained test\EFCore.Trimming.Tests
+                    artifacts\bin\EFCore.Trimming.Tests\$(_BuildConfig)\$(_BuildTargetFramework)\win-x64\publish\EFCore.Trimming.Tests.exe
+                displayName: Test trimming
               - task: PublishBuildArtifacts@1
                 displayName: Upload TestResults
                 condition: always()
diff --git a/eng/helix.proj b/eng/helix.proj
index 7f9a2b8eec0..22f976a4549 100644
--- a/eng/helix.proj
+++ b/eng/helix.proj
@@ -50,6 +50,11 @@
     <XUnitProject Remove="$(SqlServerTests)"/>
   </ItemGroup>
 
+  <!-- The trimming test project is a console program -->
+  <ItemGroup>
+    <XUnitProject Remove="$(RepoRoot)/test/EFCore.Trimming.Tests/*.csproj"/>
+  </ItemGroup>
+
   <PropertyGroup>
     <XUnitPublishTargetFramework>net6.0</XUnitPublishTargetFramework>
     <XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
diff --git a/test/EFCore.Trimming.Test/EFCore.Trimming.Test.csproj b/test/EFCore.Trimming.Tests/EFCore.Trimming.Tests.csproj
similarity index 100%
rename from test/EFCore.Trimming.Test/EFCore.Trimming.Test.csproj
rename to test/EFCore.Trimming.Tests/EFCore.Trimming.Tests.csproj
diff --git a/test/EFCore.Trimming.Test/Program.cs b/test/EFCore.Trimming.Tests/Program.cs
similarity index 93%
rename from test/EFCore.Trimming.Test/Program.cs
rename to test/EFCore.Trimming.Tests/Program.cs
index f71895b4e23..6f9492a723f 100644
--- a/test/EFCore.Trimming.Test/Program.cs
+++ b/test/EFCore.Trimming.Tests/Program.cs
@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Linq;
+using EFCore.Trimming.Tests;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.TestUtilities;
 
 await using var ctx = new BlogContext();
 await ctx.Database.EnsureDeletedAsync();
diff --git a/test/EFCore.Trimming.Test/TestEnvironment.cs b/test/EFCore.Trimming.Tests/TestEnvironment.cs
similarity index 88%
rename from test/EFCore.Trimming.Test/TestEnvironment.cs
rename to test/EFCore.Trimming.Tests/TestEnvironment.cs
index 1212c9fb477..2edb5e22f26 100644
--- a/test/EFCore.Trimming.Test/TestEnvironment.cs
+++ b/test/EFCore.Trimming.Tests/TestEnvironment.cs
@@ -1,12 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.IO;
-using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.EntityFrameworkCore.TestUtilities;
+namespace EFCore.Trimming.Tests;
 
 public static class TestEnvironment
 {