diff --git a/tools/taxonkit/.shed.yml b/tools/taxonkit/.shed.yml
index 8ddf73e7d03..a4ccca33a25 100644
--- a/tools/taxonkit/.shed.yml
+++ b/tools/taxonkit/.shed.yml
@@ -16,3 +16,4 @@ suite:
   description: "A suite of tools that brings the TaxonKit project into Galaxy."
   long_description: |
       TaxonKit is a set of tools for analyzing and manipulating taxonomic data, including converting metagenomic profile tables to CAMI format.
+
diff --git a/tools/taxonkit/macros.xml b/tools/taxonkit/macros.xml
index baef09e806b..aba5358ba92 100644
--- a/tools/taxonkit/macros.xml
+++ b/tools/taxonkit/macros.xml
@@ -1,4 +1,4 @@
- <macros>
+<macros>
     <xml name="requirements">
         <requirements>
             <requirement type="package" version="@TOOL_VERSION@">taxonkit</requirement>
diff --git a/tools/taxonkit/taxonkit_name2taxid.xml b/tools/taxonkit/taxonkit_name2taxid.xml
new file mode 100644
index 00000000000..b69ebd240e0
--- /dev/null
+++ b/tools/taxonkit/taxonkit_name2taxid.xml
@@ -0,0 +1,134 @@
+<tool id="name2taxid" name="Name2taxid" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
+    <description>Convert taxon names to NCBI Taxids</description>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="biotools"/>
+    <expand macro="requirements"/>
+    <command detect_errors="exit_code">
+    <![CDATA[
+
+        mkdir -p ../home/.taxonkit &&
+
+        #if $data.is_select == 'history':
+            ln -s '$taxdump' 'taxdump.tar.gz' &&
+            tar -xf 'taxdump.tar.gz' -C '.' &&
+        #else:
+            ln -s '$ncbi.fields.path/names.dmp' 'names.dmp' &&
+            ln -s '$ncbi.fields.path/merged.dmp' 'merged.dmp' &&
+            ln -s '$ncbi.fields.path/nodes.dmp' 'nodes.dmp' &&
+            ln -s '$ncbi.fields.path/delnodes.dmp' 'delnodes.dmp' &&
+        #end if
+
+        taxonkit name2taxid
+        --data-dir '.'
+        --name-field '$name_field'
+        $sci_name
+        $show_rank
+        '$input'
+        > '$output'
+    ]]>
+    </command>
+    <inputs>
+        <param name="input" type="data" format="tabular" label="Input file" help="Input any tsv file where the NCBI names are written. You can also use a .txt but only one name per row!"/>
+        <param argument="--name-field" type="data_column" data_ref="input" label="Select column with the names" help="Select the column where the name is written"/>
+        <param argument="--sci-name" type="boolean" falsevalue="" truevalue="--sci-name" checked="false" label="Only searching scientific names" help="With this option a non-scientific name will not yield any taxid since the tool will ignore them in the search. NOTE: The non-scientific names will still be in the output without taxid! "/>
+        <param argument="--show-rank" type="boolean" falsevalue="" truevalue="--show-rank" checked="false" label="Show rank" help="Use this option to yield the rank of the name in the output. For an example look at the help section!"/>
+        <conditional name="data">
+            <param name="is_select" type="select" label="Use either a cached NCBI database or provide a downloaded version.">
+                <option value="cached">Cached database</option>
+                <option value="history">History</option>
+            </param>
+            <when value="cached">
+                <param name="ncbi" type="select" label="NCBI database" help="Choose NCBI database version">
+                    <options from_data_table="ncbi_taxonomy">
+                        <validator message="No NCBI database is available" type="no_options"/>
+                    </options>
+                </param>
+            </when>
+            <when value="history">
+                <param name="taxdump" type="data" format="tgz" label="Input the taxdump.tar.gz file"
+                    help="You can find the taxdum.tar.gz at ftp://ftp.ncbi.nih.gov/pub/taxonomy/taxdump.tar.gz"/>
+            </when>
+        </conditional>
+    </inputs>
+    <outputs>
+        <data name="output" format="tabular" label="Names2taxID"/>
+    </outputs>
+    <tests>
+        <test>
+            <param name="input" value="name2taxid_test1.tsv" ftype="tabular"/>
+            <param name="name_field" value="1"/>
+            <param name="sci_name" value="True"/>
+            <conditional name="data">
+                <param name="is_select" value="cached"/>
+                <param name="ncbi" value="test-db-tox"/>
+            </conditional>
+            <output name="output" file="name2taxid_result1.tsv"/>
+        </test>
+        <test>
+            <param name="input" value="name2taxid_test2.tsv" ftype="tabular"/>
+            <param name="show_rank" value="True"/>
+            <conditional name="data">
+                <param name="is_select" value="cached"/>
+                <param name="ncbi" value="test-db-tox"/>
+            </conditional>
+            <param name="name_field" value="2"/>
+            <output name="output" file="name2taxid_result2.tsv"/>
+        </test>
+        <test>
+            <param name="input" value="name2taxid_test3.txt" ftype="tabular"/>
+            <param name="name_field" value="1"/>
+            <conditional name="data">
+                <param name="is_select" value="history"/>
+                <param name="taxdump" ftype="tgz" value="test.tar.gz"/>
+             </conditional>
+            <output name="output" file="name2taxid_result3.tsv"/>
+        </test>
+    </tests>
+    <help>
+    <![CDATA[
+
+        This tool can convert a NCBI name to its corresponding taxid. Input a tsv or txt file and state the column where the name are written
+        
+        .. class:: infomark
+        
+        Example
+        
+        ::
+        
+            Homo sapiens
+            Akkermansia muciniphila ATCC BAA-835
+            Akkermansia muciniphila 
+            Mouse Intracisternal A-particle 
+        
+        **sci_name option**
+        .. class:: infomark
+        
+        For example, the name "Enterococcus coli" is not a scientific name which means with this option you can remove it from the query to find a taxid to it but it will still be in the output. In contrast, for example, Drosophila is a scientific name which means that this will always be searched in the query even if the option is on or off.
+        
+        **show_rank option**
+        ..class:: infomark
+        
+        Here is an example of the output if you use the option:
+        
+        ::
+        
+            Homo sapiens    9606    species
+            Akkermansia muciniphila ATCC BAA-835    349741    strain
+            Akkermansia muciniphila    239935    species
+            Mouse Intracisternal A-particle    11932    species
+        
+        without this option the output will be:
+        
+        ::
+        
+            Homo sapiens    9606
+            Akkermansia muciniphila ATCC BAA-835    349741
+            Akkermansia muciniphila    239935
+            Mouse Intracisternal A-particle    11932
+        
+    ]]>
+    </help>
+    <expand macro="citations"/>
+</tool>
diff --git a/tools/taxonkit/test-data/name2taxid_result1.tsv b/tools/taxonkit/test-data/name2taxid_result1.tsv
new file mode 100644
index 00000000000..6e916a65215
--- /dev/null
+++ b/tools/taxonkit/test-data/name2taxid_result1.tsv
@@ -0,0 +1,5 @@
+Homo sapiens	9606
+Akkermansia muciniphila ATCC BAA-835	349741
+Akkermansia muciniphila	239935
+Mouse Intracisternal A-particle	11932
+Enterococcus coli	
diff --git a/tools/taxonkit/test-data/name2taxid_result2.tsv b/tools/taxonkit/test-data/name2taxid_result2.tsv
new file mode 100644
index 00000000000..ff1ebcc11b3
--- /dev/null
+++ b/tools/taxonkit/test-data/name2taxid_result2.tsv
@@ -0,0 +1,4 @@
+test	Homo sapiens	9606	
+test	Akkermansia muciniphila ATCC BAA-835	349741	
+test	Akkermansia muciniphila	239935	
+test	Mouse Intracisternal A-particle	11932	
diff --git a/tools/taxonkit/test-data/name2taxid_result3.tsv b/tools/taxonkit/test-data/name2taxid_result3.tsv
new file mode 100644
index 00000000000..61ab5ecfe83
--- /dev/null
+++ b/tools/taxonkit/test-data/name2taxid_result3.tsv
@@ -0,0 +1,4 @@
+Drosophila	7215
+Drosophila	32281
+Drosophila	2081351
+Enterococcus coli	562
diff --git a/tools/taxonkit/test-data/name2taxid_test1.tsv b/tools/taxonkit/test-data/name2taxid_test1.tsv
new file mode 100644
index 00000000000..2c2e4fd882e
--- /dev/null
+++ b/tools/taxonkit/test-data/name2taxid_test1.tsv
@@ -0,0 +1,5 @@
+Homo sapiens
+Akkermansia muciniphila ATCC BAA-835
+Akkermansia muciniphila 
+Mouse Intracisternal A-particle
+Enterococcus coli
\ No newline at end of file
diff --git a/tools/taxonkit/test-data/name2taxid_test2.tsv b/tools/taxonkit/test-data/name2taxid_test2.tsv
new file mode 100644
index 00000000000..c378206f146
--- /dev/null
+++ b/tools/taxonkit/test-data/name2taxid_test2.tsv
@@ -0,0 +1,4 @@
+test	Homo sapiens
+test	Akkermansia muciniphila ATCC BAA-835
+test	Akkermansia muciniphila 
+test	Mouse Intracisternal A-particle 
\ No newline at end of file
diff --git a/tools/taxonkit/test-data/name2taxid_test3.txt b/tools/taxonkit/test-data/name2taxid_test3.txt
new file mode 100644
index 00000000000..d8e017c10bd
--- /dev/null
+++ b/tools/taxonkit/test-data/name2taxid_test3.txt
@@ -0,0 +1,2 @@
+Drosophila
+Enterococcus coli
\ No newline at end of file
diff --git a/tools/taxonkit/test-data/ncbi_taxonomy.loc.test b/tools/taxonkit/test-data/ncbi_taxonomy.loc.test
index 96b1a97157b..b7cab17fa48 100644
--- a/tools/taxonkit/test-data/ncbi_taxonomy.loc.test
+++ b/tools/taxonkit/test-data/ncbi_taxonomy.loc.test
@@ -1 +1,2 @@
+#value	name	path
 test-db-tox	Test Database	${__HERE__}/test-db
