diff --git a/test/functional/tools/interactive_tool_askomics.xml b/test/functional/tools/interactive_tool_askomics.xml
index 3014321a164..de9827b3eb5 100644
--- a/test/functional/tools/interactive_tool_askomics.xml
+++ b/test/functional/tools/interactive_tool_askomics.xml
@@ -4,7 +4,7 @@
         <container type="docker">quay.io/askomics/askomics-ie:17.12_g19.09</container>
     </requirements>
     <entry_points>
-        <entry_point name="AskOmics instance on $infile.display_name">
+        <entry_point name="AskOmics instance on $infile.display_name" requires_domain="True">
             <port>6543</port>
             <url>/login_api_gie?key=abcd</url>
         </entry_point>
diff --git a/test/functional/tools/interactive_tool_bam_iobio.xml b/test/functional/tools/interactive_tool_bam_iobio.xml
index a2006e5a5ee..2f1c531861c 100644
--- a/test/functional/tools/interactive_tool_bam_iobio.xml
+++ b/test/functional/tools/interactive_tool_bam_iobio.xml
@@ -3,7 +3,7 @@
         <container type="docker">qiaoy/iobio-bundle.bam-iobio:1.0-ondemand</container>
     </requirements>
     <entry_points>
-        <entry_point name="BAM io.bio visualisation of $infile.display_name">
+        <entry_point name="BAM io.bio visualisation of $infile.display_name" requires_domain="True">
             <port>80</port>
             <url><![CDATA[/?bam=http://localhost/tmp/bamfile.bam&region=1]]></url>
         </entry_point>
diff --git a/test/functional/tools/interactive_tool_cellxgene.xml b/test/functional/tools/interactive_tool_cellxgene.xml
index 0eb659681e5..546bd7ab58f 100644
--- a/test/functional/tools/interactive_tool_cellxgene.xml
+++ b/test/functional/tools/interactive_tool_cellxgene.xml
@@ -3,7 +3,7 @@
         <container type="docker">quay.io/galaxy/cellxgene-galaxy-ie:ie2</container>
     </requirements>
     <entry_points>
-        <entry_point name="Cellxgene Single Cell Visualisation on $infile.display_name">
+        <entry_point name="Cellxgene Single Cell Visualisation on $infile.display_name" requires_domain="True">
             <port>80</port>
         </entry_point>
     </entry_points>
diff --git a/test/functional/tools/interactive_tool_ethercalc.xml b/test/functional/tools/interactive_tool_ethercalc.xml
index db37831f6cd..88676c1e997 100644
--- a/test/functional/tools/interactive_tool_ethercalc.xml
+++ b/test/functional/tools/interactive_tool_ethercalc.xml
@@ -3,7 +3,7 @@
         <container type="docker">shiltemann/ethercalc-galaxy-ie:17.05</container>
     </requirements>
     <entry_points>
-        <entry_point name="EtherCalc instance on $infile.display_name">
+        <entry_point name="EtherCalc instance on $infile.display_name" requires_domain="True">
             <port>8000</port>
         </entry_point>
     </entry_points>
diff --git a/test/functional/tools/interactive_tool_hicbrowser.xml b/test/functional/tools/interactive_tool_hicbrowser.xml
index 3d50401ec5f..7aaa8a3e8e7 100644
--- a/test/functional/tools/interactive_tool_hicbrowser.xml
+++ b/test/functional/tools/interactive_tool_hicbrowser.xml
@@ -3,7 +3,7 @@
         <container type="docker">bgruening/hicbrowser</container>
     </requirements>
     <entry_points>
-        <entry_point name="HiCBrowser on $infile.display_name">
+        <entry_point name="HiCBrowser on $infile.display_name" requires_domain="True">
             <port>80</port>
         </entry_point>
     </entry_points>
diff --git a/test/functional/tools/interactive_tool_jupyter_notebook.xml b/test/functional/tools/interactive_tool_jupyter_notebook.xml
index 0891cb4c5ed..336a9a00b5a 100644
--- a/test/functional/tools/interactive_tool_jupyter_notebook.xml
+++ b/test/functional/tools/interactive_tool_jupyter_notebook.xml
@@ -3,7 +3,7 @@
         <container type="docker">quay.io/bgruening/docker-jupyter-notebook:ie2</container>
     </requirements>
     <entry_points>
-        <entry_point name="Jupyter Interactive Tool">
+        <entry_point name="Jupyter Interactive Tool" requires_domain="True">
             <port>8888</port>
             <url>ipython/tree</url>
         </entry_point>
diff --git a/test/functional/tools/interactive_tool_neo4j.xml b/test/functional/tools/interactive_tool_neo4j.xml
index d1e21dec82a..0b31a8b303e 100644
--- a/test/functional/tools/interactive_tool_neo4j.xml
+++ b/test/functional/tools/interactive_tool_neo4j.xml
@@ -3,7 +3,7 @@
         <container type="docker">quay.io/sanbi-sa/neo_ie:3.1.9</container>
     </requirements>
     <entry_points>
-        <entry_point name="Neo4j on $infile.display_name">
+        <entry_point name="Neo4j on $infile.display_name" requires_domain="True">
             <port>80</port>
         </entry_point>
         <!-- I get some web-socket error that 7687 is not reachable. 
diff --git a/test/functional/tools/interactive_tool_phinch.xml b/test/functional/tools/interactive_tool_phinch.xml
index e7c6706be5f..d77c9274ad3 100644
--- a/test/functional/tools/interactive_tool_phinch.xml
+++ b/test/functional/tools/interactive_tool_phinch.xml
@@ -3,7 +3,7 @@
         <container type="docker">shiltemann/docker-phinch-galaxy:16.04</container>
     </requirements>
     <entry_points>
-        <entry_point name="Phinch Visualisation of $infile.display_name">
+        <entry_point name="Phinch Visualisation of $infile.display_name" requires_domain="True">
             <port>80</port>
         </entry_point>
     </entry_points>
diff --git a/test/functional/tools/interactive_tool_simple.xml b/test/functional/tools/interactive_tool_simple.xml
index 9c6c48b9059..766af72dce1 100644
--- a/test/functional/tools/interactive_tool_simple.xml
+++ b/test/functional/tools/interactive_tool_simple.xml
@@ -1,9 +1,9 @@
-<tool id="realtimetool_simple" name="realtimetool_simple" tool_type="interactive" version="0.1">
+<tool id="interactive_tool_simple" name="realtimetool_simple" tool_type="interactive" version="0.1">
     <requirements>
         <container type="docker">galaxy/test-http-example:0.1</container>
     </requirements>
     <entry_points>
-        <entry_point name="Simple">
+        <entry_point name="Simple" requires_domain="True">
             <port>7000</port>
             <url>/</url>
         </entry_point>
diff --git a/test/functional/tools/interactive_tool_two_entry_points.xml b/test/functional/tools/interactive_tool_two_entry_points.xml
index dc45d9caa86..1af1efe6f65 100644
--- a/test/functional/tools/interactive_tool_two_entry_points.xml
+++ b/test/functional/tools/interactive_tool_two_entry_points.xml
@@ -1,13 +1,13 @@
-<tool id="realtimetool_two_entry_points" name="realtimetool_two_entry_points" tool_type="interactive" version="0.1">
+<tool id="interactive_tool_two_entry_points" name="realtimetool_two_entry_points" tool_type="interactive" version="0.1">
     <requirements>
         <container type="docker">galaxy/test-http-example:0.1</container>
     </requirements>
     <entry_points>
-        <entry_point name="Server 1">
+        <entry_point name="Server 1" requires_domain="True">
             <port>7000</port>
             <url>/</url>
         </entry_point>
-        <entry_point name="Server 2">
+        <entry_point name="Server 2" requires_domain="True">
             <port>7001</port>
             <url>/</url>
         </entry_point>
diff --git a/test/functional/tools/realtimetool_ethercalc.xml b/test/functional/tools/realtimetool_ethercalc.xml
index 387e931e405..9e592534126 100644
--- a/test/functional/tools/realtimetool_ethercalc.xml
+++ b/test/functional/tools/realtimetool_ethercalc.xml
@@ -3,7 +3,7 @@
         <container type="docker">shiltemann/ethercalc-galaxy-ie:17.05</container>
     </requirements>
     <entry_points>
-        <entry_point name="ethercalc">
+        <entry_point name="ethercalc" requires_domain="True">
             <port>8000</port>
         </entry_point>
     </entry_points>