diff --git a/test-cases/apparmor-basic-profiles.yaml b/test-cases/apparmor-basic-profiles.yaml
index d12ba9ec1f39321d5439f82b46e1033a7f99967c..a35592048225a75a522249dee26d5cb3032db6a0 100644
--- a/test-cases/apparmor-basic-profiles.yaml
+++ b/test-cases/apparmor-basic-profiles.yaml
@@ -12,8 +12,6 @@ metadata:
                 basic Apparmor profiles is part of strategic application and
                 services confinement."
 
-  macro_ostree_preconditions: apparmor-basic-profiles
-
   expected:
     - "The automated test should succeed:"
     - |
@@ -26,8 +24,15 @@ metadata:
         >>>> The following tests FAILED:
         [list of tests]
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor-basic-profiles.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apparmor-basic-profiles
     - "# Execute the following command:"
     - common/run-test-in-systemd --user=user --timeout=90 ./run-test.sh
 
diff --git a/test-cases/apparmor-chaiwala-system.yaml b/test-cases/apparmor-chaiwala-system.yaml
index df95f8a4574f792952afdb6c4b0b4ffb92273948..fb96a121f6f7fa7ee05d65e03df5632201272c10 100644
--- a/test-cases/apparmor-chaiwala-system.yaml
+++ b/test-cases/apparmor-chaiwala-system.yaml
@@ -10,8 +10,6 @@ metadata:
   description: "Test that AppArmor's system wide rules works according to Apertis
                 security goals (Chaiwala was an older codename for Apertis)."
 
-  macro_ostree_preconditions: apparmor-chaiwala-system
-
   expected:
     - "The run-test.sh script should return 0. The return value indicates the
        number of tests which failed. A similar output will be shown:"
@@ -25,8 +23,15 @@ metadata:
     - "This tests only check that system wide rules (not components ones) are
        correctly implemented."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor-chaiwala-system.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apparmor-chaiwala-system
     - "# Execute the following command:"
     - common/run-test-in-systemd --timeout=90 --basename ./run-test.sh
 
diff --git a/test-cases/apparmor-dbus.yaml b/test-cases/apparmor-dbus.yaml
index f8ca03d9644559f3bd8efd59835b2629905db3d1..b5457acbb21aafec4b653d5d59d471bb130ca582 100644
--- a/test-cases/apparmor-dbus.yaml
+++ b/test-cases/apparmor-dbus.yaml
@@ -10,8 +10,6 @@ metadata:
   description: "Security infrastructure: AppArmor D-Bus mediation is part of
                 strategic application and service confinement."
 
-  macro_ostree_preconditions: apparmor-dbus
-
   expected:
     - "The test should report pass and not fail:"
     - |
@@ -23,9 +21,17 @@ metadata:
     - "If you get a failure and need to report a bug please add the apparmor logs
        from sudo journalctl."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor-dbus.git
+      branch: master
+
 run:
   steps:
-  - LAUNCH_DBUS="no" common/run-aa-test ./dbus.expected ./dbus
+    - "# Enter test directory:"
+    - cd apparmor-dbus
+    - "# Execute the following command:"
+    - LAUNCH_DBUS="no" common/run-aa-test ./dbus.expected ./dbus
 
 parse:
   pattern: 'RESULT:(?P<result>\w+):(?P<test_case_id>[^:]+):'
diff --git a/test-cases/apparmor-pulseaudio.yaml b/test-cases/apparmor-pulseaudio.yaml
index efab7e15d7f03b18f39da31ff3e327a276ae8f2a..1733d439dd633918b675d24a3e3dc9e4501434f6 100644
--- a/test-cases/apparmor-pulseaudio.yaml
+++ b/test-cases/apparmor-pulseaudio.yaml
@@ -10,8 +10,6 @@ metadata:
   description: "Test that AppArmor profiles provided in PulseAudio work without
                 apparmor complaining."
 
-  macro_ostree_preconditions: apparmor-pulseaudio
-
   expected:
     - "Both tests should report pass and not fail:"
     - |
@@ -24,11 +22,17 @@ metadata:
     - "If you get a failure and need to report a bug please check journalctl, run
        the test case again, and add the logs you get to the bug report."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor-pulseaudio.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apparmor-pulseaudio
     - "# Execute the following command:"
     - common/run-test-in-systemd --name run-test-sh --timeout 90 ./run-test.sh
 
-
 parse:
   pattern: ^(?P<test_case_id>[\w\-\.]+):\s(?P<result>PASS|pass|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
diff --git a/test-cases/apparmor-tumbler.yaml b/test-cases/apparmor-tumbler.yaml
index 6359eff77c4d98b16b9b66fc7b09790790fc5340..d23cc86d1cd1f54e29224d54cecb334bc116e705 100644
--- a/test-cases/apparmor-tumbler.yaml
+++ b/test-cases/apparmor-tumbler.yaml
@@ -12,8 +12,6 @@ metadata:
                 that it does not allow arbitrary reading of files in the home
                 directory."
 
-  macro_ostree_preconditions: apparmor-tumbler
-
   expected:
     - "Both tests should report pass and not fail:"
     - |
@@ -25,9 +23,15 @@ metadata:
        determine whether they passed or fail."
     - "If you get a failure and need to report a bug please check journalctl, run
        the test case again, and add the logs you get to the bug report."
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor-tumbler.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apparmor-tumbler
     - "# Execute the following commands:"
     - common/run-test-in-systemd --name run-test-sh --timeout 900 ./run-test.sh