diff --git a/.github/workflows/component_integration_tests.yml b/.github/workflows/component_integration_tests.yml
index 7b4d244..047b3fe 100644
--- a/.github/workflows/component_integration_tests.yml
+++ b/.github/workflows/component_integration_tests.yml
@@ -43,7 +43,7 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Rust test scenarios
-        working-directory: component_integration_tests/rust_test_scenarios
+        working-directory: tests/test_scenarios/rust
         run: cargo build
 
       - name: Set up Python 3
@@ -52,15 +52,13 @@ jobs:
           python-version: '3.12'
 
       - name: Set up Python virtual environment
-        working-directory: component_integration_tests/python_test_cases
         run: |
           python -m venv .venv
           source .venv/bin/activate
-          pip install -r requirements.txt
+          pip install -r tests/test_cases/requirements.txt
 
       - name: Run Python tests with pytest (PR)
         if: github.event_name == 'pull_request' || github.event_name == 'push'
-        working-directory: component_integration_tests/python_test_cases
         run: |
           source .venv/bin/activate
           python -m pytest --traces=all
@@ -69,7 +67,6 @@ jobs:
         if: github.event_name == 'schedule'
         env:
           NIGHTLY: TRUE
-        working-directory: component_integration_tests/python_test_cases
         run: |
           source .venv/bin/activate
           python -m pytest --traces=all --count=20 --repeat-scope=session
diff --git a/.github/workflows/component_integration_tests_bazel.yml b/.github/workflows/component_integration_tests_bazel.yml
index c1b327b..15fb6e1 100644
--- a/.github/workflows/component_integration_tests_bazel.yml
+++ b/.github/workflows/component_integration_tests_bazel.yml
@@ -69,16 +69,16 @@ jobs:
 
       - name: Build Test Scenarios with Bazel
         run: |
-          bazel build //component_integration_tests/rust_test_scenarios:rust_test_scenarios
+          bazel build //tests/test_scenarios/rust:test_scenarios
 
       - name: Build Test Scenarios with Bazel (PR)
         if: github.event_name == 'pull_request' || github.event_name == 'push'
         run: |
-          bazel test //component_integration_tests/python_test_cases:cit
+          bazel test //tests/test_cases:cit
 
       - name: Build Test Scenarios with Bazel (Nightly)
         if: github.event_name == 'schedule'
         env:
           NIGHTLY: TRUE
         run: |
-          bazel test //component_integration_tests/python_test_cases:cit_repeat --test_timeout=1200
+          bazel test //tests/test_cases:cit_repeat --test_timeout=1200
diff --git a/.gitignore b/.gitignore
index 3d7c28b..5d1d94e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,8 +64,8 @@ target/
 .*swo
 
 # Pytest reports
