diff --git a/galaxy/wrapper/bamCompare.xml b/galaxy/wrapper/bamCompare.xml
index d376dd139d..f1136ad6fa 100644
--- a/galaxy/wrapper/bamCompare.xml
+++ b/galaxy/wrapper/bamCompare.xml
@@ -173,8 +173,8 @@
     </outputs>
     <tests>
         <test>
-            <param name="bamFile1" value="bowtie2-test1.bam" ftype="bam" />
-            <param name="bamFile2" value="bowtie2-test1.bam" ftype="bam" />
+            <param name="bamFile1" value="bowtie2 test1.bam" ftype="bam" />
+            <param name="bamFile2" value="bowtie2 test1.bam" ftype="bam" />
             <param name="showAdvancedOpt" value="no" />
             <param name="outFileFormat" value="bigwig" />
             <param name="outFileFormat" value="bedgraph" />
@@ -183,8 +183,8 @@
             <output name="outFileName" file="bamCompare_result1.bg" ftype="bedgraph" />
         </test>
         <test>
-            <param name="bamFile1" value="bowtie2-test1.bam" ftype="bam" />
-            <param name="bamFile2" value="bowtie2-test1.bam" ftype="bam" />
+            <param name="bamFile1" value="bowtie2 test1.bam" ftype="bam" />
+            <param name="bamFile2" value="bowtie2 test1.bam" ftype="bam" />
             <param name="showAdvancedOpt" value="yes" />
             <param name="outFileFormat" value="bigwig" />
             <param name="outFileFormat" value="bigwig" />
diff --git a/galaxy/wrapper/bamCoverage.xml b/galaxy/wrapper/bamCoverage.xml
index 13f30b3d69..daf0a5b72c 100644
--- a/galaxy/wrapper/bamCoverage.xml
+++ b/galaxy/wrapper/bamCoverage.xml
@@ -130,7 +130,7 @@
     </outputs>
     <tests>
         <test>
-            <param name="bamInput" value="bowtie2-test1.bam" ftype="bam" />
+            <param name="bamInput" value="bowtie2 test1.bam" ftype="bam" />
             <param name="outFileFormat" value="bigwig" />
             <param name="showAdvancedOpt" value="no" />
             <param name="binSize" value="10" />
@@ -138,14 +138,14 @@
             <output name="outFileName" file="bamCoverage_result1.bw" ftype="bigwig" />
         </test>
         <test>
-            <param name="bamInput" value="bowtie2-test1.bam" ftype="bam" />
+            <param name="bamInput" value="bowtie2 test1.bam" ftype="bam" />
             <param name="outFileFormat" value="bigwig" />
             <param name="showAdvancedOpt" value="no" />
             <param name="binSize" value="10" />
             <output name="outFileName" file="bamCoverage_result2.bw" ftype="bigwig" />
         </test>
         <test>
-            <param name="bamInput" value="bowtie2-test1.bam" ftype="bam" />
+            <param name="bamInput" value="bowtie2 test1.bam" ftype="bam" />
             <param name="outFileFormat" value="bedgraph" />
             <param name="showAdvancedOpt" value="no" />
             <param name="binSize" value="10" />
diff --git a/galaxy/wrapper/bamPEFragmentSize.xml b/galaxy/wrapper/bamPEFragmentSize.xml
index c9beb3a9a0..fa043fd61d 100644
--- a/galaxy/wrapper/bamPEFragmentSize.xml
+++ b/galaxy/wrapper/bamPEFragmentSize.xml
@@ -55,7 +55,7 @@
     </outputs>
     <tests>
         <test>
-            <param name="bamInput" value="bowtie2-test1.bam" ftype="bam" />
+            <param name="bamInput" value="bowtie2 test1.bam" ftype="bam" />
             <param name="histogram" value="True" />
             <param name="plotTitle" value="Test Plot" />
             <output name="outfile" file="bamPEFragmentSize_result1.txt" ftype="txt" />
