diff --git a/build.xml b/build.xml
index 6ec0cdee6e..9d0ea3ea47 100644
--- a/build.xml
+++ b/build.xml
@@ -684,34 +684,12 @@
         <antcall target="createVersionPropFile"/>
     </target>
 
-    <!-- Stress build file -->
-    <property name="stress.build.src" value="${basedir}/tools/stress/src" />
-    <property name="stress.build.classes" value="${build.classes}/stress" />
-	<property name="stress.manifest" value="${stress.build.classes}/MANIFEST.MF" />
-    <path id="cassandra.classes">
-        <pathelement location="${basedir}/build/classes/main" />
-        <pathelement location="${basedir}/build/classes/thrift" />
-    </path>
-    <target name="stress-build" depends="build">
-    	<mkdir dir="${stress.build.classes}" />
-        <javac destdir="${stress.build.classes}" includeantruntime="true">
-            <src path="${stress.build.src}" />
-            <classpath>
-                <path refid="cassandra.classes" />
-                <path>
-                    <fileset dir="${build.lib}">
-                        <include name="**/*.jar" />
-                    </fileset>
-                </path>
-            </classpath>
-        </javac>
-    </target>
 
     <!--
         The jar target makes cassandra.jar output.
     -->
     <target name="jar"
-            depends="maven-declare-dependencies,build, build-test, stress-build"
+            depends="maven-declare-dependencies,build, build-test"
             description="Assemble Cassandra JAR files">
       <mkdir dir="${build.classes.main}/META-INF" />
       <mkdir dir="${build.classes.thrift}/META-INF" />
@@ -773,20 +751,6 @@
           <attribute name="Implementation-Vendor" value="Apache"/>
         </manifest>
       </jar>
-
-      <!-- Stress jar -->
-      <manifest file="${stress.manifest}">
-        <attribute name="Built-By" value="Pavel Yaskevich"/>
-        <attribute name="Main-Class" value="org.apache.cassandra.stress.Stress"/>
-      </manifest>
-      <mkdir dir="${stress.build.classes}/META-INF" />
-      <mkdir dir="${build.dir}/tools/lib/" />
-      <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}">
-        <fileset dir="${stress.build.classes}"/>
-        <fileset dir="${basedir}/build/classes/main" />
-        <fileset dir="${basedir}/build/classes/thrift" />
-        <zipgroupfileset dir="${build.lib}" includes="*.jar" />
-      </jar>
     </target>
 
     <!--
@@ -898,14 +862,7 @@
           <include name="*.txt" />
         </fileset>
       </copy>
-      <copy todir="${dist.dir}/tools/bin">
-        <fileset dir="${basedir}/tools/bin"/>
-      </copy>
-      <copy todir="${dist.dir}/tools/lib">
-        <fileset dir="${build.dir}/tools/lib/">
-            <include name="*.jar" />
-        </fileset>
-      </copy>
+
       <artifact:writepom pomRefId="dist-pom" 
             file="${build.dir}/${final.name}-dist.pom"/>
       <tar compression="gzip" longfile="gnu"
@@ -923,7 +880,6 @@
         <!-- Executable scripts in bin/ -->
         <tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
           <include name="bin/*"/>
-          <include name="tools/bin/*"/>
           <not>
                 <filename name="bin/*.in.sh" />
           </not>
diff --git a/tools/bin/stress b/tools/stress/bin/stress
similarity index 67%
rename from tools/bin/stress
rename to tools/stress/bin/stress
index 8c8d22fb8c..4e606864f0 100755
--- a/tools/bin/stress
+++ b/tools/stress/bin/stress
@@ -17,19 +17,22 @@
 # limitations under the License.
 
 if [ "x$CLASSPATH" = "x" ]; then
