diff --git a/packages/tool_util/tests/sample_data.py b/packages/tool_util/tests/sample_data.py
new file mode 120000
index 00000000000..dc903e91c44
--- /dev/null
+++ b/packages/tool_util/tests/sample_data.py
@@ -0,0 +1 @@
+../../../test/unit/unittest_utils/sample_data.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/test_conda_resolution.py b/packages/tool_util/tests/test_conda_resolution.py
index 645faad4496..ad0efe1c3b9 120000
--- a/packages/tool_util/tests/test_conda_resolution.py
+++ b/packages/tool_util/tests/test_conda_resolution.py
@@ -1 +1 @@
-../../../test/unit/tools/test_conda_resolution.py
\ No newline at end of file
+../../../test/unit/tool_util/test_conda_resolution.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/test_output_checker.py b/packages/tool_util/tests/test_output_checker.py
index 2a54b77ca94..9d5d6522f67 120000
--- a/packages/tool_util/tests/test_output_checker.py
+++ b/packages/tool_util/tests/test_output_checker.py
@@ -1 +1 @@
-../../../test/unit/tools/test_output_checker.py
\ No newline at end of file
+../../../test/unit/tool_util/test_output_checker.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/test_parsing.py b/packages/tool_util/tests/test_parsing.py
index b21638588e4..c2ed25042dd 120000
--- a/packages/tool_util/tests/test_parsing.py
+++ b/packages/tool_util/tests/test_parsing.py
@@ -1 +1 @@
-../../../test/unit/tools/test_parsing.py
\ No newline at end of file
+../../../test/unit/tool_util/test_parsing.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/test_tool_deps.py b/packages/tool_util/tests/test_tool_deps.py
index 34701999330..0c3f256d878 120000
--- a/packages/tool_util/tests/test_tool_deps.py
+++ b/packages/tool_util/tests/test_tool_deps.py
@@ -1 +1 @@
-../../../test/unit/tools/test_tool_deps.py
\ No newline at end of file
+../../../test/unit/tool_util/test_tool_deps.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/test_tool_loader.py b/packages/tool_util/tests/test_tool_loader.py
index 572b75ae0a5..fb88b8ae6c5 120000
--- a/packages/tool_util/tests/test_tool_loader.py
+++ b/packages/tool_util/tests/test_tool_loader.py
@@ -1 +1 @@
-../../../test/unit/tools/test_tool_loader.py
\ No newline at end of file
+../../../test/unit/tool_util/test_tool_loader.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/test_util.py b/packages/tool_util/tests/test_util.py
new file mode 120000
index 00000000000..e6343216e6f
--- /dev/null
+++ b/packages/tool_util/tests/test_util.py
@@ -0,0 +1 @@
+../../../test/unit/tool_util/test_util.py
\ No newline at end of file
diff --git a/packages/tool_util/tests/util.py b/packages/tool_util/tests/util.py
index 9469bc59223..f757327f2d9 120000
--- a/packages/tool_util/tests/util.py
+++ b/packages/tool_util/tests/util.py
@@ -1 +1 @@
-../../../test/unit/tools/util.py
\ No newline at end of file
+../../../test/unit/tool_util/util.py
\ No newline at end of file
diff --git a/test/unit/tool_util/__init__.py b/test/unit/tool_util/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/unit/tool_util/sample_data.py b/test/unit/tool_util/sample_data.py
new file mode 120000
index 00000000000..3b4ed484f80
--- /dev/null
+++ b/test/unit/tool_util/sample_data.py
@@ -0,0 +1 @@
+../unittest_utils/sample_data.py
\ No newline at end of file
diff --git a/test/unit/tools/test_conda_resolution.py b/test/unit/tool_util/test_conda_resolution.py
similarity index 100%
rename from test/unit/tools/test_conda_resolution.py
rename to test/unit/tool_util/test_conda_resolution.py
diff --git a/test/unit/tools/test_output_checker.py b/test/unit/tool_util/test_output_checker.py
similarity index 100%
rename from test/unit/tools/test_output_checker.py
rename to test/unit/tool_util/test_output_checker.py
diff --git a/test/unit/tools/test_parsing.py b/test/unit/tool_util/test_parsing.py
similarity index 100%
rename from test/unit/tools/test_parsing.py
rename to test/unit/tool_util/test_parsing.py
diff --git a/test/unit/tools/test_tool_deps.py b/test/unit/tool_util/test_tool_deps.py
similarity index 100%
rename from test/unit/tools/test_tool_deps.py
rename to test/unit/tool_util/test_tool_deps.py
diff --git a/test/unit/tools/test_tool_loader.py b/test/unit/tool_util/test_tool_loader.py
similarity index 94%
rename from test/unit/tools/test_tool_loader.py
rename to test/unit/tool_util/test_tool_loader.py
index f07c1e8c2b5..dde14997ec4 100644
--- a/test/unit/tools/test_tool_loader.py
+++ b/test/unit/tool_util/test_tool_loader.py
@@ -1,27 +1,10 @@
 import os
 from shutil import rmtree
