diff --git a/test-cases/abstract-contact-addressbook-creation.yaml b/test-cases/abstract-contact-addressbook-creation.yaml
index 90a396859328e612fbbfb459550882b643bede70..2e39cb813eb76f39d58d87c08853763b6225cc5a 100644
--- a/test-cases/abstract-contact-addressbook-creation.yaml
+++ b/test-cases/abstract-contact-addressbook-creation.yaml
@@ -19,11 +19,16 @@ metadata:
 
 install:
   deps:
-  - syncevolution
-  - uuid-runtime
+    - syncevolution
+    - uuid-runtime
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "common/run-test-in-systemd --user=user --timeout=900 folks/create-abstract-sync-database.sh"
 
 parse:
diff --git a/test-cases/folks-alias-persistence.yaml b/test-cases/folks-alias-persistence.yaml
index 35fcd32ba10d6909a6ecc3288ad7bbccd6fb4a58..288a26862bb1cd614c93b741b20ef25156dbe921 100644
--- a/test-cases/folks-alias-persistence.yaml
+++ b/test-cases/folks-alias-persistence.yaml
@@ -14,16 +14,21 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - folks-tools
-  - syncevolution
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+    - folks-tools
+    - syncevolution
+  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 --timeout=900 folks/folks-alias-persistence.sh"
 
diff --git a/test-cases/folks-eds-compatibility.yaml b/test-cases/folks-eds-compatibility.yaml
index 38cb2ec72309e0c78490bfb0d389ba67d00cec7d..998bc45034bc4ac07e01f92b4589be0536b340b4 100644
--- a/test-cases/folks-eds-compatibility.yaml
+++ b/test-cases/folks-eds-compatibility.yaml
@@ -16,16 +16,21 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - folks-tools
-  - syncevolution
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+    - folks-tools
+    - syncevolution
+  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 --timeout=900 folks/folks-eds-compatibility.sh"
 
diff --git a/test-cases/folks-metacontacts-antilinking.yaml b/test-cases/folks-metacontacts-antilinking.yaml
index 989d001914a5e93215a5f74a13d504abc65d3009..9146adc561d1e97847bf6e0551b0de33fc8effb0 100644
--- a/test-cases/folks-metacontacts-antilinking.yaml
+++ b/test-cases/folks-metacontacts-antilinking.yaml
@@ -14,15 +14,20 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - folks-tools
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+    - folks-tools
+  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 --timeout=900 folks/folks-metacontacts-antilinking.sh"
 
diff --git a/test-cases/folks-metacontacts-linking.yaml b/test-cases/folks-metacontacts-linking.yaml
index 0bb5e6807571bd23a769b8a4c4d1c53d76927c74..98677d52530231671f21ddfbb6e948682688a573 100644
--- a/test-cases/folks-metacontacts-linking.yaml
+++ b/test-cases/folks-metacontacts-linking.yaml
@@ -14,16 +14,21 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - folks-tools
-  - syncevolution
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+    - folks-tools
+    - syncevolution
+  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 --timeout=900 folks/folks-metacontacts-linking.sh"
 
diff --git a/test-cases/folks-metacontacts-unlinking.yaml b/test-cases/folks-metacontacts-unlinking.yaml
index 43f8e3ae6dc6936197c3c6bdaa5df919fb574435..f44467b8c357079ead163aa6fa7468990b365cc8 100644
--- a/test-cases/folks-metacontacts-unlinking.yaml
+++ b/test-cases/folks-metacontacts-unlinking.yaml
@@ -14,16 +14,21 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - folks-tools
-  - syncevolution
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+    - folks-tools
+    - syncevolution
+  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 --timeout=900 folks/folks-metacontacts-unlinking.sh"
 
diff --git a/test-cases/folks-search-contacts.yaml b/test-cases/folks-search-contacts.yaml
index 1b64e59eae20ed1ef592da80d71c67d59859dd8b..fe4c57608470abefdc1bb5a4ef2d72e0ca989f4b 100644
--- a/test-cases/folks-search-contacts.yaml
+++ b/test-cases/folks-search-contacts.yaml
@@ -14,16 +14,21 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - folks-tools
-  - syncevolution
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+    - folks-tools
+    - syncevolution
+  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 --timeout=900 folks/folks-search-contacts.sh
 