-    
-    # execute from the build dir.
-    if [ -d `dirname $0`/../../build/classes ]; then
-        for directory in `dirname $0`/../../build/classes/*; do
-            CLASSPATH=$CLASSPATH:$directory
-        done
-    else
-        if [ -f `dirname $0`/../lib/stress.jar ]; then
-            CLASSPATH=`dirname $0`/../lib/stress.jar
-        fi
+    # Cassandra class files.
+    if [ ! -d `dirname $0`/../../../build/classes/main ]; then
+        echo "Unable to locate cassandra class files" >&2
+        exit 1
     fi
 
-    for jar in `dirname $0`/../../lib/*.jar; do
+    # Stress class files.
+    if [ ! -d `dirname $0`/../build/classes ]; then
+        echo "Unable to locate stress class files" >&2
+        exit 1
+    fi
+
+    CLASSPATH=`dirname $0`/../../../build/classes/main
+    CLASSPATH=$CLASSPATH:`dirname $0`/../../../build/classes/thrift
+    CLASSPATH=$CLASSPATH:`dirname $0`/../build/classes
+    for jar in `dirname $0`/../../../lib/*.jar; do
         CLASSPATH=$CLASSPATH:$jar
     done
 fi
diff --git a/tools/bin/stress.bat b/tools/stress/bin/stress.bat
similarity index 85%
rename from tools/bin/stress.bat
rename to tools/stress/bin/stress.bat
index 78e8dbbeb6..f7b04218d7 100755
--- a/tools/bin/stress.bat
+++ b/tools/stress/bin/stress.bat
@@ -18,7 +18,9 @@
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
 if NOT DEFINED STRESS_HOME set STRESS_HOME=%CD%
 
-set CLASSPATH="%STRESS_HOME%\..\lib\*.jar"
+set CLASSPATH="%STRESS_HOME%\build\classes"
+set CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main"
+set CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\thrift"
 for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
     set CLASSPATH=%CLASSPATH%;"%%i"
 goto start
diff --git a/tools/bin/stressd b/tools/stress/bin/stressd
similarity index 76%
rename from tools/bin/stressd
rename to tools/stress/bin/stressd
index 400ebb0625..5cc3ff2d46 100755
--- a/tools/bin/stressd
+++ b/tools/stress/bin/stressd
@@ -19,19 +19,22 @@
 DESC="Stress Test Daemon"
 
 if [ "x$CLASSPATH" = "x" ]; then
-    
-    # execute from the build dir.
-    if [ -d `dirname $0`/../../build/classes ]; then
-        for directory in `dirname $0`/../../build/classes/*; do
-            CLASSPATH=$CLASSPATH:$directory
-        done
-    else
-        if [ -f `dirname $0`/../lib/stress.jar ]; then
-            CLASSPATH=`dirname $0`/../lib/stress.jar
-        fi
+    # Cassandra class files.
+    if [ ! -d `dirname $0`/../../../build/classes/main ]; then
+        echo "Unable to locate cassandra class files" >&2
+        exit 1
     fi
 
-    for jar in `dirname $0`/../../lib/*.jar; do
+    # Stress class files.
+    if [ ! -d `dirname $0`/../build/classes ]; then
+        echo "Unable to locate stress class files" >&2
+        exit 1
+    fi
+
+    CLASSPATH=`dirname $0`/../../../build/classes/main
+    CLASSPATH=$CLASSPATH:`dirname $0`/../../../build/classes/thrift
+    CLASSPATH=$CLASSPATH:`dirname $0`/../build/classes
+    for jar in `dirname $0`/../../../lib/*.jar; do
         CLASSPATH=$CLASSPATH:$jar
     done
 fi
diff --git a/tools/stress/build.xml b/tools/stress/build.xml
new file mode 100644
index 0000000000..a186ecfa59
--- /dev/null
+++ b/tools/stress/build.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements.  See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership.  The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License.  You may obtain a copy of the License at
+ ~
+ ~    http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied.  See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project basedir="." default="jar" name="stress">
+    <property name="cassandra.dir" value="../.." />
+    <property name="cassandra.lib" value="${cassandra.dir}/lib" />
+    <property name="build.src" value="${basedir}/src" />
+    <property name="build.out" value="${basedir}/build" />
+    <property name="build.classes" value="${build.out}/classes" />
+    <property name="final.name" value="stress" />
+
+    <path id="cassandra.classes">
+        <pathelement location="${cassandra.dir}/build/classes/main" />
+        <pathelement location="${cassandra.dir}/build/classes/thrift" />
+    </path>
+
+    <target name="init">
+        <mkdir dir="${build.classes}" />
+    </target>
+
+    <target depends="init" name="build">
+        <javac destdir="${build.classes}">
+            <src path="${build.src}" />
+            <classpath>
+                <path refid="cassandra.classes" />
+                <path>
+                    <fileset dir="${cassandra.lib}">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </path>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="jar" depends="build">
+        <manifest file="MANIFEST.MF">
+            <attribute name="Built-By" value="Pavel Yaskevich"/>
+            <attribute name="Main-Class" value="org.apache.cassandra.stress.Stress"/>
+        </manifest>
+
+        <mkdir dir="${build.classes}/META-INF" />
+
+        <jar destfile="${build.out}/${final.name}.jar" manifest="MANIFEST.MF">
+            <fileset dir="${build.classes}"/>
+            <fileset dir="${cassandra.dir}/build/classes/main" />
+            <fileset dir="${cassandra.dir}/build/classes/thrift" />
+            <zipgroupfileset dir="${cassandra.lib}" includes="*.jar" />
+        </jar>
+    </target>
+
+    <target name="clean">
+        <delete dir="${build.out}" />
+    </target>
+</project>