diff --git a/build.xml b/build.xml
index 4e7c642ba..07c05c077 100644
--- a/build.xml
+++ b/build.xml
@@ -563,6 +563,9 @@
     <target name="test.init.compile">
         <mkdir dir="${java.test.classes}"/>
         <mkdir dir="${scala.test.classes}"/>
+        <antcall target="resolve">
+          <param name="ivy.conf" value="test"/>
+        </antcall>            
     </target>
 
     <target name="test.java.compile" depends="init.buildall,dist,test.init.compile">
@@ -579,6 +582,9 @@
 
     <target name="test.scala.compile" depends="test.java.compile,scala.compile" if="scala.include">
         <echo message="Scala: Compiling test cases!"/>
+        <antcall target="resolve">
+          <param name="ivy.conf" value="test"/>
+        </antcall>          
         <scalac fork="true" jvmargs="-Xmx512m" srcdir="${scala.test.sources}" destdir="${scala.test.classes}" deprecation="yes" unchecked="yes">
             <include name="**/*.scala"/>
             <exclude name="**/gridengine/**" unless="include.gridengine" />
@@ -809,7 +815,7 @@
     </path>
     <target         name="findbugs" depends="dist">
         <antcall    target  ="resolve">
-            <param  name    ="ivy.conf" value="findbugs"/>
+            <param  name    ="ivy.conf" value="test"/>
         </antcall>
         <!-- setup the taskdef, telling ant where to find the defined task for ant -->
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs.classpath"/>
diff --git a/ivy.xml b/ivy.xml
index cc520c1a7..6ece07367 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,17 +1,16 @@
 
 <ivy-module version="1.0">
   <info organisation="org.broadinstitute" module="Sting"/>
-  <configurations>
+  <configurations defaultconfmapping="test->default">
     <conf name="default" description="the core dependencies for the GATK"/>
+    <conf name="test" extends="default" description="external dependencies used for testing and metrics" />
     <conf name="scala" extends="default" description="the dependencies for scala"/>
     <conf name="queue" extends="scala" description="the dependencies for Queue"/>
-    <conf name="findbugs" extends="default" description="the dependencies for Findbugs"/>
   </configurations>
   <dependencies defaultconf="default">
     <dependency org="net.sf" name="sam" rev="latest.integration"/>
     <dependency org="net.sf" name="picard" rev="latest.integration"/>
     <dependency org="edu.mit.broad" name="picard-private-parts" rev="latest.integration"/>
-    <dependency org="org.testng" name="testng" rev="5.14.1" />
 
     <dependency org="log4j" name="log4j" rev="1.2.15">
       <!-- Don't include javax.mail here in default, only used in scala->default by commons-email -->
@@ -53,15 +52,13 @@
     <dependency org="org.scala-lang" name="scala-compiler" rev="2.8.1"/>
     <dependency org="org.scala-lang" name="scala-library" rev="2.8.1"/>
 
-    <!-- findbug dependencies -->
-    <dependency org="net.sourceforge.findbugs" name="findbugs" rev="1.3.2" conf="findbugs->default"/>
-    <dependency org="net.sourceforge.findbugs" name="findbugs-ant" rev="1.3.2" conf="findbugs->default"/>
-    <!-- dependencies we need to annotate findbug issues -->
-    <dependency org="net.sourceforge.findbugs" name="annotations" rev="1.3.2" conf="default"/>
-    <dependency org="net.sourceforge.findbugs" name="jsr305" rev="1.3.2" conf="default"/>
-
-    <!-- caliper, for benchmarking -->
-    <dependency org="com.google.code.caliper" name="caliper" rev="0.0" conf="default" />
+    <!-- testing and evaluation dependencies -->
+    <dependency org="org.testng" name="testng" rev="5.14.1" conf="test" />
+    <dependency org="net.sourceforge.findbugs" name="findbugs" rev="1.3.2" conf="test"/>
+    <dependency org="net.sourceforge.findbugs" name="findbugs-ant" rev="1.3.2" conf="test"/>
+    <dependency org="net.sourceforge.findbugs" name="annotations" rev="1.3.2" conf="test"/>
+    <dependency org="net.sourceforge.findbugs" name="jsr305" rev="1.3.2" conf="test"/>
+    <dependency org="com.google.code.caliper" name="caliper" rev="1.0-SNAPSHOT" conf="test" />
 
     <!-- Exclude dependencies on sun libraries where the downloads aren't available but included in the jvm. -->
     <exclude org="javax.servlet" />
