diff --git a/.classpath b/.classpath
index 202069e..b6d7d38 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test_src"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.9.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/build.xml b/build.xml
index 11be1aa..6467c2e 100644
--- a/build.xml
+++ b/build.xml
@@ -2,6 +2,9 @@
 
 <property name="src" value="src" />
 
+<property name="test.src" value="test_src" />
+
+
 
 <!-- Load other global properties from local home directory -->
 <!-- For example, it's possible to use jikes globally by setting the
@@ -32,14 +35,17 @@
 
 
 <target name="compile" depends="init">
-  <my.javac srcdir="${src}" destdir="${build}" debug="yes">
+  <my.javac srcdir="${src}:${test.src}" destdir="${build}" debug="yes">
     <classpath refid="project.classpath"/>
   </my.javac>
 </target>
 
 
 <target name="jar" depends="compile">
-   <jar destfile="${dist}/org.arabidopsis.interval.jar" basedir="${build}"/>
+   <jar destfile="${dist}/org.arabidopsis.interval.jar" basedir="${build}">
+		<exclude name="**/*Test.class"/>
+		<exclude name="**/*Tests.class"/>
+   </jar>
 </target>
 
 
@@ -58,7 +64,7 @@
     <java fork="yes" classname="junit.textui.TestRunner"
           taskname="junit" failonerror="true">
 
-        <arg value="org.arabidopsis.interval.TestAll"/>
+        <arg value="org.arabidopsis.interval.AllTests"/>
         <classpath>
             <fileset dir="lib">
                <include name="**/*.jar"/>
diff --git a/src/org/arabidopsis/interval/TestAll.java b/test_src/org/arabidopsis/interval/AllTests.java
similarity index 92%
rename from src/org/arabidopsis/interval/TestAll.java
rename to test_src/org/arabidopsis/interval/AllTests.java
index 88afe0a..4d07352 100644
--- a/src/org/arabidopsis/interval/TestAll.java
+++ b/test_src/org/arabidopsis/interval/AllTests.java
@@ -21,8 +21,8 @@
 import junit.runner.TestCollector;
 
 
-public class TestAll extends TestCase {
-    public TestAll(String name) {
+public class AllTests extends TestCase {
+    public AllTests(String name) {
 	super(name);
     }
 
@@ -77,7 +77,7 @@ private static List<Class<? extends TestCase>> getAllTestClasses() throws ClassN
 
     // Returns true if the given class is ourself.
     private static boolean isSelfClass(Class<?> c) {
-	return c.equals(TestAll.class);
+	return c.equals(AllTests.class);
     }
 
 
@@ -85,7 +85,7 @@ private static boolean isSelfClass(Class<?> c) {
     // hierarchy as ourselves.
     private static boolean isClassNotInMyPackage(Class<?> c) {
 	return (! c.getPackage().getName().startsWith
-		(TestAll.class.getPackage().getName()));
+		(AllTests.class.getPackage().getName()));
     }
 
 }
diff --git a/src/org/arabidopsis/interval/TestFlankingFinder.java b/test_src/org/arabidopsis/interval/FlankingFinderTest.java
similarity index 98%
rename from src/org/arabidopsis/interval/TestFlankingFinder.java
rename to test_src/org/arabidopsis/interval/FlankingFinderTest.java
index 32e880d..4d2cdbf 100644
--- a/src/org/arabidopsis/interval/TestFlankingFinder.java
+++ b/test_src/org/arabidopsis/interval/FlankingFinderTest.java
@@ -7,7 +7,7 @@
 import junit.framework.TestCase;
 
 
-public class TestFlankingFinder extends TestCase {
+public class FlankingFinderTest extends TestCase {
     private FlankingFinder<String> finder;
 
 
diff --git a/src/org/arabidopsis/interval/TestIntervalTree.java b/test_src/org/arabidopsis/interval/IntervalTreeTest.java
similarity index 99%
rename from src/org/arabidopsis/interval/TestIntervalTree.java
rename to test_src/org/arabidopsis/interval/IntervalTreeTest.java
index 19fde60..6ec86f9 100644
--- a/src/org/arabidopsis/interval/TestIntervalTree.java
+++ b/test_src/org/arabidopsis/interval/IntervalTreeTest.java
@@ -6,7 +6,7 @@
 import junit.framework.TestCase;
 
 
-public class TestIntervalTree extends TestCase {
+public class IntervalTreeTest extends TestCase {
     private IntervalTree tree;
 
     public void setUp() {
diff --git a/src/org/arabidopsis/interval/TestOrderStatisticTree.java b/test_src/org/arabidopsis/interval/OrderStatisticTreeTest.java
similarity index 96%
rename from src/org/arabidopsis/interval/TestOrderStatisticTree.java
rename to test_src/org/arabidopsis/interval/OrderStatisticTreeTest.java
index 2a8c2f4..b8e1744 100644
--- a/src/org/arabidopsis/interval/TestOrderStatisticTree.java
+++ b/test_src/org/arabidopsis/interval/OrderStatisticTreeTest.java
@@ -2,7 +2,7 @@
 
 import junit.framework.TestCase;
 
-public class TestOrderStatisticTree extends TestCase {
+public class OrderStatisticTreeTest extends TestCase {
 
     public void testNilSize() {
 	OrderStatisticTree tree = new OrderStatisticTree();
diff --git a/src/org/arabidopsis/interval/TestRbTree.java b/test_src/org/arabidopsis/interval/RbTreeTest.java
similarity index 99%
rename from src/org/arabidopsis/interval/TestRbTree.java
rename to test_src/org/arabidopsis/interval/RbTreeTest.java
index 94558be..29799cc 100644
--- a/src/org/arabidopsis/interval/TestRbTree.java
+++ b/test_src/org/arabidopsis/interval/RbTreeTest.java
@@ -2,7 +2,7 @@
 import junit.framework.*;
 
 
-public class TestRbTree extends TestCase {
+public class RbTreeTest extends TestCase {
     private RbTree tree;
 
     public void setUp() {