diff --git a/files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml b/files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml
index e6ff13ac0..749146838 100644
--- a/files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml
+++ b/files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml
@@ -123,8 +123,8 @@
         <tool id="toolshed.g2.bx.psu.edu/repos/bgruening/deeptools/deeptools_bamPEFragmentSize/1.5.9.1.0" />
     </section>
     <section id="solexa_tools" name="NGS: Mapping" version="">
-        <tool id="toolshed.g2.bx.psu.edu/repos/devteam/bowtie2/bowtie2/0.3" />
         <tool id="testtoolshed.g2.bx.psu.edu/repos/devteam/lastz/lastz_wrapper_2/1.03.52" />
+        <tool id="toolshed.g2.bx.psu.edu/repos/devteam/bowtie2/bowtie2/0.3" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/bwa/bwa/0.1" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/bwa/bwa_mem/0.1" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/bowtie2/bowtie2/0.2" />
@@ -272,7 +272,6 @@
     <section id="ngs:_chip-seq" name="NGS: ChIP-seq" version="">
         <tool id="testtoolshed.g2.bx.psu.edu/repos/iuc/macs2/macs2_predictd/2.1.0.20140616.0" />
         <tool id="testtoolshed.g2.bx.psu.edu/repos/iuc/macs2/macs2_bdgpeakcall/2.1.0.20140616.0" />
-        <tool id="testtoolshed.g2.bx.psu.edu/repos/iuc/macs2/macs2_callpeak/2.1.0.20140616.0" />
         <tool id="testtoolshed.g2.bx.psu.edu/repos/iuc/macs2/macs2_randsample/2.1.0.20140616.0" />
         <tool id="testtoolshed.g2.bx.psu.edu/repos/iuc/macs2/macs2_bdgcmp/2.1.0.20140616.0" />
         <tool id="testtoolshed.g2.bx.psu.edu/repos/iuc/macs2/macs2_filterdup/2.1.0.20140616.0" />
diff --git a/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2 b/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
index 620bd692c..a6020ccb7 100644
--- a/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
+++ b/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
@@ -249,7 +249,8 @@
         <tool id="echo_test_handler0" handler="test_handler0"/>
         <tool id="echo_test_handler1" handler="test_handler1"/>
         <tool id="echo_test_stampede" destination="pulsar_stampede_nagios" handler="test_handler2"/>
-        <!--Picard tools-->
+        <!-- increased memory tools -->
+        <tool id="naive_variant_caller" destination="slurm_normal_single_16gb"/
         <tool id="picard_AddCommentsToBam" destination="slurm_normal_single_16gb"/>
         <tool id="picard_AddOrReplaceReadGroups" destination="slurm_normal_single_16gb"/>
         <tool id="picard_BedToIntervalList" destination="slurm_normal_single_16gb"/>