diff --git a/test-cases/apparmor-folks.yaml b/test-cases/apparmor-folks.yaml
index a1b0812fd98b54fad13b0dfb253fe369cdf55348..3d9a388153baedc44fa5e81d956ef06ef68611e3 100644
--- a/test-cases/apparmor-folks.yaml
+++ b/test-cases/apparmor-folks.yaml
@@ -35,27 +35,32 @@ metadata:
 
 install:
   deps:
-  - apparmor
-  - apparmor-profiles
-  - busybox
-  - chaiwala-apparmor-profiles
-  - apertis-tests-apparmor-report
-  - chaiwala-tests
-  - evolution-data-server
-  - folks-tools
-  - syncevolution
-  - python3
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
+    - apparmor
+    - apparmor-profiles
+    - busybox
+    - chaiwala-apparmor-profiles
+    - apertis-tests-apparmor-report
+    - chaiwala-tests
+    - evolution-data-server
+    - folks-tools
+    - syncevolution
+    - python3
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+  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 --name=run-test-folks --timeout=300 apparmor/folks/test-folks
-  - 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 --name=run-test-folks --timeout=300 apparmor/folks/test-folks
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   pattern: ^(?P<test_case_id>.+)\.expected:\s*(?P<result>PASS|pass|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
diff --git a/test-cases/apparmor-functional-demo.yaml b/test-cases/apparmor-functional-demo.yaml
index 7de07e1f97160e12295b7d8cd4866aeaf954dcb0..38f362600b132701f23a9f04c4850e6e55005ce6 100644
--- a/test-cases/apparmor-functional-demo.yaml
+++ b/test-cases/apparmor-functional-demo.yaml
@@ -24,17 +24,22 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apparmor-demo
-  - busybox
-  - apertis-tests-apparmor-report
+    - bash
+    - apparmor-demo
+    - busybox
+    - apertis-tests-apparmor-report
+  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 --name=run-lava_run_tests --timeout=90 /usr/lib/apparmor-demo/lava_run_tests
-  - 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 --name=run-lava_run_tests --timeout=90 /usr/lib/apparmor-demo/lava_run_tests
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   fixupdict:
diff --git a/test-cases/apparmor-geoclue.yaml b/test-cases/apparmor-geoclue.yaml
index c4477c6a278a46c21323f0d8f9c7083639e62604..8ec588faedc33dc59b52a70f3ec8fadfed44fc03 100644
--- a/test-cases/apparmor-geoclue.yaml
+++ b/test-cases/apparmor-geoclue.yaml
@@ -24,15 +24,20 @@ metadata:
 
 install:
   deps:
-  - busybox
-  - apertis-tests-apparmor-geoclue
+    - busybox
+    - apertis-tests-apparmor-geoclue
+  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 --name run-test-geoclue --timeout 90 /usr/lib/apertis-tests/apparmor/geoclue/test-geoclue
-  - 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 --name run-test-geoclue --timeout 90 /usr/lib/apertis-tests/apparmor/geoclue/test-geoclue
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   pattern: ^(?P<test_case_id>[\w\-\.]+):\s(?P<result>PASS|pass|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index a13617775a3f8adaaff63a5919ebbae2720c33c5..01c5191eda53851095ba6334ba3f2bc982c5acbb 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -35,21 +35,26 @@ metadata:
 
 install:
   deps:
-  - busybox
-  - apertis-tests-apparmor-report
-  - apertis-tests-apparmor-tracker
-  - gir1.2-grilo-0.2
-  - gir1.2-tracker-1.0
-  - python3
-  - python3-gi
-  - wget
+    - busybox
+    - apertis-tests-apparmor-report
+    - apertis-tests-apparmor-tracker
+    - gir1.2-grilo-0.2
+    - gir1.2-tracker-1.0
+    - python3
+    - python3-gi
+    - wget
   steps:
-  - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
-  - mkdir -p /home/shared/
-  - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+    - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
+    - mkdir -p /home/shared/
+    - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following commands:"
     - echo -n | sudo tee /var/log/audit/audit.log
     - common/run-test-in-systemd --name run-test-tracker --timeout 3000 apparmor/tracker/test-tracker
diff --git a/test-cases/apparmor-utils.yaml b/test-cases/apparmor-utils.yaml
index 020f41c07e98a643c5aa0a09165f19583ddfad65..646f7dbf1a9dab113f0e3a9251dc3a37cb2b90e3 100644
--- a/test-cases/apparmor-utils.yaml
+++ b/test-cases/apparmor-utils.yaml
@@ -37,12 +37,17 @@ metadata:
 
 install:
   deps:
-  - apparmor-utils-tests
-  - busybox
-  - apertis-tests-apparmor-report
+    - apparmor-utils-tests
+    - busybox
+    - apertis-tests-apparmor-report
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Run the the following commands:"
     - echo -n | sudo tee /var/log/audit/audit.log
     - 'common/run-test-in-systemd --name=aa-enforce-test --timeout 90 -- sh /usr/lib/apparmor-utils-tests/aa-enforce-test.sh'
diff --git a/test-cases/check-tiny-system-containers.yaml b/test-cases/check-tiny-system-containers.yaml
index 68d54613c4037050f7fb04b6f1caac8f0447b71d..8a8a443642088f1cd950bcd580b2e9da55db42d5 100644
--- a/test-cases/check-tiny-system-containers.yaml
+++ b/test-cases/check-tiny-system-containers.yaml
@@ -15,16 +15,21 @@ metadata:
 
 install:
   deps:
-  - libpam-cgfs
-  - lxc
-  - lxc-templates
-  - uidmap
+    - libpam-cgfs
+    - lxc
+    - lxc-templates
+    - uidmap
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/tiny-image-recipes.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-system/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
-  - lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-system"
+    - "# Enter test directory:"
+    - cd tiny-image-recipes
+    - "# Execute the following commands:"
+    - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-system/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
+    - lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-system"
 
 parse:
   pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))"
diff --git a/test-cases/check-tiny-user-containers.yaml b/test-cases/check-tiny-user-containers.yaml
index ea30e345c183b6aae51d668799bcc0e08b6381e1..cc92aff0860c1c23c223badcb848282093492d9b 100644
--- a/test-cases/check-tiny-user-containers.yaml
+++ b/test-cases/check-tiny-user-containers.yaml
@@ -15,17 +15,22 @@ metadata:
 
 install:
   deps:
-  - libpam-cgfs
-  - lxc
-  - lxc-templates
-  - uidmap
+    - libpam-cgfs
+    - lxc
+    - lxc-templates
+    - uidmap
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/tiny-image-recipes.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - sysctl -w kernel.unprivileged_userns_clone=1
-  - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-userns/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
-  - sudo -u user -H lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-userns"
+    - "# Enter test directory:"
+    - cd tiny-image-recipes
+    - "# Execute the following commands:"
+    - sysctl -w kernel.unprivileged_userns_clone=1
+    - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-userns/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
+    - sudo -u user -H lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-userns"
 
 parse:
   pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))"
diff --git a/test-cases/sanity-check.yaml b/test-cases/sanity-check.yaml
index ad040da79b65370693a2f29125a545e85f6d2219..403c0e1b1dc0072327815ff711840f139c6d3ad5 100644
--- a/test-cases/sanity-check.yaml
+++ b/test-cases/sanity-check.yaml
@@ -59,8 +59,15 @@ metadata:
     - "This test must be executed in an image before running either automated or
        manual tests."
 
+install:
+  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/sanity-check