diff --git a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/DownsamplerBenchmark.java b/java/test/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java
similarity index 98%
rename from java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/DownsamplerBenchmark.java
rename to java/test/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java
index 94b1c2025..2ecd75754 100644
--- a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/DownsamplerBenchmark.java
+++ b/java/test/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.broadinstitute.sting.gatk.datasources.reads.performance;
+package org.broadinstitute.sting.gatk.datasources.reads;
 
 import com.google.caliper.Param;
 import net.sf.picard.filter.FilteringIterator;
diff --git a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/GATKWalkerBenchmark.java b/java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java
similarity index 98%
rename from java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/GATKWalkerBenchmark.java
rename to java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java
index 1719f85e6..31458f835 100644
--- a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/GATKWalkerBenchmark.java
+++ b/java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.broadinstitute.sting.gatk.datasources.reads.performance;
+package org.broadinstitute.sting.gatk.datasources.reads;
 
 import com.google.caliper.Param;
 import net.sf.picard.filter.SamRecordFilter;
diff --git a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/PicardBaselineBenchmark.java b/java/test/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java
similarity index 98%
rename from java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/PicardBaselineBenchmark.java
rename to java/test/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java
index 1c22d7663..4be862fe5 100644
--- a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/PicardBaselineBenchmark.java
+++ b/java/test/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.broadinstitute.sting.gatk.datasources.reads.performance;
+package org.broadinstitute.sting.gatk.datasources.reads;
 
 import com.google.caliper.Param;
 import com.google.caliper.SimpleBenchmark;
diff --git a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/ReadProcessingBenchmark.java b/java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java
similarity index 97%
rename from java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/ReadProcessingBenchmark.java
rename to java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java
index 206cb9e4a..fa50dead6 100644
--- a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/ReadProcessingBenchmark.java
+++ b/java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.broadinstitute.sting.gatk.datasources.reads.performance;
+package org.broadinstitute.sting.gatk.datasources.reads;
 
 import com.google.caliper.Param;
 import com.google.caliper.SimpleBenchmark;
diff --git a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/TheoreticalMinimaBenchmark.java b/java/test/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java
similarity index 98%
rename from java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/TheoreticalMinimaBenchmark.java
rename to java/test/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java
index 1ad286e97..8e67c9efc 100644
--- a/java/src/org/broadinstitute/sting/gatk/datasources/reads/performance/TheoreticalMinimaBenchmark.java
+++ b/java/test/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package org.broadinstitute.sting.gatk.datasources.reads.performance;
+package org.broadinstitute.sting.gatk.datasources.reads;
 
 import com.google.caliper.Param;
 import net.sf.samtools.Cigar;
diff --git a/settings/ivysettings.xml b/settings/ivysettings.xml
index b1195ac98..cf9373dda 100644
--- a/settings/ivysettings.xml
+++ b/settings/ivysettings.xml
@@ -25,8 +25,7 @@
     <module organisation="javax.mail" resolver="java.net" />
     <module organisation="javax.activation" resolver="java.net" />
     <module organisation="net.java.dev.jna" resolver="maven2-repository.dev.java.net" />
-    <!-- module organisation="com.google.code.caliper" resolver="sonatype" / -->
-    <module organisation="com.google.code.caliper" resolver="projects" />    
+    <module organisation="com.google.code.caliper" resolver="sonatype" />
     <module organisation="com.google.code.gson" revision="1.7-SNAPSHOT"  resolver="sonatype" />
   </modules>
 </ivysettings>
diff --git a/settings/repository/com.google.code.caliper/caliper-0.0.jar b/settings/repository/com.google.code.caliper/caliper-0.0.jar
deleted file mode 100644
index 3f7007457..000000000
Binary files a/settings/repository/com.google.code.caliper/caliper-0.0.jar and /dev/null differ
diff --git a/settings/repository/com.google.code.caliper/caliper-0.0.xml b/settings/repository/com.google.code.caliper/caliper-0.0.xml
deleted file mode 100644
index a6949a720..000000000
--- a/settings/repository/com.google.code.caliper/caliper-0.0.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="com.google.code.caliper" module="caliper" revision="0.0" status="integration" publication="20110505102000" />
-</ivy-module>