diff --git a/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs b/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs
new file mode 100644
index 0000000000..b060559a4c
--- /dev/null
+++ b/OpenSim/Tests/UserServer/Stress/UserServerStressTest.cs
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+
+namespace OpenSim.Tests.UserServer.Stress
+{
+    /// <summary>
+    /// In the future this class will programatically stress test the user server
+    /// </summary>
+    public class UserServerStressTest
+    {
+        public static void Main(string[] args)
+        {     
+            System.Console.WriteLine("Aborting - not yet functional");
+        }
+    }
+}
diff --git a/prebuild.xml b/prebuild.xml
index ba7285fbe4..d91aed5ee2 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1294,6 +1294,25 @@
       </Files>
     </Project>
 
+    <!-- Tests -->
+    <Project name="UserServerStressTest" path="OpenSim/Tests/UserServer/Stress" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/tests/stress</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/tests/stress</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/tests/stress</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
 
     
     <!-- Tools -->
@@ -1335,8 +1354,6 @@
       </Files>
     </Project>
 
-
-
   </Solution>
 
 
@@ -1396,12 +1413,3 @@
 
   </Solution>
 </Prebuild>
-
-
-
-
-
-
-
-
-