-from string import Template
 from tempfile import mkdtemp
 
 from galaxy.tool_util.loader import load_tool, template_macro_params
 from galaxy.util import parse_xml
-
-
-SIMPLE_TOOL_WITH_MACRO = """<tool id="tool_with_macro" name="macro_annotation" version="@WRAPPER_VERSION@">
-    <expand macro="inputs" />
-    <macros>
-        <import>external.xml</import>
-    </macros>
-</tool>"""
-
-SIMPLE_MACRO = Template("""
-<macros>
-    <token name="@WRAPPER_VERSION@">$tool_version</token>
-    <macro name="inputs">
-        <inputs/>
-    </macro>
-</macros>
-""")
+from .sample_data import SIMPLE_TOOL_WITH_MACRO, SIMPLE_MACRO
 
 
 def test_loader():
diff --git a/test/unit/tools/test_util.py b/test/unit/tool_util/test_util.py
similarity index 100%
rename from test/unit/tools/test_util.py
rename to test/unit/tool_util/test_util.py
diff --git a/test/unit/tools/util.py b/test/unit/tool_util/util.py
similarity index 100%
rename from test/unit/tools/util.py
rename to test/unit/tool_util/util.py
diff --git a/test/unit/tools/test_toolbox.py b/test/unit/tools/test_toolbox.py
index e592f8e43d2..5c892ac843d 100644
--- a/test/unit/tools/test_toolbox.py
+++ b/test/unit/tools/test_toolbox.py
@@ -14,12 +14,9 @@ from galaxy.model import tool_shed_install
 from galaxy.model.tool_shed_install import mapping
 from galaxy.tools import ToolBox
 from galaxy.tools.cache import ToolCache
-from .test_tool_loader import (
-    SIMPLE_MACRO,
-    SIMPLE_TOOL_WITH_MACRO
-)
 from .test_toolbox_filters import mock_trans
 from ..tools_support import UsesApp, UsesTools
+from ..unittest_utils.sample_data import SIMPLE_TOOL_WITH_MACRO, SIMPLE_MACRO
 
 log = logging.getLogger(__name__)
 
diff --git a/test/unit/unittest_utils/sample_data.py b/test/unit/unittest_utils/sample_data.py
new file mode 100644
index 00000000000..dc0bcb02093
--- /dev/null
+++ b/test/unit/unittest_utils/sample_data.py
@@ -0,0 +1,17 @@
+from string import Template
+
+SIMPLE_TOOL_WITH_MACRO = """<tool id="tool_with_macro" name="macro_annotation" version="@WRAPPER_VERSION@">
+    <expand macro="inputs" />
+    <macros>
+        <import>external.xml</import>
+    </macros>
+</tool>"""
+
+SIMPLE_MACRO = Template("""
+<macros>
+    <token name="@WRAPPER_VERSION@">$tool_version</token>
+    <macro name="inputs">
+        <inputs/>
+    </macro>
+</macros>
+""")