diff --git a/magnum/tests/unit/conductor/test_template_definition.py b/magnum/tests/unit/conductor/test_template_definition.py
index 07746bc71d..878f7f4fe8 100644
--- a/magnum/tests/unit/conductor/test_template_definition.py
+++ b/magnum/tests/unit/conductor/test_template_definition.py
@@ -107,6 +107,38 @@ class TemplateDefinitionTestCase(base.TestCase):
         self.assertRaises(exception.RequiredParameterNotProvided,
                           param.set_param, {}, mock_baymodel, None)
 
+    def test_output_mapping(self):
+        heat_outputs = [
+            {
+                "output_value": "value1",
+                "description": "No description given",
+                "output_key": "key1"
+            },
+            {
+                "output_value": ["value2", "value3"],
+                "description": "No description given",
+                "output_key": "key2"
+            }
+        ]
+
+        mock_stack = mock.MagicMock()
+        mock_stack.outputs = heat_outputs
+
+        output = tdef.OutputMapping('key1')
+        value = output.get_output_value(mock_stack)
+        self.assertEqual(value, 'value1')
+
+        output = tdef.OutputMapping('key2')
+        value = output.get_output_value(mock_stack)
+        self.assertEqual(value, ["value2", "value3"])
+
+        output = tdef.OutputMapping('key3')
+        value = output.get_output_value(mock_stack)
+        self.assertIsNone(value)
+
+
+class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
+
     @mock.patch('magnum.conductor.template_definition.BaseTemplateDefinition'
                 '.get_params')
     @mock.patch('magnum.conductor.template_definition.TemplateDefinition'
@@ -129,6 +161,9 @@ class TemplateDefinitionTestCase(base.TestCase):
         mock_get_params.assert_called_once_with(mock_context, mock_baymodel,
                                                 mock_bay, **expected_kwargs)
 
+
+class AtomicSwarmTemplateDefinitionTestCase(base.TestCase):
+
     @mock.patch('requests.post')
     def test_swarm_discovery_url_public_token(self, mock_post):
 
@@ -186,32 +221,3 @@ class TemplateDefinitionTestCase(base.TestCase):
         actual_url = swarm_def.get_discovery_url(mock_bay)
 
         self.assertEqual(mock_bay.discovery_url, actual_url)
-
-    def test_output_mapping(self):
-        heat_outputs = [
-            {
-                "output_value": "value1",
-                "description": "No description given",
-                "output_key": "key1"
-            },
-            {
-                "output_value": ["value2", "value3"],
-                "description": "No description given",
-                "output_key": "key2"
-            }
-        ]
-
-        mock_stack = mock.MagicMock()
-        mock_stack.outputs = heat_outputs
-
-        output = tdef.OutputMapping('key1')
-        value = output.get_output_value(mock_stack)
-        self.assertEqual(value, 'value1')
-
-        output = tdef.OutputMapping('key2')
-        value = output.get_output_value(mock_stack)
-        self.assertEqual(value, ["value2", "value3"])
-
-        output = tdef.OutputMapping('key3')
-        value = output.get_output_value(mock_stack)
-        self.assertIsNone(value)