diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/conftest.py b/tests/conftest.py
index ad94eecc3..5b663bdfd 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -183,3 +183,42 @@ def dse_tr(slurm_system: SlurmSystem) -> TestRun:
     tr = TestRun(name="dse", test=test_definition, num_nodes=1, nodes=["node1"], iterations=12)
     create_test_directories(slurm_system, tr)
     return tr
+
+
+@pytest.fixture
+def nccl_tr(tmp_path: Path) -> TestRun:
+    test = NCCLTestDefinition(
+        name="nccl",
+        description="desc",
+        test_template_name="t",
+        cmd_args=NCCLCmdArgs(docker_image_url="fake://url/nccl"),
+    )
+    tr = TestRun(name="nccl_test", test=test, num_nodes=2, nodes=[], output_path=tmp_path)
+
+    stdout_content = """# Rank  0 Group  0 Pid 1000 on node1 device  0 [0xaa] NVIDIA H100
+# Rank  1 Group  0 Pid 1001 on node1 device  1 [0xbb] NVIDIA H100
+# Rank  2 Group  0 Pid 1002 on node1 device  2 [0xcc] NVIDIA H100
+# Rank  3 Group  0 Pid 1003 on node1 device  3 [0xdd] NVIDIA H100
+# Rank  4 Group  0 Pid 1004 on node1 device  4 [0xee] NVIDIA H100
+# Rank  5 Group  0 Pid 1005 on node1 device  5 [0xff] NVIDIA H100
+# Rank  6 Group  0 Pid 1006 on node1 device  6 [0x11] NVIDIA H100
+# Rank  7 Group  0 Pid 1007 on node1 device  7 [0x22] NVIDIA H100
+# Rank  8 Group  0 Pid 2000 on node2 device  0 [0xaa] NVIDIA H100
+# Rank  9 Group  0 Pid 2001 on node2 device  1 [0xbb] NVIDIA H100
+# Rank 10 Group  0 Pid 2002 on node2 device  2 [0xcc] NVIDIA H100
+# Rank 11 Group  0 Pid 2003 on node2 device  3 [0xdd] NVIDIA H100
+# Rank 12 Group  0 Pid 2004 on node2 device  4 [0xee] NVIDIA H100
+# Rank 13 Group  0 Pid 2005 on node2 device  5 [0xff] NVIDIA H100
+# Rank 14 Group  0 Pid 2006 on node2 device  6 [0x11] NVIDIA H100
+# Rank 15 Group  0 Pid 2007 on node2 device  7 [0x22] NVIDIA H100
+#
+#                                                              out-of-place                       in-place
+#       size         count      type   redop    root     time   algbw   busbw #wrong     time   algbw   busbw #wrong
+     1000000       1000000     float     sum      -1    1.11   10.10   20.20      0    1.12   10.11   20.21      0
+     2000000       2000000     float     sum      -1    2.22   20.20   30.30      0    2.23   20.21   30.31      0
+     12000000      12000000     float     sum      -1   13.13  120.30  130.40      0   13.14  120.31  130.41      0
+# Avg bus bandwidth    : 111.111
+"""
+    (tr.output_path / "stdout.txt").write_text(stdout_content)
+
+    return tr
diff --git a/tests/report_generation_strategy/__init__.py b/tests/report_generation_strategy/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/report_generation_strategy/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/report_generation_strategy/conftest.py b/tests/report_generation_strategy/conftest.py
deleted file mode 100644
index b397c0534..000000000
--- a/tests/report_generation_strategy/conftest.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from pathlib import Path
-
-import pytest
-
-from cloudai import TestRun
-from cloudai.workloads.nccl_test import NCCLCmdArgs, NCCLTestDefinition
-
-
-@pytest.fixture
-def nccl_tr(tmp_path: Path) -> TestRun:
-    test = NCCLTestDefinition(
-        name="nccl",
-        description="desc",
-        test_template_name="t",
-        cmd_args=NCCLCmdArgs(docker_image_url="fake://url/nccl"),
-    )
-    tr = TestRun(name="nccl_test", test=test, num_nodes=2, nodes=[], output_path=tmp_path)
-
-    stdout_content = """# Rank  0 Group  0 Pid 1000 on node1 device  0 [0xaa] NVIDIA H100
-# Rank  1 Group  0 Pid 1001 on node1 device  1 [0xbb] NVIDIA H100
-# Rank  2 Group  0 Pid 1002 on node1 device  2 [0xcc] NVIDIA H100
-# Rank  3 Group  0 Pid 1003 on node1 device  3 [0xdd] NVIDIA H100
-# Rank  4 Group  0 Pid 1004 on node1 device  4 [0xee] NVIDIA H100
-# Rank  5 Group  0 Pid 1005 on node1 device  5 [0xff] NVIDIA H100
-# Rank  6 Group  0 Pid 1006 on node1 device  6 [0x11] NVIDIA H100
-# Rank  7 Group  0 Pid 1007 on node1 device  7 [0x22] NVIDIA H100
-# Rank  8 Group  0 Pid 2000 on node2 device  0 [0xaa] NVIDIA H100
-# Rank  9 Group  0 Pid 2001 on node2 device  1 [0xbb] NVIDIA H100
-# Rank 10 Group  0 Pid 2002 on node2 device  2 [0xcc] NVIDIA H100
-# Rank 11 Group  0 Pid 2003 on node2 device  3 [0xdd] NVIDIA H100
-# Rank 12 Group  0 Pid 2004 on node2 device  4 [0xee] NVIDIA H100
-# Rank 13 Group  0 Pid 2005 on node2 device  5 [0xff] NVIDIA H100
-# Rank 14 Group  0 Pid 2006 on node2 device  6 [0x11] NVIDIA H100
-# Rank 15 Group  0 Pid 2007 on node2 device  7 [0x22] NVIDIA H100
-#
-#                                                              out-of-place                       in-place
-#       size         count      type   redop    root     time   algbw   busbw #wrong     time   algbw   busbw #wrong
-     1000000       1000000     float     sum      -1    1.11   10.10   20.20      0    1.12   10.11   20.21      0
-     2000000       2000000     float     sum      -1    2.22   20.20   30.30      0    2.23   20.21   30.31      0
-     12000000      12000000     float     sum      -1   13.13  120.30  130.40      0   13.14  120.31  130.41      0
-# Avg bus bandwidth    : 111.111
-"""
-    (tr.output_path / "stdout.txt").write_text(stdout_content)
-
-    return tr
diff --git a/tests/systems/__init__.py b/tests/systems/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/systems/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/systems/kubernetes/__init__.py b/tests/systems/kubernetes/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/systems/kubernetes/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/json_gen_strategy/test_common_kubernetes.py b/tests/systems/kubernetes/test_common.py
similarity index 100%
rename from tests/json_gen_strategy/test_common_kubernetes.py
rename to tests/systems/kubernetes/test_common.py
diff --git a/tests/test_kubernetes_system.py b/tests/systems/kubernetes/test_system.py
similarity index 99%
rename from tests/test_kubernetes_system.py
rename to tests/systems/kubernetes/test_system.py
index e63537255..37879604b 100644
--- a/tests/test_kubernetes_system.py
+++ b/tests/systems/kubernetes/test_system.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/systems/lsf/__init__.py b/tests/systems/lsf/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/systems/lsf/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/test_lsf_system.py b/tests/systems/lsf/test_system.py
similarity index 97%
rename from tests/test_lsf_system.py
rename to tests/systems/lsf/test_system.py
index b7a48928f..717d2fbe8 100644
--- a/tests/test_lsf_system.py
+++ b/tests/systems/lsf/test_system.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/systems/runai/__init__.py b/tests/systems/runai/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/systems/runai/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/runai/test_runai_cluster.py b/tests/systems/runai/test_cluster.py
similarity index 97%
rename from tests/runai/test_runai_cluster.py
rename to tests/systems/runai/test_cluster.py
index f8b360783..5127b0c31 100644
--- a/tests/runai/test_runai_cluster.py
+++ b/tests/systems/runai/test_cluster.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/runai/test_runai_event.py b/tests/systems/runai/test_event.py
similarity index 97%
rename from tests/runai/test_runai_event.py
rename to tests/systems/runai/test_event.py
index e424d1a68..854f9bf8b 100644
--- a/tests/runai/test_runai_event.py
+++ b/tests/systems/runai/test_event.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/runai/test_runai_node.py b/tests/systems/runai/test_node.py
similarity index 97%
rename from tests/runai/test_runai_node.py
rename to tests/systems/runai/test_node.py
index bb35413eb..2440141a4 100644
--- a/tests/runai/test_runai_node.py
+++ b/tests/systems/runai/test_node.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/runai/test_runai_project.py b/tests/systems/runai/test_project.py
similarity index 97%
rename from tests/runai/test_runai_project.py
rename to tests/systems/runai/test_project.py
index df4dcc727..d53a028e6 100644
--- a/tests/runai/test_runai_project.py
+++ b/tests/systems/runai/test_project.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/runai/test_runai_pvc.py b/tests/systems/runai/test_pvc.py
similarity index 98%
rename from tests/runai/test_runai_pvc.py
rename to tests/systems/runai/test_pvc.py
index 96549afbf..904b844e0 100644
--- a/tests/runai/test_runai_pvc.py
+++ b/tests/systems/runai/test_pvc.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/runai/test_runai_rest_client.py b/tests/systems/runai/test_rest_client.py
similarity index 98%
rename from tests/runai/test_runai_rest_client.py
rename to tests/systems/runai/test_rest_client.py
index 515d8f790..d3c42950b 100644
--- a/tests/runai/test_runai_rest_client.py
+++ b/tests/systems/runai/test_rest_client.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/runai/test_runai_training.py b/tests/systems/runai/test_training.py
similarity index 98%
rename from tests/runai/test_runai_training.py
rename to tests/systems/runai/test_training.py
index 62a1a1682..54aba8cd7 100644
--- a/tests/runai/test_runai_training.py
+++ b/tests/systems/runai/test_training.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/systems/slurm/__init__.py b/tests/systems/slurm/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/systems/slurm/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/test_slurm_allocation.py b/tests/systems/slurm/test_allocation.py
similarity index 98%
rename from tests/test_slurm_allocation.py
rename to tests/systems/slurm/test_allocation.py
index a070d3cd0..9426f5fa5 100644
--- a/tests/test_slurm_allocation.py
+++ b/tests/systems/slurm/test_allocation.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/slurm_command_gen_strategy/test_common_slurm_command_gen_strategy.py b/tests/systems/slurm/test_command_gen_strategy.py
similarity index 100%
rename from tests/slurm_command_gen_strategy/test_common_slurm_command_gen_strategy.py
rename to tests/systems/slurm/test_command_gen_strategy.py
diff --git a/tests/test_slurm_installer.py b/tests/systems/slurm/test_installer.py
similarity index 100%
rename from tests/test_slurm_installer.py
rename to tests/systems/slurm/test_installer.py
diff --git a/tests/test_slurm_system.py b/tests/systems/slurm/test_system.py
similarity index 99%
rename from tests/test_slurm_system.py
rename to tests/systems/slurm/test_system.py
index c4ea2065f..0ad79b61f 100644
--- a/tests/test_slurm_system.py
+++ b/tests/systems/slurm/test_system.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/systems/standalone/__init__.py b/tests/systems/standalone/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/systems/standalone/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/test_standalone_installer.py b/tests/systems/standalone/test_installer.py
similarity index 93%
rename from tests/test_standalone_installer.py
rename to tests/systems/standalone/test_installer.py
index 2f692076c..53c773ccf 100644
--- a/tests/test_standalone_installer.py
+++ b/tests/systems/standalone/test_installer.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/test_standalone_system.py b/tests/systems/standalone/test_system.py
similarity index 98%
rename from tests/test_standalone_system.py
rename to tests/systems/standalone/test_system.py
index d4f153343..9dd252026 100644
--- a/tests/test_standalone_system.py
+++ b/tests/systems/standalone/test_system.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/__init__.py b/tests/workloads/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/workloads/ai_dynamo/__init__.py b/tests/workloads/ai_dynamo/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/ai_dynamo/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_ai_dynamo_slurm_command_gen_strategy.py b/tests/workloads/ai_dynamo/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_ai_dynamo_slurm_command_gen_strategy.py
rename to tests/workloads/ai_dynamo/test_command_gen_strategy_slurm.py
index 76df711b2..0ef72477d 100644
--- a/tests/slurm_command_gen_strategy/test_ai_dynamo_slurm_command_gen_strategy.py
+++ b/tests/workloads/ai_dynamo/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/json_gen_strategy/test_ai_dynamo.py b/tests/workloads/ai_dynamo/test_json_gen_strategy_kubernetes.py
similarity index 99%
rename from tests/json_gen_strategy/test_ai_dynamo.py
rename to tests/workloads/ai_dynamo/test_json_gen_strategy_kubernetes.py
index 16492a06e..1f947fce9 100644
--- a/tests/json_gen_strategy/test_ai_dynamo.py
+++ b/tests/workloads/ai_dynamo/test_json_gen_strategy_kubernetes.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_ai_dynamo_report_generation_strategy.py b/tests/workloads/ai_dynamo/test_report_gen_strategy.py
similarity index 98%
rename from tests/report_generation_strategy/test_ai_dynamo_report_generation_strategy.py
rename to tests/workloads/ai_dynamo/test_report_gen_strategy.py
index 2d2cc2cf4..a3d71923f 100644
--- a/tests/report_generation_strategy/test_ai_dynamo_report_generation_strategy.py
+++ b/tests/workloads/ai_dynamo/test_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/aiconfig/__init__.py b/tests/workloads/aiconfig/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/aiconfig/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/standalone_command_gen_strategy/test_aiconfigurator_standalone_command_gen_strategy.py b/tests/workloads/aiconfig/test_command_gen_strategy_standalone.py
similarity index 98%
rename from tests/standalone_command_gen_strategy/test_aiconfigurator_standalone_command_gen_strategy.py
rename to tests/workloads/aiconfig/test_command_gen_strategy_standalone.py
index 499fa3d8d..c4cb43877 100644
--- a/tests/standalone_command_gen_strategy/test_aiconfigurator_standalone_command_gen_strategy.py
+++ b/tests/workloads/aiconfig/test_command_gen_strategy_standalone.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/test_aiconfigurator_predictor.py b/tests/workloads/aiconfig/test_predictor.py
similarity index 98%
rename from tests/test_aiconfigurator_predictor.py
rename to tests/workloads/aiconfig/test_predictor.py
index b16feaba3..8ea51ee82 100644
--- a/tests/test_aiconfigurator_predictor.py
+++ b/tests/workloads/aiconfig/test_predictor.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_aiconfigurator_report_generation_strategy.py b/tests/workloads/aiconfig/test_report_gen_strategy.py
similarity index 98%
rename from tests/report_generation_strategy/test_aiconfigurator_report_generation_strategy.py
rename to tests/workloads/aiconfig/test_report_gen_strategy.py
index fde4985f0..b08759079 100644
--- a/tests/report_generation_strategy/test_aiconfigurator_report_generation_strategy.py
+++ b/tests/workloads/aiconfig/test_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/bash_cmd/__init__.py b/tests/workloads/bash_cmd/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/bash_cmd/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_bash_cmd_slurm_command_gen_strategy.py b/tests/workloads/bash_cmd/test_command_gen_strategy_slurm.py
similarity index 96%
rename from tests/slurm_command_gen_strategy/test_bash_cmd_slurm_command_gen_strategy.py
rename to tests/workloads/bash_cmd/test_command_gen_strategy_slurm.py
index e04d52c24..db421d05c 100644
--- a/tests/slurm_command_gen_strategy/test_bash_cmd_slurm_command_gen_strategy.py
+++ b/tests/workloads/bash_cmd/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/chakra_replay/__init__.py b/tests/workloads/chakra_replay/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/chakra_replay/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_chakra_replay_slurm_command_gen_strategy.py b/tests/workloads/chakra_replay/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_chakra_replay_slurm_command_gen_strategy.py
rename to tests/workloads/chakra_replay/test_command_gen_strategy_slurm.py
index a392badbf..36bd6ebc5 100644
--- a/tests/slurm_command_gen_strategy/test_chakra_replay_slurm_command_gen_strategy.py
+++ b/tests/workloads/chakra_replay/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/jax_toolbox/__init__.py b/tests/workloads/jax_toolbox/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/jax_toolbox/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_jax_toolbox_slurm_command_gen_strategy.py b/tests/workloads/jax_toolbox/test_command_gen_strategy_slurm.py
similarity index 99%
rename from tests/slurm_command_gen_strategy/test_jax_toolbox_slurm_command_gen_strategy.py
rename to tests/workloads/jax_toolbox/test_command_gen_strategy_slurm.py
index 1657bfce4..8d39130b7 100644
--- a/tests/slurm_command_gen_strategy/test_jax_toolbox_slurm_command_gen_strategy.py
+++ b/tests/workloads/jax_toolbox/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/job_status_retrieval_strategy/test_jax_toolbox_job_status_retrieval_strategy.py b/tests/workloads/jax_toolbox/test_job_status_retrieval_strategy.py
similarity index 99%
rename from tests/job_status_retrieval_strategy/test_jax_toolbox_job_status_retrieval_strategy.py
rename to tests/workloads/jax_toolbox/test_job_status_retrieval_strategy.py
index e8184ce49..008141422 100644
--- a/tests/job_status_retrieval_strategy/test_jax_toolbox_job_status_retrieval_strategy.py
+++ b/tests/workloads/jax_toolbox/test_job_status_retrieval_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_jax_toolbox_report_generation_strategy.py b/tests/workloads/jax_toolbox/test_report_gen_strategy.py
similarity index 97%
rename from tests/report_generation_strategy/test_jax_toolbox_report_generation_strategy.py
rename to tests/workloads/jax_toolbox/test_report_gen_strategy.py
index e31187f65..f078fbd1b 100644
--- a/tests/report_generation_strategy/test_jax_toolbox_report_generation_strategy.py
+++ b/tests/workloads/jax_toolbox/test_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/megatron_bridge/__init__.py b/tests/workloads/megatron_bridge/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/megatron_bridge/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_megatron_bridge_slurm_command_gen_strategy.py b/tests/workloads/megatron_bridge/test_command_gen_strategy_slurm.py
similarity index 100%
rename from tests/slurm_command_gen_strategy/test_megatron_bridge_slurm_command_gen_strategy.py
rename to tests/workloads/megatron_bridge/test_command_gen_strategy_slurm.py
diff --git a/tests/report_generation_strategy/test_megatron_bridge_report_generation_strategy.py b/tests/workloads/megatron_bridge/test_report_gen_strategy.py
similarity index 100%
rename from tests/report_generation_strategy/test_megatron_bridge_report_generation_strategy.py
rename to tests/workloads/megatron_bridge/test_report_gen_strategy.py
diff --git a/tests/workloads/megatron_run/__init__.py b/tests/workloads/megatron_run/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/megatron_run/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/report_generation_strategy/test_megatron_run_report_generation_strategy.py b/tests/workloads/megatron_run/test_report_gen_strategy.py
similarity index 100%
rename from tests/report_generation_strategy/test_megatron_run_report_generation_strategy.py
rename to tests/workloads/megatron_run/test_report_gen_strategy.py
diff --git a/tests/workloads/nccl_test/__init__.py b/tests/workloads/nccl_test/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/nccl_test/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_nccl_slurm_command_gen_strategy.py b/tests/workloads/nccl_test/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_nccl_slurm_command_gen_strategy.py
rename to tests/workloads/nccl_test/test_command_gen_strategy_slurm.py
index 7044b8183..22268786c 100644
--- a/tests/slurm_command_gen_strategy/test_nccl_slurm_command_gen_strategy.py
+++ b/tests/workloads/nccl_test/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/job_status_retrieval_strategy/test_nccl_job_status_retrieval_strategy.py b/tests/workloads/nccl_test/test_job_status_retrieval_strategy.py
similarity index 98%
rename from tests/job_status_retrieval_strategy/test_nccl_job_status_retrieval_strategy.py
rename to tests/workloads/nccl_test/test_job_status_retrieval_strategy.py
index 553681b6c..93b9b96a1 100644
--- a/tests/job_status_retrieval_strategy/test_nccl_job_status_retrieval_strategy.py
+++ b/tests/workloads/nccl_test/test_job_status_retrieval_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/json_gen_strategy/test_nccl_kubernetes_json_gen_strategy.py b/tests/workloads/nccl_test/test_json_gen_strategy_kubernetes.py
similarity index 100%
rename from tests/json_gen_strategy/test_nccl_kubernetes_json_gen_strategy.py
rename to tests/workloads/nccl_test/test_json_gen_strategy_kubernetes.py
diff --git a/tests/json_gen_strategy/test_nccl_runai_json_gen_strategy.py b/tests/workloads/nccl_test/test_json_gen_strategy_runai.py
similarity index 98%
rename from tests/json_gen_strategy/test_nccl_runai_json_gen_strategy.py
rename to tests/workloads/nccl_test/test_json_gen_strategy_runai.py
index 87bbebd70..2abbfeb3c 100644
--- a/tests/json_gen_strategy/test_nccl_runai_json_gen_strategy.py
+++ b/tests/workloads/nccl_test/test_json_gen_strategy_runai.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_nccl_performance_report_generation_strategy.py b/tests/workloads/nccl_test/test_performance_report_gen_strategy.py
similarity index 98%
rename from tests/report_generation_strategy/test_nccl_performance_report_generation_strategy.py
rename to tests/workloads/nccl_test/test_performance_report_gen_strategy.py
index 617bb4139..b6b6879ec 100644
--- a/tests/report_generation_strategy/test_nccl_performance_report_generation_strategy.py
+++ b/tests/workloads/nccl_test/test_performance_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_nccl_prediction_report_generator.py b/tests/workloads/nccl_test/test_prediction_report_generator.py
similarity index 97%
rename from tests/report_generation_strategy/test_nccl_prediction_report_generator.py
rename to tests/workloads/nccl_test/test_prediction_report_generator.py
index c47035215..946479e17 100644
--- a/tests/report_generation_strategy/test_nccl_prediction_report_generator.py
+++ b/tests/workloads/nccl_test/test_prediction_report_generator.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/nemo_launcher/__init__.py b/tests/workloads/nemo_launcher/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/nemo_launcher/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_nemo_launcher_slurm_command_gen_strategy.py b/tests/workloads/nemo_launcher/test_command_gen_strategy_slurm.py
similarity index 99%
rename from tests/slurm_command_gen_strategy/test_nemo_launcher_slurm_command_gen_strategy.py
rename to tests/workloads/nemo_launcher/test_command_gen_strategy_slurm.py
index cac352f37..d6c5138a1 100644
--- a/tests/slurm_command_gen_strategy/test_nemo_launcher_slurm_command_gen_strategy.py
+++ b/tests/workloads/nemo_launcher/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_nemo_launcher_report_generation_strategy.py b/tests/workloads/nemo_launcher/test_report_gen_strategy.py
similarity index 98%
rename from tests/report_generation_strategy/test_nemo_launcher_report_generation_strategy.py
rename to tests/workloads/nemo_launcher/test_report_gen_strategy.py
index 030b39e4b..0ef7c7181 100644
--- a/tests/report_generation_strategy/test_nemo_launcher_report_generation_strategy.py
+++ b/tests/workloads/nemo_launcher/test_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/nemo_run/__init__.py b/tests/workloads/nemo_run/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/nemo_run/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_nemo_run_slurm_command_gen_strategy.py b/tests/workloads/nemo_run/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_nemo_run_slurm_command_gen_strategy.py
rename to tests/workloads/nemo_run/test_command_gen_strategy_slurm.py
index 224c86ed5..d43927b9f 100644
--- a/tests/slurm_command_gen_strategy/test_nemo_run_slurm_command_gen_strategy.py
+++ b/tests/workloads/nemo_run/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/job_status_retrieval_strategy/test_nemo_run_job_status_retrieval_strategy.py b/tests/workloads/nemo_run/test_job_status_retrieval_strategy.py
similarity index 97%
rename from tests/job_status_retrieval_strategy/test_nemo_run_job_status_retrieval_strategy.py
rename to tests/workloads/nemo_run/test_job_status_retrieval_strategy.py
index d7ab1ffa4..e7fd55dd8 100644
--- a/tests/job_status_retrieval_strategy/test_nemo_run_job_status_retrieval_strategy.py
+++ b/tests/workloads/nemo_run/test_job_status_retrieval_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_nemo_run_report_generation_strategy.py b/tests/workloads/nemo_run/test_report_gen_strategy.py
similarity index 99%
rename from tests/report_generation_strategy/test_nemo_run_report_generation_strategy.py
rename to tests/workloads/nemo_run/test_report_gen_strategy.py
index ecf08059c..4b9e98398 100644
--- a/tests/report_generation_strategy/test_nemo_run_report_generation_strategy.py
+++ b/tests/workloads/nemo_run/test_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/nixl_bench/__init__.py b/tests/workloads/nixl_bench/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/nixl_bench/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_nixl_bench_slurm_command_gen_strategy.py b/tests/workloads/nixl_bench/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_nixl_bench_slurm_command_gen_strategy.py
rename to tests/workloads/nixl_bench/test_command_gen_strategy_slurm.py
index 1a852e3e9..898aa74d7 100644
--- a/tests/slurm_command_gen_strategy/test_nixl_bench_slurm_command_gen_strategy.py
+++ b/tests/workloads/nixl_bench/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_nixl_bench_report.py b/tests/workloads/nixl_bench/test_report.py
similarity index 99%
rename from tests/report_generation_strategy/test_nixl_bench_report.py
rename to tests/workloads/nixl_bench/test_report.py
index a05ff856a..69ecabf96 100644
--- a/tests/report_generation_strategy/test_nixl_bench_report.py
+++ b/tests/workloads/nixl_bench/test_report.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/nixl_kvbench/__init__.py b/tests/workloads/nixl_kvbench/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/nixl_kvbench/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_nixl_kvbench_command_gen.py b/tests/workloads/nixl_kvbench/test_command_gen_slurm.py
similarity index 97%
rename from tests/slurm_command_gen_strategy/test_nixl_kvbench_command_gen.py
rename to tests/workloads/nixl_kvbench/test_command_gen_slurm.py
index ad87fc561..02638b978 100644
--- a/tests/slurm_command_gen_strategy/test_nixl_kvbench_command_gen.py
+++ b/tests/workloads/nixl_kvbench/test_command_gen_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/nixl_perftest/__init__.py b/tests/workloads/nixl_perftest/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/nixl_perftest/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_nixl_perftest_slurm_command_gen_strategy.py b/tests/workloads/nixl_perftest/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_nixl_perftest_slurm_command_gen_strategy.py
rename to tests/workloads/nixl_perftest/test_command_gen_strategy_slurm.py
index dd59a0b46..e4cf21819 100644
--- a/tests/slurm_command_gen_strategy/test_nixl_perftest_slurm_command_gen_strategy.py
+++ b/tests/workloads/nixl_perftest/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/sleep/__init__.py b/tests/workloads/sleep/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/sleep/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_sleep_slurm_command_gen_strategy.py b/tests/workloads/sleep/test_command_gen_strategy_slurm.py
similarity index 96%
rename from tests/slurm_command_gen_strategy/test_sleep_slurm_command_gen_strategy.py
rename to tests/workloads/sleep/test_command_gen_strategy_slurm.py
index d35bce46d..f39e40faa 100644
--- a/tests/slurm_command_gen_strategy/test_sleep_slurm_command_gen_strategy.py
+++ b/tests/workloads/sleep/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/json_gen_strategy/test_sleep_kubernetes_json_gen_strategy.py b/tests/workloads/sleep/test_json_gen_strategy_kubernetes.py
similarity index 100%
rename from tests/json_gen_strategy/test_sleep_kubernetes_json_gen_strategy.py
rename to tests/workloads/sleep/test_json_gen_strategy_kubernetes.py
diff --git a/tests/workloads/slurm_container/__init__.py b/tests/workloads/slurm_container/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/slurm_container/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_slurm_container_slurm_command_gen_strategy.py b/tests/workloads/slurm_container/test_command_gen_strategy_slurm.py
similarity index 97%
rename from tests/slurm_command_gen_strategy/test_slurm_container_slurm_command_gen_strategy.py
rename to tests/workloads/slurm_container/test_command_gen_strategy_slurm.py
index a2496fbe4..2a6b1b3f9 100644
--- a/tests/slurm_command_gen_strategy/test_slurm_container_slurm_command_gen_strategy.py
+++ b/tests/workloads/slurm_container/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/triton_inference/__init__.py b/tests/workloads/triton_inference/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/triton_inference/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_triton_inference_slurm_command_gen_strategy.py b/tests/workloads/triton_inference/test_command_gen_strategy_slurm.py
similarity index 98%
rename from tests/slurm_command_gen_strategy/test_triton_inference_slurm_command_gen_strategy.py
rename to tests/workloads/triton_inference/test_command_gen_strategy_slurm.py
index d596f186e..8e17208fe 100644
--- a/tests/slurm_command_gen_strategy/test_triton_inference_slurm_command_gen_strategy.py
+++ b/tests/workloads/triton_inference/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/ucc_test/__init__.py b/tests/workloads/ucc_test/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/ucc_test/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_ucc_slurm_command_gen_strategy.py b/tests/workloads/ucc_test/test_command_gen_strategy_slurm.py
similarity index 97%
rename from tests/slurm_command_gen_strategy/test_ucc_slurm_command_gen_strategy.py
rename to tests/workloads/ucc_test/test_command_gen_strategy_slurm.py
index 13b338eb6..e9e73ffcf 100644
--- a/tests/slurm_command_gen_strategy/test_ucc_slurm_command_gen_strategy.py
+++ b/tests/workloads/ucc_test/test_command_gen_strategy_slurm.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/report_generation_strategy/test_ucc_report_generation_strategy.py b/tests/workloads/ucc_test/test_report_gen_strategy.py
similarity index 98%
rename from tests/report_generation_strategy/test_ucc_report_generation_strategy.py
rename to tests/workloads/ucc_test/test_report_gen_strategy.py
index 7175f6089..89c659079 100644
--- a/tests/report_generation_strategy/test_ucc_report_generation_strategy.py
+++ b/tests/workloads/ucc_test/test_report_gen_strategy.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
-# Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/workloads/vllm/__init__.py b/tests/workloads/vllm/__init__.py
new file mode 100644
index 000000000..3ac11851d
--- /dev/null
+++ b/tests/workloads/vllm/__init__.py
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/slurm_command_gen_strategy/test_vllm_slurm_command_gen_strategy.py b/tests/workloads/vllm/test_command_gen_strategy_slurm.py
similarity index 100%
rename from tests/slurm_command_gen_strategy/test_vllm_slurm_command_gen_strategy.py
rename to tests/workloads/vllm/test_command_gen_strategy_slurm.py
diff --git a/tests/job_status_retrieval_strategy/test_vllm_job_status_retrieval_strategy.py b/tests/workloads/vllm/test_job_status_retrieval_strategy.py
similarity index 100%
rename from tests/job_status_retrieval_strategy/test_vllm_job_status_retrieval_strategy.py
rename to tests/workloads/vllm/test_job_status_retrieval_strategy.py
diff --git a/tests/test_vllm.py b/tests/workloads/vllm/test_workload.py
similarity index 100%
rename from tests/test_vllm.py
rename to tests/workloads/vllm/test_workload.py