diff --git a/test-cases/frome.yaml b/test-cases/frome.yaml
index 809f66eb02c6e4c7846bd429134a9cf7af30db8a..497b8c8d3942ff8e249fbd531559e70273e9871b 100644
--- a/test-cases/frome.yaml
+++ b/test-cases/frome.yaml
@@ -21,20 +21,25 @@ metadata:
 
 install:
   deps:
-  - devscripts
-  - frome-tests
-  - gnome-desktop-testing
-  - python3-debian
+    - devscripts
+    - frome-tests
+    - gnome-desktop-testing
+    - python3-debian
   steps:
-  # Download in /tmp directory
-  - cd /tmp/
-  - apt source frome
-  - chown user:user -R /tmp/frome-*
+    # Download in /tmp directory
+    - cd /tmp/
+    - apt source frome
+    - chown user:user -R /tmp/frome-*
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - common/run-test-in-systemd --timeout=900 --chdir /tmp/frome-* --user=user --name=frome -- sadt --verbose
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - common/run-test-in-systemd --timeout=900 --chdir /tmp/frome-* --user=user --name=frome -- sadt --verbose
 
 parse:
   pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'
diff --git a/test-cases/newport.yaml b/test-cases/newport.yaml
index 348be88cc09ee7c67de2c9a8c3458ce92c59c5ec..d63813c26c542bcc23e151763b740b0c030b6d1a 100644
--- a/test-cases/newport.yaml
+++ b/test-cases/newport.yaml
@@ -14,11 +14,16 @@ metadata:
 
 install:
   deps:
-  - gnome-desktop-testing
-  - newport-tests
+    - gnome-desktop-testing
+    - newport-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 --timeout=900 --name=newport gnome-desktop-testing-runner newport
 
diff --git a/test-cases/ribchester.yaml b/test-cases/ribchester.yaml
index 63a05e02edb7f78a9be276a1951e7de5ab7b7681..c93293c38d8dc1bd23838512c65ee52a19c42414 100644
--- a/test-cases/ribchester.yaml
+++ b/test-cases/ribchester.yaml
@@ -21,20 +21,25 @@ metadata:
 
 install:
   deps:
-  - build-essential
-  - devscripts
-  - gnome-desktop-testing
-  - python3-debian
-  - ribchester-dev
-  - ribchester-tests
+    - build-essential
+    - devscripts
+    - gnome-desktop-testing
+    - python3-debian
+    - ribchester-dev
+    - ribchester-tests
   steps:
-  # Download in /tmp directory
-  - cd /tmp/
-  - apt source ribchester
-  - chown user:user -R /tmp/ribchester-*
+    # Download in /tmp directory
+    - cd /tmp/
+    - apt source ribchester
+    - chown user:user -R /tmp/ribchester-*
+  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 --timeout=900 --chdir /tmp/ribchester-* --user=user --name=ribchester -- sadt --verbose
 
diff --git a/test-cases/traprain.yaml b/test-cases/traprain.yaml
index 35cc1a84bf0fbc4519f50c46e972fd26d3a5b1cf..261d2f0b0ddae0ec3f302fc9dcb0994cd0a6ee42 100644
--- a/test-cases/traprain.yaml
+++ b/test-cases/traprain.yaml
@@ -21,20 +21,25 @@ metadata:
 
 install:
   deps:
-  - devscripts
-  - gnome-desktop-testing
-  - libtraprain-0-tests
-  - python3-debian
+    - devscripts
+    - gnome-desktop-testing
+    - libtraprain-0-tests
+    - python3-debian
   steps:
-  # Download in /tmp directory
-  - cd /tmp/
-  - apt source traprain
-  - chown user:user -R /tmp/traprain-*
+    # Download in /tmp directory
+    - cd /tmp/
+    - apt source traprain
+    - chown user:user -R /tmp/traprain-*
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - common/run-test-in-systemd --timeout=900 --chdir /tmp/traprain-* --user=user --name=traprain -- sadt --verbose
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - common/run-test-in-systemd --timeout=900 --chdir /tmp/traprain-* --user=user --name=traprain -- sadt --verbose
 
 parse:
   pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'