diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 5f0f35d57c..f37c199ea4 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
 <project name="OpenSim" default="build">
+  <setenv name="MONO_THREADS_PER_CPU" value="100" />
   <target name="build">
     <exec program="mono" commandline="../bin/Prebuild.exe /target nant" />
     <nant buildfile="../OpenSim.build" target="build" />
diff --git a/.nant/local.include b/.nant/local.include
index 839c79bfe0..58285bbd57 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -30,6 +30,7 @@
 </target>
 
 <target name="test" depends="build">
+  <setenv name="MONO_THREADS_PER_CPU" value="100" />
       <nunit2 failonerror="true" verbose="true">
       <formatter type="Plain" />
       <test>