diff --git a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj
index a23e3d7957..c6874934fa 100644
--- a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj
+++ b/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj
@@ -6,6 +6,7 @@
     <DefineConstants>
       PAKET_NETCORE;
       NO_UNIT_PLATFORMATTRIBUTE;
+      NO_UNIT_TIMEOUTATTRIBUTE;
       TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;
       FAKE_NETSTANDARD_API;
       @(DefineConstants)
diff --git a/integrationtests/Paket.IntegrationTests/TestHelper.fs b/integrationtests/Paket.IntegrationTests/TestHelper.fs
index 81453c6ad6..8c5f8d237f 100644
--- a/integrationtests/Paket.IntegrationTests/TestHelper.fs
+++ b/integrationtests/Paket.IntegrationTests/TestHelper.fs
@@ -10,6 +10,13 @@ open System
 open System.IO
 open Paket.Logging
 
+#if NO_UNIT_TIMEOUTATTRIBUTE
+#else
+// global timeout for single tests, in ms
+[<assembly: NUnit.Framework.Timeout(20_000)>]
+do ()
+#endif
+
 let scenarios = System.Collections.Generic.List<_>()
 let isLiveUnitTesting = AppDomain.CurrentDomain.GetAssemblies() |> Seq.exists (fun a -> a.GetName().Name = "Microsoft.CodeAnalysis.LiveUnitTesting.Runtime")
 
diff --git a/tests/Paket.Tests/TestHelpers.fs b/tests/Paket.Tests/TestHelpers.fs
index 6df00c47fe..b132bb366c 100644
--- a/tests/Paket.Tests/TestHelpers.fs
+++ b/tests/Paket.Tests/TestHelpers.fs
@@ -9,6 +9,13 @@ open System.Xml
 open System.IO
 open Paket.Domain
 
+#if NO_UNIT_TIMEOUTATTRIBUTE
+#else
+// global timeout for single tests, in ms
+[<assembly: NUnit.Framework.Timeout(2_000)>]
+do ()
+#endif
+
 let makeOrList (l:_ list) =
     if l.IsEmpty then FrameworkRestriction.NoRestriction
     else Seq.fold FrameworkRestriction.combineRestrictionsWithOr FrameworkRestriction.EmptySet l