diff --git a/tools/mitos/macros.xml b/tools/mitos/macros.xml
index 876c26d82c8..dd661ca89cd 100644
--- a/tools/mitos/macros.xml
+++ b/tools/mitos/macros.xml
@@ -7,7 +7,7 @@
 
 - A fasta formatted sequence
 
-  - @MITOS_NAME@ processes only FASTA files containing a single sequence. If you have a FASTA file with multiple sequences you may use the tool *Split Fasta files into a collection". The resulting collection can then used as input to @MITOS_NAME@.
+  - @MITOS_NAME@ processes only FASTA files containing a single sequence. If you have a FASTA file with multiple sequences you may use the tool *Split Fasta files into a collection*. The resulting collection can then used as input to @MITOS_NAME@.
   
 - The correct genetic code needs to be selected
 
diff --git a/tools/mitos/mitos.xml b/tools/mitos/mitos.xml
index 498636e279f..e73e8a0cfb4 100644
--- a/tools/mitos/mitos.xml
+++ b/tools/mitos/mitos.xml
@@ -1,14 +1,14 @@
 <tool id="mitos" name="@MITOS_NAME@" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
   <description>de-novo annotation of metazoan mitochondrial genomes</description>
-  <xrefs>
-      <xref type='bio.tools'>mitos</xref>
-  </xrefs>
   <macros>
     <import>macros.xml</import>
     <token name="@MITOS_NAME@">MITOS</token>
-    <token name="@TOOL_VERSION@">1.1.1</token>
+    <token name="@TOOL_VERSION@">1.1.4</token>
     <token name="@VERSION_SUFFIX@">0</token>
   </macros>
+  <xrefs>
+      <xref type='bio.tools'>mitos</xref>
+  </xrefs>
   <requirements>
     <requirement type="package" version="@TOOL_VERSION@">mitos</requirement>
   </requirements>
@@ -166,7 +166,12 @@ runmitos.py
       <output name="protein_plot_out" file="NC_012920_prot.pdf" ftype="pdf" compare="sim_size"/>
       <output name="ncRNA_plot_out" file="NC_012920_ncrna.pdf" ftype="pdf" compare="sim_size"/>
       <output_collection name="ncRNA_structure_plot_svg_out" type="list" count="24">
-         <element name="trnA-5586-5654" file="NC_012920_trnA.svg" ftype="svg" /> 
+         <element name="trnA-5586-5654" ftype="svg">
+          <assert_contents>
+            <has_text text="&lt;svg"/>
+            <has_size min="100"/>
+          </assert_contents>
+         </element>
       </output_collection>
       <assert_command>
         <has_text text="--code 2"/>
diff --git a/tools/mitos/mitos2.xml b/tools/mitos/mitos2.xml
index dd795ad8811..0dd291b20d0 100644
--- a/tools/mitos/mitos2.xml
+++ b/tools/mitos/mitos2.xml
@@ -1,14 +1,14 @@
 <tool id="mitos2" name="@MITOS_NAME@" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
   <description>de-novo annotation of metazoan mitochondrial genomes</description>
-  <xrefs>
-      <xref type='bio.tools'>mitos</xref>
-  </xrefs>
   <macros>
     <import>macros.xml</import>
     <token name="@MITOS_NAME@">MITOS2</token>
-    <token name="@TOOL_VERSION@">2.1.3</token>
+    <token name="@TOOL_VERSION@">2.1.6</token>
     <token name="@VERSION_SUFFIX@">0</token>
   </macros>
+  <xrefs>
+      <xref type="bio.tools">mitos</xref>
+  </xrefs>
   <requirements>
     <requirement type="package" version="@TOOL_VERSION@">mitos</requirement>
   </requirements>
