diff --git a/test-cases/folks-sync-only.yaml b/test-cases/folks-sync-only.yaml
index 609389c208c32997c98eb7e56ebe51490edbf700..3d4d25eff12d0fc7076be081ffd984a9076615d7 100644
--- a/test-cases/folks-sync-only.yaml
+++ b/test-cases/folks-sync-only.yaml
@@ -16,13 +16,18 @@ metadata:
 
 install:
   deps:
-  - chaiwala-tests
-  - ofono-tests
-  - ofono-phonesim
-  - libfolks-ofono25
+    - chaiwala-tests
+    - ofono-tests
+    - ofono-phonesim
+    - libfolks-ofono25
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --user=user folks/folks-sync-only.sh
 
diff --git a/test-cases/sdk-code-analysis-tools-gcov.yaml b/test-cases/sdk-code-analysis-tools-gcov.yaml
index ff3d996b76f16946008f830d512b70a5523d73cd..8777992410ae17f672b4086bcb24d2bc0a3b3604 100644
--- a/test-cases/sdk-code-analysis-tools-gcov.yaml
+++ b/test-cases/sdk-code-analysis-tools-gcov.yaml
@@ -21,11 +21,16 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apertis-tests
+    - bash
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --user=user --basename -- sdk/automated/test-gcov.sh
 
diff --git a/test-cases/sdk-code-analysis-tools-splint.yaml b/test-cases/sdk-code-analysis-tools-splint.yaml
index 396ffc47c649f67b70d0f049d00a838ba6dadc72..6a2ec489320eca2b684a4192f444c918f8c6cac0 100644
--- a/test-cases/sdk-code-analysis-tools-splint.yaml
+++ b/test-cases/sdk-code-analysis-tools-splint.yaml
@@ -20,11 +20,16 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apertis-tests
+    - bash
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --user=user --basename -- /usr/share/chaiwala-tests/sdk/automated/test-splint.sh
 
diff --git a/test-cases/sdk-debug-tools-gdb.yaml b/test-cases/sdk-debug-tools-gdb.yaml
index 9b8b597731f9f1248eb23bfdb1c09a0d5b20d5d1..b3392f81cd6c8fdc7e118b66e8d54a578644e5f9 100644
--- a/test-cases/sdk-debug-tools-gdb.yaml
+++ b/test-cases/sdk-debug-tools-gdb.yaml
@@ -18,11 +18,16 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apertis-tests
+    - bash
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --user=user -- /usr/share/chaiwala-tests/sdk/automated/test-gdb.sh
 
diff --git a/test-cases/sdk-debug-tools-strace.yaml b/test-cases/sdk-debug-tools-strace.yaml
index 502d645749eb13ca7d695bf0db5d6cc5fa2f2bcb..4ab760b1b363f60d1a44a6c45e3e86c27033d7f6 100644
--- a/test-cases/sdk-debug-tools-strace.yaml
+++ b/test-cases/sdk-debug-tools-strace.yaml
@@ -18,11 +18,16 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apertis-tests
+    - bash
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --user=user -- /usr/share/chaiwala-tests/sdk/automated/test-strace.sh
 
diff --git a/test-cases/sdk-debug-tools-valgrind.yaml b/test-cases/sdk-debug-tools-valgrind.yaml
index e1e3e2242020e075b7711fc7761690151557e508..00e29536429d8f11c39db4b07c2ca31caa03a8b0 100644
--- a/test-cases/sdk-debug-tools-valgrind.yaml
+++ b/test-cases/sdk-debug-tools-valgrind.yaml
@@ -18,11 +18,16 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apertis-tests
+    - bash
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --user=user -- /usr/share/chaiwala-tests/sdk/automated/test-valgrind.sh
 
diff --git a/test-cases/sdk-performance-tools-gprof.yaml b/test-cases/sdk-performance-tools-gprof.yaml
index 581afa5c6fc7a5fbe0619ae364e8cfd08ba39546..64624c8314fb7e3459a00c3d3dc50436a788649b 100644
--- a/test-cases/sdk-performance-tools-gprof.yaml
+++ b/test-cases/sdk-performance-tools-gprof.yaml
@@ -21,10 +21,15 @@ metadata:
 
 install:
   deps:
-  - apertis-tests
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --user=user -- sdk/automated/test-gprof.sh
 
diff --git a/test-cases/sdk-performance-tools-sysprof.yaml b/test-cases/sdk-performance-tools-sysprof.yaml
index 66d5a907ae719ce009558cb0d009feff36ed50c8..02a688979d02f31cae543074eeb1a5efcd6a540a 100644
--- a/test-cases/sdk-performance-tools-sysprof.yaml
+++ b/test-cases/sdk-performance-tools-sysprof.yaml
@@ -21,10 +21,15 @@ metadata:
 
 install:
   deps:
-  - apertis-tests
+    - apertis-tests
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename -- sdk/automated/test-sysprof.sh
 
diff --git a/test-cases/telepathy-ring-automated.yaml b/test-cases/telepathy-ring-automated.yaml
index 1e52ae6a577482656b37ccae075387afbf0a0986..8173129916bd88ef5681dc3b4722c69c42c99883 100644
--- a/test-cases/telepathy-ring-automated.yaml
+++ b/test-cases/telepathy-ring-automated.yaml
@@ -21,19 +21,24 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-phoenix
-  - telepathy-mission-control-5
-  - ofono-tests
-  - apertis-tests-apparmor-report
-  - ofono-phonesim
+    - telepathy-ring
+    - telepathy-phoenix
+    - telepathy-mission-control-5
+    - ofono-tests
+    - apertis-tests-apparmor-report
+    - ofono-phonesim
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --user=user sdk/telepathy-ring-automated.sh
-  - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - echo -n | sudo tee /var/log/audit/audit.log
+    - common/run-test-in-systemd --user=user sdk/telepathy-ring-automated.sh
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   fixupdict: