diff --git a/build.xml b/build.xml
index 5ea91e1e98..bffb6fbdc6 100644
--- a/build.xml
+++ b/build.xml
@@ -7,6 +7,7 @@
     <property name="build.src" value="${basedir}/src"/>
     <property name="build.lib" value="${basedir}/lib"/>
     <property name="build.dir" value="${basedir}/build"/>
+    <property name="build.test.dir" value="${build.dir}/test"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="javadoc.dir" value="${build.dir}/javadoc"/>
     <property name="test.dir" value="${basedir}/test"/>
@@ -106,10 +107,12 @@
   <taskdef resource="testngtasks" classpath="lib/testng-5.8-jdk15.jar"/>
   <target name="test" depends="build-test">
     <echo message="running tests"/>
+    <mkdir dir="${build.test.dir}/commitlog"/>
+    <mkdir dir="${build.test.dir}/cassandra"/>
     <testng outputDir="${build.dir}/test/output"
             haltOnFailure="true"
             verbose="2">
-      <jvmarg value="-Dstorage-config=conf"/>
+      <jvmarg value="-Dstorage-config=test/conf"/>
       <classpath>
         <path refid="cassandra.classpath" />
         <pathelement location="${test.classes}"/>
diff --git a/test/conf/storage-conf.xml b/test/conf/storage-conf.xml
new file mode 100644
index 0000000000..81479f13c3
--- /dev/null
+++ b/test/conf/storage-conf.xml
@@ -0,0 +1,49 @@
+<Storage>
+   <ClusterName>Test Cluster</ClusterName>
+   <!-- any IPartitioner may be used, including your own
+        as long as it is on the classpath.  Out of the box,
+        Cassandra provides
+        org.apache.cassandra.dht.RandomPartitioner and
+        org.apache.cassandra.dht.OrderPreservingPartitioner.
+        Range queries require using OrderPreservingPartitioner or a subclass. -->
+   <Partitioner>org.apache.cassandra.dht.RandomPartitioner</Partitioner>
+   <RackAware>false</RackAware>
+   <MulticastChannel>230.0.0.1</MulticastChannel>
+   <ReplicationFactor>1</ReplicationFactor>
+   <ZookeeperAddress>127.0.0.1</ZookeeperAddress>
+   <RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
+   <JobTrackerHost>tdsearch001.sf2p.facebook.com</JobTrackerHost>
+   <JobJarFileLocation>C:\Engagements\Cassandra-Nexus</JobJarFileLocation>
+   <StoragePort>7000</StoragePort>
+   <ControlPort>7001</ControlPort>
+   <ThriftPort>7001</ThriftPort>
+   <ColumnIndexSizeInKB>256</ColumnIndexSizeInKB>
+   <HttpPort>7002</HttpPort>
+   <MetadataDirectory>build/test/cassandra/system</MetadataDirectory>
+   <CommitLogDirectory>build/test/commitlog</CommitLogDirectory>
+   <CommitLogRotationThresholdInMB>128</CommitLogRotationThresholdInMB>
+   <GangliaServers>
+     <GangliaServer>127.0.0.1:12000</GangliaServer>
+   </GangliaServers>
+   <DataFileDirectories>
+     <DataFileDirectory>build/test/cassandra/data</DataFileDirectory>
+   </DataFileDirectories>
+   <CalloutLocation>build/test/cassandra/callouts</CalloutLocation>
+   <BootstrapFileDirectory>build/test/cassandra/bootstrap</BootstrapFileDirectory>
+   <StagingFileDirectory>build/test/cassandra/staging</StagingFileDirectory>
+   <CommitLogFastSync>false</CommitLogFastSync>
+   <Tables>
+      <Table Name = "Table1">
+   	    <ColumnFamily Index="Name" Name="Standard1"/>
+   	    <ColumnFamily Index="Name" Name="Standard2"/>
+   	    <ColumnFamily Index="Time" Name="StandardByTime1"/>
+   	    <ColumnFamily Index="Time" Name="StandardByTime2"/>
+   	    <ColumnFamily ColumnType="Super" Index="Name" Name="Super1"/>
+   	    <ColumnFamily ColumnType="Super" Index="Name" Name="Super2"/>
+      </Table>
+   </Tables>
+   <Seeds>
+     <!-- Add names of hosts that are deemed contact points -->
+     <Seed>127.0.0.1</Seed>
+   </Seeds>
+</Storage>