diff --git a/galaxy/wrapper/multiBamSummary.xml b/galaxy/wrapper/multiBamSummary.xml
index 837cc41ec1..f9d0f76748 100644
--- a/galaxy/wrapper/multiBamSummary.xml
+++ b/galaxy/wrapper/multiBamSummary.xml
@@ -16,8 +16,8 @@
             @THREADS@
 
             --outFileName '$outFile'
-            --bamfiles '#echo "' '".join($files)#'
-            --labels '#echo "' '".join($labels)#'
+            --bamfiles #echo " ".join($files)#
+            --labels #echo " ".join($labels)#
 
             #if $outRawCounts:
                 --outRawCounts '$outFileRawCounts'
@@ -85,13 +85,13 @@
     </outputs>
     <tests>
         <test>
-            <param name="bamfiles" value="bowtie2-test1.bam,bowtie2-test1.bam" ftype="bam" />
+            <param name="bamfiles" value="bowtie2 test1.bam,bowtie2 test1.bam" ftype="bam" />
             <param name="modeOpt" value="bins" />
             <param name="binSize" value="10" />
             <output name="outFile" file="multiBamSummary_result1.npz" ftype="deeptools_coverage_matrix" compare="sim_size" />
         </test>
         <test>
-            <param name="bamfiles" value="bowtie2-test1.bam,bowtie2-test1.bam" ftype="bam" />
+            <param name="bamfiles" value="bowtie2 test1.bam,bowtie2 test1.bam" ftype="bam" />
             <param name="modeOpt" value="BED-file" />
             <param name="region_file" value="multiBamSummary_regions.bed" />
             <output name="outFile" file="multiBamSummary_result2.npz" ftype="deeptools_coverage_matrix" compare="sim_size" />
diff --git a/galaxy/wrapper/multiBigwigSummary.xml b/galaxy/wrapper/multiBigwigSummary.xml
index 56a837eed1..1751afba94 100644
--- a/galaxy/wrapper/multiBigwigSummary.xml
+++ b/galaxy/wrapper/multiBigwigSummary.xml
@@ -18,8 +18,8 @@
             @THREADS@
 
             --outFileName $outFile
-            --bwfiles '#echo "' '".join($files)#'
-            --labels '#echo "' '".join($labels)#'
+            --bwfiles #echo " ".join($files)#
+            --labels #echo " ".join($labels)#
 
             #if $outRawCounts:
                 --outRawCounts '$outFileRawCounts'
diff --git a/galaxy/wrapper/plotCoverage.xml b/galaxy/wrapper/plotCoverage.xml
index bf22e8e151..01fcb67f8e 100644
--- a/galaxy/wrapper/plotCoverage.xml
+++ b/galaxy/wrapper/plotCoverage.xml
@@ -17,8 +17,8 @@
             @THREADS@
 
             --plotFile '$outFileName'
-            --bamfiles '#echo "' '".join($files)#'
-            --labels '#echo "' '".join($labels)#'
+            --bamfiles #echo " ".join($files)#
+            --labels #echo " ".join($labels)#
             --plotFileFormat "$outFileFormat"
 
             #if $outRawCounts:
@@ -76,13 +76,13 @@
     </outputs>
     <tests>
         <test>
-            <param name="bamfiles" value="bowtie2-test1.bam,bowtie2-test1.bam" ftype="bam" />
+            <param name="bamfiles" value="bowtie2 test1.bam,bowtie2 test1.bam" ftype="bam" />
             <!--param name="outFileFormat" value="png" /-->
             <param name="showAdvancedOpt" value="yes" />
             <param name="plotTitle" value="Test Title from Galaxy" />
             <param name="outRawCounts" value="True" />
             <output name="outFileRawCounts" file="plotCoverage_result1.tabular" ftype="tabular" />
