diff --git a/bff/Duende.Bff.sln b/bff/Duende.Bff.sln
index ca01b6fc4..fcbb36ae0 100644
--- a/bff/Duende.Bff.sln
+++ b/bff/Duende.Bff.sln
@@ -67,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.ServiceDefaults", "sa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.Tests", "samples\Hosts.Tests\Hosts.Tests.csproj", "{A0B771BA-ACF9-4DE2-A2A6-430F6E6E8C07}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "build", "..\identity-server\build\build.csproj", "{2373FA65-E389-4497-B92A-376895ECDC41}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -365,6 +367,18 @@ Global
 		{A0B771BA-ACF9-4DE2-A2A6-430F6E6E8C07}.Release|x64.Build.0 = Release|Any CPU
 		{A0B771BA-ACF9-4DE2-A2A6-430F6E6E8C07}.Release|x86.ActiveCfg = Release|Any CPU
 		{A0B771BA-ACF9-4DE2-A2A6-430F6E6E8C07}.Release|x86.Build.0 = Release|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Debug|x64.Build.0 = Debug|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Debug|x86.Build.0 = Debug|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Release|x64.ActiveCfg = Release|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Release|x64.Build.0 = Release|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Release|x86.ActiveCfg = Release|Any CPU
+		{2373FA65-E389-4497-B92A-376895ECDC41}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/identity-server/build/Program.cs b/identity-server/build/Program.cs
index 19836fcd5..05107ae6b 100644
--- a/identity-server/build/Program.cs
+++ b/identity-server/build/Program.cs
@@ -54,6 +54,8 @@ static async Task Main(string[] args)
 
             Target(Targets.Test, DependsOn(Targets.Build), () =>
             {
+                // we need to trust the .net dev certificates to be able to run the unit tests using SSL
+                Run("dotnet", "dev-certs https --trust");
                 Run("dotnet", $"test {solution} -c Release --no-build --nologo");
             });