diff --git a/build.xml b/build.xml
index 00edd00b37..b395acf7a6 100644
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,7 @@
     <property name="test.dir" value="${basedir}/test"/>
     <property name="test.classes" value="${build.dir}/test/classes"/>
     <property name="test.conf" value="${test.dir}/conf"/>
+    <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="final.name" value="cassandra"/>
 
     <!-- http://cobertura.sourceforge.net/ -->
@@ -136,7 +137,7 @@
      destdir="${test.classes}"
     >
       <classpath refid="cassandra.classpath"/>
-      <src path="${test.dir}"/>
+      <src path="${test.unit.src}"/>
     </javac>
   </target>
 
diff --git a/test/org/apache/cassandra/ServerTest.java b/test/unit/org/apache/cassandra/ServerTest.java
similarity index 100%
rename from test/org/apache/cassandra/ServerTest.java
rename to test/unit/org/apache/cassandra/ServerTest.java
diff --git a/test/org/apache/cassandra/db/ColumnComparatorFactoryTest.java b/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/ColumnComparatorFactoryTest.java
rename to test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java
diff --git a/test/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/ColumnFamilyStoreTest.java
rename to test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
diff --git a/test/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/ColumnFamilyTest.java
rename to test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
diff --git a/test/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/CommitLogTest.java
rename to test/unit/org/apache/cassandra/db/CommitLogTest.java
diff --git a/test/org/apache/cassandra/db/DBManagerTest.java b/test/unit/org/apache/cassandra/db/DBManagerTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/DBManagerTest.java
rename to test/unit/org/apache/cassandra/db/DBManagerTest.java
diff --git a/test/org/apache/cassandra/db/RangeFilterTest.java b/test/unit/org/apache/cassandra/db/RangeFilterTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/RangeFilterTest.java
rename to test/unit/org/apache/cassandra/db/RangeFilterTest.java
diff --git a/test/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/ReadMessageTest.java
rename to test/unit/org/apache/cassandra/db/ReadMessageTest.java
diff --git a/test/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/RecoveryManagerTest.java
rename to test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
diff --git a/test/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/RowTest.java
rename to test/unit/org/apache/cassandra/db/RowTest.java
diff --git a/test/org/apache/cassandra/db/SuperColumnTest.java b/test/unit/org/apache/cassandra/db/SuperColumnTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/SuperColumnTest.java
rename to test/unit/org/apache/cassandra/db/SuperColumnTest.java
diff --git a/test/org/apache/cassandra/db/SystemTableTest.java b/test/unit/org/apache/cassandra/db/SystemTableTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/SystemTableTest.java
rename to test/unit/org/apache/cassandra/db/SystemTableTest.java
diff --git a/test/org/apache/cassandra/db/TableTest.java b/test/unit/org/apache/cassandra/db/TableTest.java
similarity index 100%
rename from test/org/apache/cassandra/db/TableTest.java
rename to test/unit/org/apache/cassandra/db/TableTest.java
diff --git a/test/org/apache/cassandra/dht/RangeTest.java b/test/unit/org/apache/cassandra/dht/RangeTest.java
similarity index 100%
rename from test/org/apache/cassandra/dht/RangeTest.java
rename to test/unit/org/apache/cassandra/dht/RangeTest.java
diff --git a/test/org/apache/cassandra/io/DataInputBufferTest.java b/test/unit/org/apache/cassandra/io/DataInputBufferTest.java
similarity index 100%
rename from test/org/apache/cassandra/io/DataInputBufferTest.java
rename to test/unit/org/apache/cassandra/io/DataInputBufferTest.java
diff --git a/test/org/apache/cassandra/io/SSTableTest.java b/test/unit/org/apache/cassandra/io/SSTableTest.java
similarity index 100%
rename from test/org/apache/cassandra/io/SSTableTest.java
rename to test/unit/org/apache/cassandra/io/SSTableTest.java
diff --git a/test/org/apache/cassandra/service/CassandraServerTest.java b/test/unit/org/apache/cassandra/service/CassandraServerTest.java
similarity index 100%
rename from test/org/apache/cassandra/service/CassandraServerTest.java
rename to test/unit/org/apache/cassandra/service/CassandraServerTest.java
diff --git a/test/org/apache/cassandra/utils/BloomFilterTest.java b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
similarity index 100%
rename from test/org/apache/cassandra/utils/BloomFilterTest.java
rename to test/unit/org/apache/cassandra/utils/BloomFilterTest.java
diff --git a/test/org/apache/cassandra/utils/FilterTest.java b/test/unit/org/apache/cassandra/utils/FilterTest.java
similarity index 100%
rename from test/org/apache/cassandra/utils/FilterTest.java
rename to test/unit/org/apache/cassandra/utils/FilterTest.java
diff --git a/test/org/apache/cassandra/utils/KeyGenerator.java b/test/unit/org/apache/cassandra/utils/KeyGenerator.java
similarity index 100%
rename from test/org/apache/cassandra/utils/KeyGenerator.java
rename to test/unit/org/apache/cassandra/utils/KeyGenerator.java
diff --git a/test/org/apache/cassandra/utils/ResetableIterator.java b/test/unit/org/apache/cassandra/utils/ResetableIterator.java
similarity index 100%
rename from test/org/apache/cassandra/utils/ResetableIterator.java
rename to test/unit/org/apache/cassandra/utils/ResetableIterator.java