-            <output name="outFileName" file="plotCoverage_result1.png" ftype="png" compare="sim_size" delta="2200" />
+            <output name="outFileName" file="plotCoverage_result1.png" ftype="png" compare="sim_size" delta="2400" />
         </test>
     </tests>
     <help>
diff --git a/galaxy/wrapper/plotFingerprint.xml b/galaxy/wrapper/plotFingerprint.xml
index 2020bc0f84..87d70a4df0 100644
--- a/galaxy/wrapper/plotFingerprint.xml
+++ b/galaxy/wrapper/plotFingerprint.xml
@@ -94,13 +94,13 @@
     </outputs>
     <tests>
         <test>
-            <param name="bamfiles" value="bowtie2-test1.bam,bowtie2-test1.bam" ftype="bam" />
+            <param name="bamfiles" value="bowtie2 test1.bam,bowtie2 test1.bam" ftype="bam" />
             <param name="showAdvancedOpt" value="no" />
             <param name="showOutputSettings" value="no" />
             <output name="outFileName" file="plotFingerprint_result1.png" ftype="png" compare="sim_size" />
         </test>
         <test>
-            <param name="bamfiles" value="bowtie2-test1.bam,bowtie2-test1.bam" ftype="bam" />
+            <param name="bamfiles" value="bowtie2 test1.bam,bowtie2 test1.bam" ftype="bam" />
             <param name="showAdvancedOpt" value="yes" />
             <param name="showOutputSettings" value="yes" />
             <param name="saveRawCounts" value="True" />
diff --git a/galaxy/wrapper/test-data/bowtie2-test1.bam b/galaxy/wrapper/test-data/bowtie2 test1.bam
similarity index 100%
rename from galaxy/wrapper/test-data/bowtie2-test1.bam
rename to galaxy/wrapper/test-data/bowtie2 test1.bam
diff --git a/galaxy/wrapper/test-data/plotCoverage_result1.tabular b/galaxy/wrapper/test-data/plotCoverage_result1.tabular
index fe3f97d12a..ca382b0d57 100644
--- a/galaxy/wrapper/test-data/plotCoverage_result1.tabular
+++ b/galaxy/wrapper/test-data/plotCoverage_result1.tabular
@@ -1,4 +1,4 @@
-#'chr'	'start'	'end'	'bowtie2-test1.bam'	'bowtie2-test1.bam'
+#'chr'	'start'	'end'	'bowtie2 test1.bam'	'bowtie2 test1.bam'
 chrM	0	1	23.0	23.0
 chrM	1	2	35.0	35.0
 chrM	2	3	35.0	35.0
diff --git a/galaxy/wrapper/test-data/plotFingerprint_result2.tabular b/galaxy/wrapper/test-data/plotFingerprint_result2.tabular
index b05e7f023d..2096b46182 100644
--- a/galaxy/wrapper/test-data/plotFingerprint_result2.tabular
+++ b/galaxy/wrapper/test-data/plotFingerprint_result2.tabular
@@ -1,4 +1,4 @@
-'bowtie2-test1.bam'	'bowtie2-test1.bam'
+'bowtie2 test1.bam'	'bowtie2 test1.bam'
 68	68
 65	65
 61	61
diff --git a/galaxy/wrapper/tool_dependencies.xml b/galaxy/wrapper/tool_dependencies.xml
index 4a2d4797ad..500d2956d2 100644
--- a/galaxy/wrapper/tool_dependencies.xml
+++ b/galaxy/wrapper/tool_dependencies.xml
@@ -3,7 +3,7 @@
     <package name="python" version="2.7.10">
         <repository name="package_python_2_7_10" owner="iuc" prior_installation_required="True" />
     </package>
-    <package name="deepTools" version="2.1.0">
-        <repository name="package_python_2_7_deeptools_2_1_0" owner="iuc"/>
+    <package name="deepTools" version="2.2.2">
+        <repository name="package_python_2_7_deeptools_2_2_2" owner="iuc"/>
     </package>
 </tool_dependency>