\ No newline at end of file
diff --git a/tools/taxonkit/test-data/test-db/delnodes.dmp b/tools/taxonkit/test-data/test-db/delnodes.dmp
index 160d77989c9..2d71522cab5 100644
--- a/tools/taxonkit/test-data/test-db/delnodes.dmp
+++ b/tools/taxonkit/test-data/test-db/delnodes.dmp
@@ -14997,4 +14997,4 @@
 2900873	|
 2900872	|
 2900871	|
-2900870	|
+2900870	|
\ No newline at end of file
diff --git a/tools/taxonkit/test-data/test-db/names.dmp b/tools/taxonkit/test-data/test-db/names.dmp
index 66d2ba0cd69..4e04028e50f 100644
--- a/tools/taxonkit/test-data/test-db/names.dmp
+++ b/tools/taxonkit/test-data/test-db/names.dmp
@@ -72,4 +72,31 @@
 1	|	root	|		|	scientific name	|
 131567	|	biota	|		|	synonym	|
 131567	|	cellular organisms	|		|	scientific name	|
-
+7215	|	Drosophila	|	Drosophila <flies,genus>	|	scientific name	|
+7215	|	Drosophila Fallen, 1823	|		|	authority	|
+7215	|	fruit flies	|	fruit flies <Drosophila>	|	genbank common name	|
+7215	|	fruit fly	|	fruit fly <Drosophila>	|	common name	|
+32281	|	Drosophila (Drosophila) Fallen, 1823	|		|	authority	|
+32281	|	Drosophila	|	Drosophila <flies,subgenus>	|	scientific name	|
+32281	|	Drosophila (Drosophila)	|		|	includes	|
+9606	|	Homo sapiens Linnaeus, 1758	|		|	authority	|
+9606	|	Homo sapiens	|		|	scientific name	|
+9606	|	human	|		|	genbank common name	|
+349741	|	Akkermansia muciniphila ATCC BAA-835	|		|	scientific name	|
+349741	|	Akkermansia muciniphila Muc	|		|	synonym	|
+349741	|	Akkermansia muciniphila strain ATCC BAA-835	|		|	equivalent name	|
+349741	|	Akkermansia muciniphila str. ATCC BAA-835	|		|	equivalent name	|
+349741	|	Akkermansia sp. Muc	|		|	synonym	|
+239935	|	Akkermansia muciniphila Derrien et al. 2004 emend. Hahnke et al. 2016	|		|	authority	|
+239935	|	Akkermansia muciniphila	|		|	scientific name	|
+239935	|	Akkermansia sp. YL44	|		|	includes	|
+239935	|	ATCC BAA-835	|	ATCC BAA-835 <type strain>	|	type material	|
+239935	|	CIP 107961	|	CIP 107961 <type strain>	|	type material	|
+239935	|	culture-collection:ATCC:BAA:835	|	culture-collection:ATCC:BAA:835 <type strain>	|	type material	|
+239935	|	DSM 22959	|	DSM 22959 <type strain>	|	type material	|
+239935	|	strain Muc	|	strain Muc <type strain>	|	type material	|
+11932	|	Mouse Intracisternal A-particle (IAP-MIAE)	|		|	equivalent name	|
+11932	|	Mouse intracisternal A-particle MIAE	|		|	equivalent name	|
+11932	|	Mouse Intracisternal A-particle	|		|	scientific name	|
+2081351	|	Drosophila	|	Drosophila <basidiomycete fungi>	|	scientific name	|
+2081351	|	Drosophila Quel., 1886	|		|	authority	|
diff --git a/tools/taxonkit/test-data/test.tar.gz b/tools/taxonkit/test-data/test.tar.gz
new file mode 100644
index 00000000000..b2b6d8d7385
Binary files /dev/null and b/tools/taxonkit/test-data/test.tar.gz differ
diff --git a/tools/taxonkit/tool-data/ncbi_taxonomy.loc.sample b/tools/taxonkit/tool-data/ncbi_taxonomy.loc.sample
index 06122b26d76..af1cb20ddeb 100644
--- a/tools/taxonkit/tool-data/ncbi_taxonomy.loc.sample
+++ b/tools/taxonkit/tool-data/ncbi_taxonomy.loc.sample
@@ -1,2 +1,2 @@
 #value	name	path
-# test-db-tox	"Test Database"  tool-data/test-db
\ No newline at end of file
+test-db-tox	"Test Database"  ${__HERE__}/test-db
diff --git a/tools/taxonkit/tool_data_table_conf.xml.sample b/tools/taxonkit/tool_data_table_conf.xml.sample
index 870002aff72..4fbb2818acb 100644
--- a/tools/taxonkit/tool_data_table_conf.xml.sample
+++ b/tools/taxonkit/tool_data_table_conf.xml.sample
@@ -3,6 +3,6 @@
         <!-- Locations of taxonomy data downloaded from NCBI -->
     <table name="ncbi_taxonomy" comment_char="#">
         <columns>value, name, path</columns>
-        <file path="tool-data/ncbi_taxonomy.loc" />
+        <file path="${__HERE__}/test-data/ncbi_taxonomy.loc.test" />
     </table>
 </tables>