-component_integration_tests/python_test_cases/*.html
-component_integration_tests/python_test_cases/*.xml
+tests/test_cases/*.html
+tests/test_cases/*.xml
 
 #vscode
 .vscode*
diff --git a/BUILD b/BUILD
index 6685d70..7489faa 100644
--- a/BUILD
+++ b/BUILD
@@ -23,7 +23,6 @@ copyright_checker(
     name = "copyright",
     srcs = [
         ".github",
-        "component_integration_tests",
         "docs",
         "internal_docs",
         "patches",
@@ -101,6 +100,6 @@ test_suite(
     name = "cit_tests",
     testonly = True,
     tests = [
-        "//component_integration_tests/python_test_cases:cit",
+        "//tests/test_cases:cit",
     ],
 )
diff --git a/Cargo.lock b/Cargo.lock
index f1c3396..4d05a66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -837,22 +837,6 @@ version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
-[[package]]
-name = "rust_test_scenarios"
-version = "0.0.3"
-dependencies = [
- "futures",
- "kyron",
- "kyron-foundation",
- "libc",
- "orchestration",
- "serde",
- "serde_json",
- "test_scenarios_rust",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -973,10 +957,26 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "test_scenarios"
+version = "0.0.3"
+dependencies = [
+ "futures",
+ "kyron",
+ "kyron-foundation",
+ "libc",
+ "orchestration",
+ "serde",
+ "serde_json",
+ "test_scenarios_rust",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "test_scenarios_rust"
 version = "0.3.1"
-source = "git+https://github.com/qorix-group/testing_tools.git?rev=2367017e92a65cf4dd2cebeee6d6db3b4d6a1447#2367017e92a65cf4dd2cebeee6d6db3b4d6a1447"
+source = "git+https://github.com/eclipse-score/testing_tools.git?tag=v0.3.1#55280e1376922aead6e09f32542f4e2d0b90cc51"
 dependencies = [
  "tracing",
  "tracing-subscriber",
diff --git a/Cargo.toml b/Cargo.toml
index b35fd29..50ce3ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ default-members = ["src/orchestration", "src/orchestration_macros", "src/xtask"]
 members = [
     "src/orchestration",
     "src/xtask",
-    "component_integration_tests/rust_test_scenarios",
+    "tests/test_scenarios/rust",
     "src/orchestration/examples/camera_drv_object_det",
     "src/orchestration_macros",
 ]
diff --git a/MODULE.bazel b/MODULE.bazel
index 5b2886b..1e52835 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -105,7 +105,7 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_depen
 pip.parse(
     hub_name = "pip_score_venv_test",
     python_version = PYTHON_VERSION,
-    requirements_lock = "//component_integration_tests/python_test_cases:requirements.txt.lock",
+    requirements_lock = "//tests/test_cases:requirements.txt.lock",
 )
 
 use_repo(python)
diff --git a/README.md b/README.md
index 48be16f..a4bda51 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 
 Repository for **Orchestration framework**
 
-[![Nightly CIT](../../actions/workflows/component_integration_tests.yml/badge.svg)](../../actions/workflows/component_integration_tests.yml)
-[![Nightly CIT (Bazel)](../../actions/workflows/component_integration_tests_bazel.yml/badge.svg)](../../actions/workflows/component_integration_tests_bazel.yml)
+[![Nightly CIT](../../actions/workflows/tests.yml/badge.svg)](../../actions/workflows/tests.yml)
+[![Nightly CIT (Bazel)](../../actions/workflows/tests_bazel.yml/badge.svg)](../../actions/workflows/tests_bazel.yml)
 
 
 ## Feature status and roadmap
diff --git a/component_integration_tests/python_test_cases/tests/__init__.py b/component_integration_tests/python_test_cases/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/.ruff.toml b/pyproject.toml
similarity index 76%
rename from .ruff.toml
rename to pyproject.toml
index 17f33f3..e6b1d96 100644
--- a/.ruff.toml
+++ b/pyproject.toml
@@ -1,3 +1,21 @@
+[tool.pytest]
+addopts = ["-v"]
+pythonpath = [
+    "tests/test_cases",
+    "tests/test_cases/tests",
+]
+testpaths = ["tests/test_cases/tests"]
+markers = [
+    "root_required",  # root permissions are required for this test
+    "do_not_repeat",  # do not repeat this test when using pytest-repeat
+    "only_nightly",  # run this test only in nightly runs
+]
+junit_log_passing_tests = true
+
+[tool.pytest_env]
+RUST_BACKTRACE =  {value = "1", skip_if_set = true}
+
+[tool.ruff]
 # Exclude a variety of commonly ignored directories.
 exclude = [
     ".bzr",
@@ -26,7 +44,7 @@ exclude = [
 line-length = 120
 indent-width = 4
 
-[lint]
+[tool.ruff.lint]
 select = [
     # flake8-boolean-trap
     "FBT",
@@ -83,7 +101,7 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-[format]
+[tool.ruff.format]
 # Like Black, use double quotes for strings.
 quote-style = "double"
 
diff --git a/scripts/run_component_tests.sh b/scripts/run_component_tests.sh
index 1dca7cd..e799222 100755
--- a/scripts/run_component_tests.sh
+++ b/scripts/run_component_tests.sh
@@ -12,13 +12,13 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-# For the documentation, please refer to component_integration_tests/python_test_cases/run_tests.py
+# For the documentation, please refer to tests/test_cases/run_tests.py
 #
 # Example usage:
 #     Run all tests:
 #     ./run_component_tests.sh
 #
-#     Run all tests in a specific file (file path must be relative to python_test_cases folder):
+#     Run all tests in a specific file (file path must be relative to test_cases folder):
 #     ./run_component_tests.sh tests/runtime/worker/test_worker_basic.py
 #
 #     Run a specific scenario:
@@ -27,5 +27,5 @@
 FILE_PATH=$(realpath "$0")
 FILE_DIR=$(dirname "$FILE_PATH")
 
-cd "$FILE_DIR"/../component_integration_tests/python_test_cases || exit 1
+cd "$FILE_DIR"/../tests/test_cases || exit 1
 ./run_tests.py "$@"
diff --git a/src/xtask/src/main.rs b/src/xtask/src/main.rs
index 47d9d98..a8a3006 100644
--- a/src/xtask/src/main.rs
+++ b/src/xtask/src/main.rs
@@ -98,7 +98,7 @@ fn main() {
         "build:scenarios" => {
             run_build(
                 "debug_build",
-                &["build", "--manifest-path", "component_integration_tests/rust_test_scenarios/Cargo.toml"],
+                &["build", "--manifest-path", "tests/test_scenarios/rust/Cargo.toml"],
                 envs,
                 cli_env_vars,
                 &passthrough_args,
@@ -110,9 +110,9 @@ fn main() {
                 &[
                     "run",
                     "--manifest-path",
-                    "component_integration_tests/rust_test_scenarios/Cargo.toml",
+                    "tests/test_scenarios/rust/Cargo.toml",
                     "--bin",
-                    "rust_test_scenarios",
+                    "test_scenarios",
                 ],
                 envs,
                 cli_env_vars,
diff --git a/tests/BUILD b/tests/BUILD
deleted file mode 100644
index 828a001..0000000
--- a/tests/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# *******************************************************************************
-# Copyright (c) 2025 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License Version 2.0 which is available at
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# SPDX-License-Identifier: Apache-2.0
-# *******************************************************************************
-load("@rules_rust//rust:defs.bzl", "rust_test")
-
-rust_test(
-    name = "rust_hello_test",
-    srcs = ["test_main.rs"],
-)
diff --git a/component_integration_tests/README.md b/tests/README.md
similarity index 78%
rename from component_integration_tests/README.md
rename to tests/README.md
index f0450c6..9ab8743 100644
--- a/component_integration_tests/README.md
+++ b/tests/README.md
@@ -9,7 +9,7 @@ Create `venv`, activate and install dependencies:
 ```bash
 python -m venv <REPO_ROOT>/.venv
 source <REPO_ROOT>/.venv/bin/activate
-pip install -r <REPO_ROOT>/component_integration_tests/python_test_cases/requirements.txt
+pip install -r <REPO_ROOT>/tests/test_cases/requirements.txt
 ```
 
 ## Usage
@@ -17,7 +17,7 @@ pip install -r <REPO_ROOT>/component_integration_tests/python_test_cases/require
 Set current working directory to the following:
 
 ```bash
-cd <REPO_ROOT>/component_integration_tests/python_test_cases
+cd <REPO_ROOT>/tests/test_cases
 ```
 
 ### Run tests
@@ -25,7 +25,7 @@ cd <REPO_ROOT>/component_integration_tests/python_test_cases
 Bazel:
 
 ```bash
-bazel test //component_integration_tests/python_test_cases:cit
+bazel test //tests/test_cases:cit
 ```
 
 Basic run:
@@ -80,7 +80,7 @@ Test scenarios can be run independently from `pytest`.
 Set current working directory to the following:
 
 ```bash
-cd <REPO_ROOT>/component_integration_tests/rust_test_scenarios
+cd <REPO_ROOT>/tests/test_scenarios/rust
 ```
 
 List all available scenarios:
@@ -104,7 +104,7 @@ cargo run -- --name basic.only_shutdown --input '{"runtime": {"task_queue_size":
 Run test scenario executable directly:
 
 ```bash
-<REPO_ROOT>/target/debug/rust_test_scenarios --name basic.only_shutdown --input '{"runtime": {"task_queue_size": 256, "workers": 1}}'
+<REPO_ROOT>/target/debug/test_scenarios --name basic.only_shutdown --input '{"runtime": {"task_queue_size": 256, "workers": 1}}'
 ```
 
 ### Using Bazel
@@ -113,17 +113,17 @@ Bazel handles all setup steps like environment, rebuilding test scenarios by its
 All Component Integration Tests can be executed with:
 
 ```bash
-bazel test //component_integration_tests/python_test_cases:cit
+bazel test //tests/test_cases:cit
 ```
 
 Run all tests 5 times to check for sporadic errors:
 
 ```bash
-bazel test //component_integration_tests/python_test_cases:cit_repeat
+bazel test //tests/test_cases:cit_repeat
 ```
 
 Run Test Scenarios:
 
 ```bash
-bazel run //component_integration_tests/rust_test_scenarios:rust_test_scenarios -- --help
+bazel run //tests/test_scenarios/rust:test_scenarios -- --help
 ```
diff --git a/component_integration_tests/python_test_cases/BUILD b/tests/test_cases/BUILD
similarity index 81%
rename from component_integration_tests/python_test_cases/BUILD
rename to tests/test_cases/BUILD
index c8c1272..5a51e3c 100644
--- a/component_integration_tests/python_test_cases/BUILD
+++ b/tests/test_cases/BUILD
@@ -15,10 +15,10 @@ load("@rules_python//python:pip.bzl", "compile_pip_requirements")
 load("@score_tooling//python_basics:defs.bzl", "score_py_pytest", "score_virtualenv")
 
 # In order to update the requirements, change the `requirements.in` file and run:
-# `bazel run //component_integration_tests/python_test_cases:requirements.update`.
+# `bazel run //tests/test_cases:requirements.update`.
 # This will update the `requirements.txt` file.
 # To upgrade all dependencies to their latest versions, run:
-# `bazel run //component_integration_tests/python_test_cases:requirements.update -- --upgrade`.
+# `bazel run //tests/test_cases:requirements.update -- --upgrade`.
 compile_pip_requirements(
     name = "requirements",
     srcs = [
@@ -43,11 +43,11 @@ score_py_pytest(
     srcs = glob(["tests/**/*.py"]),
     args = [
         "--traces=all",
-        "--target-path=$(rootpath //component_integration_tests/rust_test_scenarios)",
+        "--target-path=$(rootpath //tests/test_scenarios/rust:test_scenarios)",
     ],
     data = [
         ":python_tc_venv",
-        "//component_integration_tests/rust_test_scenarios",
+        "//tests/test_scenarios/rust:test_scenarios",
     ],
     env = {
         "RUST_BACKTRACE": "1",
@@ -66,11 +66,11 @@ score_py_pytest(
         "--traces=all",
         "--count=5",
         "--repeat-scope=session",
-        "--target-path=$(rootpath //component_integration_tests/rust_test_scenarios)",
+        "--target-path=$(rootpath //tests/test_scenarios/rust:test_scenarios)",
     ],
     data = [
         ":python_tc_venv",
-        "//component_integration_tests/rust_test_scenarios",
+        "//tests/test_scenarios/rust:test_scenarios",
     ],
     env = {
         "RUST_BACKTRACE": "1",
diff --git a/component_integration_tests/python_test_cases/pytest.ini b/tests/test_cases/pytest.ini
similarity index 84%
rename from component_integration_tests/python_test_cases/pytest.ini
rename to tests/test_cases/pytest.ini
index f30d51c..0e12def 100644
--- a/component_integration_tests/python_test_cases/pytest.ini
+++ b/tests/test_cases/pytest.ini
@@ -12,8 +12,9 @@
 # *******************************************************************************
 [pytest]
 addopts = -v
-testpaths = tests
-pythonpath = ../..
+testpaths = tests/test_cases/tests
+pythonpath =
+    tests
 
 ; Additional environment variables
 env = D:RUST_BACKTRACE = 1
@@ -22,3 +23,7 @@ markers =
     root_required: root permissions are required for this test.
     do_not_repeat: do not repeat this test when using pytest-repeat.
     only_nightly: run this test only in nightly runs.
+
+filterwarnings =
+    ignore::pytest.PytestWarning
+    ignore::pytest.PytestExperimentalApiWarning
diff --git a/component_integration_tests/python_test_cases/requirements.txt b/tests/test_cases/requirements.txt
similarity index 100%
rename from component_integration_tests/python_test_cases/requirements.txt
rename to tests/test_cases/requirements.txt
diff --git a/component_integration_tests/python_test_cases/requirements.txt.lock b/tests/test_cases/requirements.txt.lock
similarity index 96%
rename from component_integration_tests/python_test_cases/requirements.txt.lock
rename to tests/test_cases/requirements.txt.lock
index a849c0d..c7414e8 100644
--- a/component_integration_tests/python_test_cases/requirements.txt.lock
+++ b/tests/test_cases/requirements.txt.lock
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    bazel run //component_integration_tests/python_test_cases:requirements.update
+#    bazel run //tests/test_cases:requirements.update
 #
 basedpyright==1.29.2 \
     --hash=sha256:12c49186003b9f69a028615da883ef97035ea2119a9e3f93a00091b3a27088a6 \
@@ -126,7 +126,7 @@ psutil==7.1.3 \
     --hash=sha256:c525ffa774fe4496282fb0b1187725793de3e7c6b29e41562733cae9ada151ee \
     --hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \
     --hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f
-    # via -r component_integration_tests/python_test_cases/requirements.txt
+    # via -r tests/test_cases/requirements.txt
 pytest==8.3.5 \
     --hash=sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820 \
     --hash=sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845
@@ -140,7 +140,7 @@ pytest==8.3.5 \
 pytest-env==1.1.5 \
     --hash=sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf \
     --hash=sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30
-    # via -r component_integration_tests/python_test_cases/requirements.txt
+    # via -r tests/test_cases/requirements.txt
 pytest-html==4.1.1 \
     --hash=sha256:70a01e8ae5800f4a074b56a4cb1025c8f4f9b038bba5fe31e3c98eb996686f07 \
     --hash=sha256:c8152cea03bd4e9bee6d525573b67bbc6622967b72b9628dda0ea3e2a0b5dd71
@@ -149,7 +149,7 @@ pytest-metadata==3.1.1 \
     --hash=sha256:c8e0844db684ee1c798cfa38908d20d67d0463ecb6137c72e91f418558dd5f4b \
     --hash=sha256:d2a29b0355fbc03f168aa96d41ff88b1a3b44a3b02acbe491801c98a048017c8
     # via
-    #   -r component_integration_tests/python_test_cases/requirements.txt
+    #   -r tests/test_cases/requirements.txt
     #   pytest-html
 pytest-repeat==0.9.4 \
     --hash=sha256:c1738b4e412a6f3b3b9e0b8b29fcd7a423e50f87381ad9307ef6f5a8601139f3 \
@@ -158,4 +158,4 @@ pytest-repeat==0.9.4 \
 # WARNING: pip install will require the following package to be hashed.
 # Consider using a hashable URL like https://github.com/jazzband/pip-tools/archive/SOMECOMMIT.zip
 testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@v0.3.0
-    # via -r component_integration_tests/python_test_cases/requirements.txt
+    # via -r tests/test_cases/requirements.txt
diff --git a/component_integration_tests/python_test_cases/run_tests.py b/tests/test_cases/run_tests.py
similarity index 98%
rename from component_integration_tests/python_test_cases/run_tests.py
rename to tests/test_cases/run_tests.py
index 85df2d5..acf7e28 100755
--- a/component_integration_tests/python_test_cases/run_tests.py
+++ b/tests/test_cases/run_tests.py
@@ -20,7 +20,7 @@
 
 
 Usage:
-Run this script from the python_test_cases directory.
+Run this script from the test_cases directory.
 Script adds implicitly below pytest arguments:
 * -vv - to increase verbosity of pytest output
 * --build-scenarios - to build tests scenarios if not built yet
diff --git a/component_integration_tests/python_test_cases/tests/basic/test_demo.py b/tests/test_cases/tests/basic/test_demo.py
similarity index 95%
rename from component_integration_tests/python_test_cases/tests/basic/test_demo.py
rename to tests/test_cases/tests/basic/test_demo.py
index 3ee48bf..075d2dc 100644
--- a/component_integration_tests/python_test_cases/tests/basic/test_demo.py
+++ b/tests/test_cases/tests/basic/test_demo.py
@@ -13,16 +13,11 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils import LogContainer
 from testing_utils.scenario import ScenarioResult
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 class TestDemo(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/basic/test_program_runs.py b/tests/test_cases/tests/basic/test_program_runs.py
similarity index 98%
rename from component_integration_tests/python_test_cases/tests/basic/test_program_runs.py
rename to tests/test_cases/tests/basic/test_program_runs.py
index 3d21653..c34feeb 100644
--- a/component_integration_tests/python_test_cases/tests/basic/test_program_runs.py
+++ b/tests/test_cases/tests/basic/test_program_runs.py
@@ -13,16 +13,11 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils import LogContainer
 from testing_utils.scenario import ScenarioResult
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 class TestProgramRun(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/cit_scenario.py b/tests/test_cases/tests/cit_scenario.py
similarity index 100%
rename from component_integration_tests/python_test_cases/tests/cit_scenario.py
rename to tests/test_cases/tests/cit_scenario.py
diff --git a/component_integration_tests/python_test_cases/tests/conftest.py b/tests/test_cases/tests/conftest.py
similarity index 97%
rename from component_integration_tests/python_test_cases/tests/conftest.py
rename to tests/test_cases/tests/conftest.py
index 62db80e..313dc25 100644
--- a/component_integration_tests/python_test_cases/tests/conftest.py
+++ b/tests/test_cases/tests/conftest.py
@@ -40,7 +40,7 @@ def pytest_addoption(parser):
     parser.addoption(
         "--target-name",
         type=str,
-        default="rust_test_scenarios",
+        default="test_scenarios",
         help='Test scenario executable name. Overwritten by "--target-path".',
     )
     parser.addoption(
@@ -229,10 +229,10 @@ def pytest_runtest_makereport(item, call):
             command.append(token)
     report.command = " ".join(command)
     # If bazel is used, modify command
-    if "BAZEL_VERSION" in os.environ:
+    if "BAZEL_TEST" in os.environ:
         report.command = report.command.replace(
-            "component_integration_tests/rust_test_scenarios/rust_test_scenarios",
-            "bazel run //component_integration_tests/rust_test_scenarios:rust_test_scenarios --",
+            "tests/test_scenarios/rust/test_scenarios",
+            "bazel run //tests/test_scenarios/rust:test_scenarios --",
         )
 
     # Store failed command for printing in summary
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_bind_to_worker.py b/tests/test_cases/tests/orchestrator/test_bind_to_worker.py
similarity index 96%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_bind_to_worker.py
rename to tests/test_cases/tests/orchestrator/test_bind_to_worker.py
index 0a7a0eb..da4e8ee 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_bind_to_worker.py
+++ b/tests/test_cases/tests/orchestrator/test_bind_to_worker.py
@@ -13,16 +13,11 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils import ScenarioResult
 from testing_utils.log_container import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 class CommonDedicatedWorkerConfig(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_concurrency.py b/tests/test_cases/tests/orchestrator/test_concurrency.py
similarity index 98%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_concurrency.py
rename to tests/test_cases/tests/orchestrator/test_concurrency.py
index 9563c7d..e4cf939 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_concurrency.py
+++ b/tests/test_cases/tests/orchestrator/test_concurrency.py
@@ -13,12 +13,9 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
 from testing_utils import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-
 
 class TestSingleConcurrency1W256Q(CitScenario):
     @pytest.fixture(scope="class")
@@ -174,7 +171,8 @@ def test_concurrency2_execution_order(self, logs_info_level: LogContainer):
             < concurrency2_end.timestamp
             < finish_action.timestamp
         ), (
-            "Incorrect execution order. Expected Concurrency2 to start after IntermediateAction and finish before FinishAction"
+            "Incorrect execution order. Expected Concurrency2 to start after IntermediateAction "
+            "and finish before FinishAction"
         )
 
 
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_double_handler_catch.py b/tests/test_cases/tests/orchestrator/test_double_handler_catch.py
similarity index 88%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_double_handler_catch.py
rename to tests/test_cases/tests/orchestrator/test_double_handler_catch.py
index ed58d98..ee99ee2 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_double_handler_catch.py
+++ b/tests/test_cases/tests/orchestrator/test_double_handler_catch.py
@@ -13,15 +13,10 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils import ScenarioResult
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 class TestDoubleSameCatchHandler(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_graph.py b/tests/test_cases/tests/orchestrator/test_graph.py
similarity index 98%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_graph.py
rename to tests/test_cases/tests/orchestrator/test_graph.py
index 5eae9ce..9a30e66 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_graph.py
+++ b/tests/test_cases/tests/orchestrator/test_graph.py
@@ -14,16 +14,11 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils import ScenarioResult
 from testing_utils.log_container import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 # region Positive Scenarios
 class CommonGraphProgramConfig(CitScenario):
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_if_else.py b/tests/test_cases/tests/orchestrator/test_if_else.py
similarity index 93%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_if_else.py
rename to tests/test_cases/tests/orchestrator/test_if_else.py
index 55caca8..da368c4 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_if_else.py
+++ b/tests/test_cases/tests/orchestrator/test_if_else.py
@@ -14,12 +14,9 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
 from testing_utils import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-
 
 class TestBasicIfElseCondition(CitScenario):
     @pytest.fixture(scope="class")
@@ -31,7 +28,7 @@ def condition(self, request: pytest.FixtureRequest) -> bool:
         return request.param
 
     @pytest.fixture(scope="class")
-    def test_config(self, condition: bool) -> dict[str, Any]:
+    def test_config(self, condition: bool) -> dict[str, Any]:  # noqa: FBT001
         return {
             "runtime": {"task_queue_size": 256, "workers": 4},
             "test": {"condition": condition},
@@ -60,7 +57,7 @@ def inner_condition(self, request: pytest.FixtureRequest) -> bool:
         return request.param
 
     @pytest.fixture(scope="class")
-    def test_config(self, outer_condition: bool, inner_condition: bool) -> dict[str, Any]:
+    def test_config(self, outer_condition: bool, inner_condition: bool) -> dict[str, Any]:  # noqa: FBT001
         return {
             "runtime": {"task_queue_size": 256, "workers": 4},
             "test": {
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_sequence.py b/tests/test_cases/tests/orchestrator/test_sequence.py
similarity index 97%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_sequence.py
rename to tests/test_cases/tests/orchestrator/test_sequence.py
index e0099d0..fc51db7 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_sequence.py
+++ b/tests/test_cases/tests/orchestrator/test_sequence.py
@@ -13,12 +13,9 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
 from testing_utils import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-
 
 class TestSingleSequence1W256Q(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_shutdown.py b/tests/test_cases/tests/orchestrator/test_shutdown.py
similarity index 96%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_shutdown.py
rename to tests/test_cases/tests/orchestrator/test_shutdown.py
index 7143a5e..5c3bcfb 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_shutdown.py
+++ b/tests/test_cases/tests/orchestrator/test_shutdown.py
@@ -11,16 +11,11 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils.log_container import LogContainer
 from testing_utils.scenario import ScenarioResult
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 class TestSingleProgramSingleShutdown(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_sleep_under_load.py b/tests/test_cases/tests/orchestrator/test_sleep_under_load.py
similarity index 97%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_sleep_under_load.py
rename to tests/test_cases/tests/orchestrator/test_sleep_under_load.py
index d673c2a..2181598 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_sleep_under_load.py
+++ b/tests/test_cases/tests/orchestrator/test_sleep_under_load.py
@@ -14,12 +14,9 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
 from testing_utils import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-
 
 class TestShortSleepUnderLoad2W256Q(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_tags_methods.py b/tests/test_cases/tests/orchestrator/test_tags_methods.py
similarity index 97%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_tags_methods.py
rename to tests/test_cases/tests/orchestrator/test_tags_methods.py
index 6e2c00b..652b0b5 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_tags_methods.py
+++ b/tests/test_cases/tests/orchestrator/test_tags_methods.py
@@ -13,16 +13,11 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
+from result_code import ResultCode
 from testing_utils.log_container import LogContainer
 from testing_utils.scenario import ScenarioResult
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-from component_integration_tests.python_test_cases.tests.result_code import (
-    ResultCode,
-)
-
 
 class TestTagMethods(CitScenario):
     @pytest.fixture(scope="class")
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_trigger_sync.py b/tests/test_cases/tests/orchestrator/test_trigger_sync.py
similarity index 85%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_trigger_sync.py
rename to tests/test_cases/tests/orchestrator/test_trigger_sync.py
index 4b50799..76026ec 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_trigger_sync.py
+++ b/tests/test_cases/tests/orchestrator/test_trigger_sync.py
@@ -14,12 +14,9 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
 from testing_utils import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-
 BLOCKING_TASK_ID = "blocking_sleep_task"
 BLOCKING_TASK_DELAY_MS = 1000
 BASIC_TASK_A_ID = "basic_task_A"
@@ -40,14 +37,14 @@ def test_execution_order(self, logs_info_level: LogContainer):
         assert len(results) == 3, "Expected 3 messages in total"
 
         sleep_begin_msg = results.pop(0)
-        assert sleep_begin_msg.id == BLOCKING_TASK_ID and sleep_begin_msg.location == "begin", (
+        assert sleep_begin_msg.id == BLOCKING_TASK_ID, "Expected the first message to have id equal to BLOCKING_TASK_ID"
+        assert sleep_begin_msg.location == "begin", (
             "Expected the first message to be the start of the blocking sleep task"
         )
 
         sleep_end_msg = results.pop(0)
-        assert sleep_end_msg.id == BLOCKING_TASK_ID and sleep_end_msg.location == "end", (
-            "Expected the second message to be the end of the blocking sleep task"
-        )
+        assert sleep_end_msg.id == BLOCKING_TASK_ID, "Expected the second message to have id equal to BLOCKING_TASK_ID"
+        assert sleep_end_msg.location == "end", "Expected the second message to be the end of the blocking sleep task"
 
         basic_task_msg = results.pop(0)
         assert basic_task_msg.id == BASIC_TASK_A_ID, f"Expected the third message to be {BASIC_TASK_A_ID}"
@@ -73,20 +70,18 @@ def test_config(self) -> dict[str, Any]:
         return {"runtime": {"task_queue_size": 256, "workers": 4}}
 
     def test_execution_order(self, scenario_name, test_config, logs_info_level: LogContainer):
-        print(scenario_name)
-        print(test_config)
         results = list(logs_info_level)
         assert len(results) == 4, "Expected 4 messages in total"
 
         sleep_begin_msg = results.pop(0)
-        assert sleep_begin_msg.id == BLOCKING_TASK_ID and sleep_begin_msg.location == "begin", (
+        assert sleep_begin_msg.id == BLOCKING_TASK_ID, "Expected the first message to have id equal to BLOCKING_TASK_ID"
+        assert sleep_begin_msg.location == "begin", (
             "Expected the first message to be the start of the blocking sleep task"
         )
 
         sleep_end_msg = results.pop(0)
-        assert sleep_end_msg.id == BLOCKING_TASK_ID and sleep_end_msg.location == "end", (
-            "Expected the second message to be the end of the blocking sleep task"
-        )
+        assert sleep_end_msg.id == BLOCKING_TASK_ID, "Expected the second message to have id equal to BLOCKING_TASK_ID"
+        assert sleep_end_msg.location == "end", "Expected the second message to be the end of the blocking sleep task"
 
         expected_basic_task_ids = {BASIC_TASK_A_ID, BASIC_TASK_B_ID}
         basic_task_msg = results.pop(0)
diff --git a/component_integration_tests/python_test_cases/tests/orchestrator/test_user_error_catch.py b/tests/test_cases/tests/orchestrator/test_user_error_catch.py
similarity index 86%
rename from component_integration_tests/python_test_cases/tests/orchestrator/test_user_error_catch.py
rename to tests/test_cases/tests/orchestrator/test_user_error_catch.py
index 5ec60b0..36ac788 100644
--- a/component_integration_tests/python_test_cases/tests/orchestrator/test_user_error_catch.py
+++ b/tests/test_cases/tests/orchestrator/test_user_error_catch.py
@@ -13,12 +13,9 @@
 from typing import Any
 
 import pytest
+from cit_scenario import CitScenario
 from testing_utils import LogContainer
 
-from component_integration_tests.python_test_cases.tests.cit_scenario import (
-    CitScenario,
-)
-
 
 class TestUnrecoverableCatchSequence(CitScenario):
     @pytest.fixture(scope="class")
@@ -43,14 +40,12 @@ def test_execution_order(self, test_config, logs_info_level: LogContainer):
         error_code = test_config["test"]["error_code"]
 
         error_msg = results.pop(0)
-        assert error_msg.id == "user_error_task" and error_msg.error_code == error_code, (
-            "Expected error triggering task"
-        )
+        assert error_msg.id == "user_error_task", "Expected error triggering task: wrong id"
+        assert error_msg.error_code == error_code, "Expected error triggering task: wrong error_code"
 
         catch_msg = results.pop(0)
-        assert catch_msg.id == "catch" and catch_msg.error_code == error_code, (
-            "Expected catch block to handle the user error"
-        )
+        assert catch_msg.id == "catch", "Expected catch block to handle the user error: wrong id"
+        assert catch_msg.error_code == error_code, "Expected catch block to handle the user error: wrong error_code"
 
 
 class TestRecoverableFailedCatchSequence(CitScenario):
@@ -76,16 +71,15 @@ def test_execution_order(self, test_config, logs_info_level: LogContainer):
         error_code = test_config["test"]["error_code"]
 
         error_msg = results.pop(0)
-        assert error_msg.id == "user_error_task" and error_msg.error_code == error_code, (
-            "Expected error triggering task"
-        )
+        assert error_msg.id == "user_error_task", "Expected error triggering task: wrong id"
+        assert error_msg.error_code == error_code, "Expected error triggering task: wrong error_code"
 
         catch_msg = results.pop(0)
-        assert (
-            catch_msg.id == "catch_recoverable"
-            and catch_msg.error_code == error_code
-            and catch_msg.is_recoverable is False
-        ), "Expected catch block to handle the user error"
+        assert catch_msg.id == "catch_recoverable", "Expected catch block to handle the user error: wrong id"
+        assert catch_msg.error_code == error_code, "Expected catch block to handle the user error: wrong error_code"
+        assert catch_msg.is_recoverable is False, (
+            "Expected catch block to handle the user error: is_recoverable should be False"
+        )
 
 
 class TestRecoverableCatchSequence(CitScenario):
@@ -111,16 +105,15 @@ def test_execution_order(self, test_config, logs_info_level: LogContainer):
         error_code = test_config["test"]["error_code"]
 
         error_msg = results.pop(0)
-        assert error_msg.id == "user_error_task" and error_msg.error_code == error_code, (
-            "Expected error triggering task"
-        )
+        assert error_msg.id == "user_error_task", "Expected error triggering task: wrong id"
+        assert error_msg.error_code == error_code, "Expected error triggering task: wrong error_code"
 
         catch_msg = results.pop(0)
-        assert (
-            catch_msg.id == "catch_recoverable"
-            and catch_msg.error_code == error_code
-            and catch_msg.is_recoverable is True
-        ), "Expected catch block to handle the user error"
+        assert catch_msg.id == "catch_recoverable", "Expected catch block to handle the user error: wrong id"
+        assert catch_msg.error_code == error_code, "Expected catch block to handle the user error: wrong error_code"
+        assert catch_msg.is_recoverable is True, (
+            "Expected catch block to handle the user error: is_recoverable should be True"
+        )
 
         after_catch_msg = results.pop(0)
         assert after_catch_msg.id == "log_after_catch_task", "Expected task after catch block to be executed"
diff --git a/component_integration_tests/python_test_cases/tests/result_code.py b/tests/test_cases/tests/result_code.py
similarity index 100%
rename from component_integration_tests/python_test_cases/tests/result_code.py
rename to tests/test_cases/tests/result_code.py
diff --git a/tests/test_main.rs b/tests/test_main.rs
deleted file mode 100644
index 9390d5e..0000000
--- a/tests/test_main.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[test]
-fn test_hello() {
-    assert_eq!(2 + 2, 4);
-}
diff --git a/component_integration_tests/rust_test_scenarios/BUILD b/tests/test_scenarios/rust/BUILD
similarity index 91%
rename from component_integration_tests/rust_test_scenarios/BUILD
rename to tests/test_scenarios/rust/BUILD
index d5a14f2..2447b88 100644
--- a/component_integration_tests/rust_test_scenarios/BUILD
+++ b/tests/test_scenarios/rust/BUILD
@@ -13,12 +13,12 @@
 load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 rust_binary(
-    name = "rust_test_scenarios",
+    name = "test_scenarios",
     srcs = glob(["src/**/*.rs"]),
     tags = [
         "manual",
     ],
-    visibility = ["//component_integration_tests/python_test_cases:__pkg__"],
+    visibility = ["//tests/test_cases:__pkg__"],
     deps = [
         "//src/orchestration:liborchestration",
         "@score_crates//:futures",
diff --git a/component_integration_tests/rust_test_scenarios/Cargo.lock b/tests/test_scenarios/rust/Cargo.lock
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/Cargo.lock
rename to tests/test_scenarios/rust/Cargo.lock
diff --git a/component_integration_tests/rust_test_scenarios/Cargo.toml b/tests/test_scenarios/rust/Cargo.toml
similarity index 69%
rename from component_integration_tests/rust_test_scenarios/Cargo.toml
rename to tests/test_scenarios/rust/Cargo.toml
index e2f06e2..f9fded7 100644
--- a/component_integration_tests/rust_test_scenarios/Cargo.toml
+++ b/tests/test_scenarios/rust/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rust_test_scenarios"
+name = "test_scenarios"
 version.workspace = true
 edition.workspace = true
 
@@ -11,7 +11,7 @@ libc.workspace = true
 futures = "0.3.31"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-test_scenarios_rust = { git = "https://github.com/qorix-group/testing_tools.git", rev = "2367017e92a65cf4dd2cebeee6d6db3b4d6a1447" }
+test_scenarios_rust = { git = "https://github.com/eclipse-score/testing_tools.git", tag = "v0.3.1" }
 tracing = "0.1.43"
 tracing-subscriber = "0.3.22"
 
diff --git a/component_integration_tests/rust_test_scenarios/src/internals/mod.rs b/tests/test_scenarios/rust/src/internals/mod.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/internals/mod.rs
rename to tests/test_scenarios/rust/src/internals/mod.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/internals/runtime_helper.rs b/tests/test_scenarios/rust/src/internals/runtime_helper.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/internals/runtime_helper.rs
rename to tests/test_scenarios/rust/src/internals/runtime_helper.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/main.rs b/tests/test_scenarios/rust/src/main.rs
similarity index 90%
rename from component_integration_tests/rust_test_scenarios/src/main.rs
rename to tests/test_scenarios/rust/src/main.rs
index 15e4f61..7385d52 100755
--- a/component_integration_tests/rust_test_scenarios/src/main.rs
+++ b/tests/test_scenarios/rust/src/main.rs
@@ -1,10 +1,10 @@
 mod internals;
-mod tests;
+mod scenarios;
 
 use test_scenarios_rust::cli::{create_tracing_subscriber, run_cli_app};
 use test_scenarios_rust::test_context::TestContext;
 
-use crate::tests::root_scenario_group;
+use crate::scenarios::root_scenario_group;
 
 fn main() -> Result<(), String> {
     let subscriber = create_tracing_subscriber();
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/basic/demo.rs b/tests/test_scenarios/rust/src/scenarios/basic/demo.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/basic/demo.rs
rename to tests/test_scenarios/rust/src/scenarios/basic/demo.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/basic/mod.rs b/tests/test_scenarios/rust/src/scenarios/basic/mod.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/basic/mod.rs
rename to tests/test_scenarios/rust/src/scenarios/basic/mod.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/basic/program_runs.rs b/tests/test_scenarios/rust/src/scenarios/basic/program_runs.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/basic/program_runs.rs
rename to tests/test_scenarios/rust/src/scenarios/basic/program_runs.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/mod.rs b/tests/test_scenarios/rust/src/scenarios/mod.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/mod.rs
rename to tests/test_scenarios/rust/src/scenarios/mod.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/mod.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/mod.rs
similarity index 99%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/mod.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/mod.rs
index 222406a..28e18f3 100644
--- a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/mod.rs
+++ b/tests/test_scenarios/rust/src/scenarios/orchestration/mod.rs
@@ -1,4 +1,4 @@
-use crate::tests::orchestration::{
+use crate::scenarios::orchestration::{
     orchestration_methods::{InvalidInvokes, TagMethods, TooManyTags},
     orchestration_shutdown::ShutdownBeforeStart,
 };
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_concurrency.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_concurrency.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_concurrency.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_concurrency.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_dedicated_worker.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_dedicated_worker.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_dedicated_worker.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_dedicated_worker.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_double_handler_catch.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_double_handler_catch.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_double_handler_catch.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_double_handler_catch.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_graph.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_graph.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_graph.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_graph.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_if_else.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_if_else.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_if_else.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_if_else.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_methods.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_methods.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_methods.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_methods.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_sequence.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_sequence.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_sequence.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_sequence.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_shutdown.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_shutdown.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_shutdown.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_shutdown.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_sleep.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_sleep.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_sleep.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_sleep.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_trigger_sync.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_trigger_sync.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_trigger_sync.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_trigger_sync.rs
diff --git a/component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_user_error_catch.rs b/tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_user_error_catch.rs
similarity index 100%
rename from component_integration_tests/rust_test_scenarios/src/tests/orchestration/orchestration_user_error_catch.rs
rename to tests/test_scenarios/rust/src/scenarios/orchestration/orchestration_user_error_catch.rs