diff --git a/tools/mitos/test-data/NC_012920_trnA.svg b/tools/mitos/test-data/NC_012920_trnA.svg
deleted file mode 100644
index d40e49062e5..00000000000
--- a/tools/mitos/test-data/NC_012920_trnA.svg
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="452" width="452">
-<script type="text/ecmascript">
-      <![CDATA[
-        var shown = 1;
-        function click() {
-             var seq = document.getElementById("seq");
-             if (shown==1) {
-               seq.setAttribute("style", "visibility: hidden");
-               shown = 0;
-             } else {
-               seq.setAttribute("style", "visibility: visible");
-               shown = 1;
-             }
-         }
-        ]]>
-</script>
-  <rect style="stroke: white; fill: white" height="452" x="0" y="0" width="452" onclick="click(evt)" />
-  <g transform="scale(1.606723,1.606723) translate(25.639824,33.551025)">
-    <polyline style="stroke: black; fill: none; stroke-width: 1.5" id="outline" points="
-      112.164,-10.084
-      111.491,4.901
-      110.818,19.886
-      110.145,34.870
-      109.472,49.855
-      108.799,64.840
-      108.126,79.825
-      92.018,81.598
-      79.209,90.125
-      72.157,102.876
-      57.292,100.862
-      42.428,98.849
-      27.564,96.835
-      16.740,84.993
-      0.744,86.216
-      -8.154,99.565
-      -3.128,114.801
-      11.966,120.235
-      25.550,111.700
-      40.415,113.713
-      55.279,115.727
-      70.143,117.740
-      74.909,130.778
-      85.025,140.285
-      81.034,154.745
-      77.044,169.204
-      73.053,183.663
-      69.063,198.123
-      54.767,204.460
-      47.936,218.527
-      51.795,233.681
-      64.522,242.767
-      80.108,241.495
-      91.193,230.465
-      92.544,214.886
-      83.522,202.113
-      87.513,187.654
-      91.503,173.195
-      95.494,158.735
-      99.484,144.276
-      110.578,143.482
-      120.992,138.597
-      129.225,130.028
-      133.985,118.727
-      134.391,106.090
-      149.376,105.417
-      164.361,104.744
-      179.345,104.071
-      194.330,103.398
-      204.775,115.035
-      220.264,117.185
-      233.484,108.832
-      238.193,93.920
-      232.166,79.490
-      218.251,72.356
-      203.017,75.886
-      193.657,88.413
-      178.673,89.086
-      163.688,89.759
-      148.703,90.432
-      133.718,91.105
-      123.111,80.498
-      123.784,65.513
-      124.457,50.528
-      125.130,35.543
-      125.803,20.559
-      126.476,5.574
-      127.149,-9.411
-      130.202,-28.551
-    " />
-    <g style="stroke: black; stroke-width: 1" id="pairs">
-      <line id="1,68" x1="112.164" y1="-10.084" x2="127.149" y2="-9.411" />
-      <line id="2,67" x1="111.491" y1=" 4.901" x2="126.476" y2=" 5.574" />
-      <line id="3,66" x1="110.818" y1="19.886" x2="125.803" y2="20.559" />
-      <line id="4,65" x1="110.145" y1="34.870" x2="125.130" y2="35.543" />
-      <line id="5,64" x1="109.472" y1="49.855" x2="124.457" y2="50.528" />
-      <line id="6,63" x1="108.799" y1="64.840" x2="123.784" y2="65.513" />
-      <line id="7,62" x1="108.126" y1="79.825" x2="123.111" y2="80.498" />
-      <line id="10,22" x1="72.157" y1="102.876" x2="70.143" y2="117.740" />
-      <line id="11,21" x1="57.292" y1="100.862" x2="55.279" y2="115.727" />
-      <line id="12,20" x1="42.428" y1="98.849" x2="40.415" y2="113.713" />
-      <line id="13,19" x1="27.564" y1="96.835" x2="25.550" y2="111.700" />
-      <line id="24,40" x1="85.025" y1="140.285" x2="99.484" y2="144.276" />
-      <line id="25,39" x1="81.034" y1="154.745" x2="95.494" y2="158.735" />
-      <line id="26,38" x1="77.044" y1="169.204" x2="91.503" y2="173.195" />
-      <line id="27,37" x1="73.053" y1="183.663" x2="87.513" y2="187.654" />
-      <line id="28,36" x1="69.063" y1="198.123" x2="83.522" y2="202.113" />
-      <line id="45,61" x1="134.391" y1="106.090" x2="133.718" y2="91.105" />
-      <line id="46,60" x1="149.376" y1="105.417" x2="148.703" y2="90.432" />
-      <line id="47,59" x1="164.361" y1="104.744" x2="163.688" y2="89.759" />
-      <line id="48,58" x1="179.345" y1="104.071" x2="178.673" y2="89.086" />
-      <line id="49,57" x1="194.330" y1="103.398" x2="193.657" y2="88.413" />
-    </g>
-    <g style="font-family: SansSerif" transform="translate(-4.6, 4)" id="seq">
-      <text x="112.164" y="-10.084">A</text>
-      <text x="111.491" y="4.901">A</text>
-      <text x="110.818" y="19.886">G</text>
-      <text x="110.145" y="34.870">G</text>
-      <text x="109.472" y="49.855">G</text>
-      <text x="108.799" y="64.840">C</text>
-      <text x="108.126" y="79.825">U</text>
-      <text x="92.018" y="81.598">U</text>
-      <text x="79.209" y="90.125">A</text>
-      <text x="72.157" y="102.876">G</text>
-      <text x="57.292" y="100.862">C</text>
-      <text x="42.428" y="98.849">U</text>
-      <text x="27.564" y="96.835">U</text>
-      <text x="16.740" y="84.993">A</text>
-      <text x="0.744" y="86.216">A</text>
-      <text x="-8.154" y="99.565">U</text>
-      <text x="-3.128" y="114.801">U</text>
-      <text x="11.966" y="120.235">A</text>
-      <text x="25.550" y="111.700">A</text>
-      <text x="40.415" y="113.713">A</text>
-      <text x="55.279" y="115.727">G</text>
-      <text x="70.143" y="117.740">U</text>
-      <text x="74.909" y="130.778">G</text>
-      <text x="85.025" y="140.285">G</text>
-      <text x="81.034" y="154.745">C</text>
-      <text x="77.044" y="169.204">U</text>
-      <text x="73.053" y="183.663">G</text>
-      <text x="69.063" y="198.123">A</text>
-      <text x="54.767" y="204.460">U</text>
-      <text x="47.936" y="218.527">U</text>
-      <text x="51.795" y="233.681">U</text>
-      <text x="64.522" y="242.767">G</text>
-      <text x="80.108" y="241.495">C</text>
-      <text x="91.193" y="230.465">G</text>
-      <text x="92.544" y="214.886">U</text>
-      <text x="83.522" y="202.113">U</text>
-      <text x="87.513" y="187.654">C</text>
-      <text x="91.503" y="173.195">A</text>
-      <text x="95.494" y="158.735">G</text>
-      <text x="99.484" y="144.276">U</text>
-      <text x="110.578" y="143.482">U</text>
-      <text x="120.992" y="138.597">G</text>
-      <text x="129.225" y="130.028">A</text>
-      <text x="133.985" y="118.727">U</text>
-      <text x="134.391" y="106.090">G</text>
-      <text x="149.376" y="105.417">C</text>
-      <text x="164.361" y="104.744">A</text>
-      <text x="179.345" y="104.071">G</text>
-      <text x="194.330" y="103.398">A</text>
-      <text x="204.775" y="115.035">G</text>
-      <text x="220.264" y="117.185">U</text>
-      <text x="233.484" y="108.832">G</text>
-      <text x="238.193" y="93.920">G</text>
-      <text x="232.166" y="79.490">G</text>
-      <text x="218.251" y="72.356">G</text>
-      <text x="203.017" y="75.886">U</text>
-      <text x="193.657" y="88.413">U</text>
-      <text x="178.673" y="89.086">U</text>
-      <text x="163.688" y="89.759">U</text>
-      <text x="148.703" y="90.432">G</text>
-      <text x="133.718" y="91.105">C</text>
-      <text x="123.111" y="80.498">A</text>
-      <text x="123.784" y="65.513">G</text>
-      <text x="124.457" y="50.528">U</text>
-      <text x="125.130" y="35.543">C</text>
-      <text x="125.803" y="20.559">C</text>
-      <text x="126.476" y="5.574">U</text>
-      <text x="127.149" y="-9.411">U</text>
-      <text x="130.202" y="-28.551">A</text>
-    </g>
-  </g>
-</svg>