diff --git a/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj b/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj
index cc209f4258..0c99bebea9 100644
--- a/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj
+++ b/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\build\common.props" />
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;net462;netcoreapp3.1</TargetFrameworks>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <AssemblyTitle>BenchmarkDotNet.Diagnostics.dotMemory</AssemblyTitle>
         <AssemblyName>BenchmarkDotNet.Diagnostics.dotMemory</AssemblyName>
diff --git a/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj b/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj
index 8206182d6a..69275d9978 100644
--- a/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj
+++ b/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\build\common.props" />
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;net462;netcoreapp3.1</TargetFrameworks>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <AssemblyTitle>BenchmarkDotNet.Diagnostics.dotTrace</AssemblyTitle>
         <AssemblyName>BenchmarkDotNet.Diagnostics.dotTrace</AssemblyName>
diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs
index cf3542435b..4b5e8c2a65 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Reflection;
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Extensions;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Portability;
@@ -24,6 +25,7 @@ public void UserCanSpecifyCustomBuildConfiguration()
             var jobWithCustomConfiguration = Job.Dry.WithCustomBuildConfiguration("CUSTOM");
 
             var config = CreateSimpleConfig(job: jobWithCustomConfiguration);
+            config = ((ManualConfig)config).WithBuildTimeout(TimeSpan.FromSeconds(240));
 
             var report = CanExecute<CustomBuildConfiguration>(config);
 
diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
index 7221a80595..2a1daa470f 100755
--- a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
@@ -386,6 +386,7 @@ private IConfig CreateConfig(IToolchain toolchain,
                         new EnvironmentVariable("COMPlus_TieredCompilation", "0")
                     )
                     : job)
+                .WithBuildTimeout(TimeSpan.FromSeconds(240)) // Increase timeout for `MemoryDiagnoserSupportsModernMono` test on macos(x64)
                 .AddColumnProvider(DefaultColumnProviders.Instance)
                 .AddDiagnoser(MemoryDiagnoser.Default)
                 .AddLogger(toolchain.IsInProcess ? ConsoleLogger.Default : new OutputLogger(output)); // we can't use OutputLogger for the InProcess toolchains because it allocates memory on the same thread
diff --git a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs
index 17309832ef..d08e9166b7 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs
@@ -20,7 +20,8 @@ public void Mono80IsSupported()
             var logger = new OutputLogger(Output);
             var config = ManualConfig.CreateEmpty()
                 .AddLogger(logger)
-                .AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono80));
+                .AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono80))
+                .WithBuildTimeout(TimeSpan.FromSeconds(240));
             CanExecute<MonoBenchmark>(config);
         }
 
diff --git a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs
index 6d3519a9c5..dfa67fd2ce 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs
@@ -37,6 +37,7 @@ public void WasmIsSupported()
                     .WithArguments([new MsBuildArgument($"/p:WasmMainJSPath={mainJsPath}")])
                     .WithRuntime(new WasmRuntime(dotnetVersion, moniker: RuntimeMoniker.WasmNet80, javaScriptEngineArguments: "--expose_wasm --module"))
                     .WithToolchain(WasmToolchain.From(netCoreAppSettings)))
+                .WithBuildTimeout(TimeSpan.FromSeconds(240))
                 .WithOption(ConfigOptions.GenerateMSBuildBinLog, true);
 
             CanExecute<WasmBenchmark>(config);