diff --git a/atc_renderer/parser.py b/atc_renderer/parser.py
index d11a6e31a952761373b89e50ab2299dc4d3081ca..76a3a45425ced5d9e1a03e8c9908d7043bb40741 100644
--- a/atc_renderer/parser.py
+++ b/atc_renderer/parser.py
@@ -51,9 +51,7 @@ test_case_format = {
         'post-conditions': (False, [])
     }),
     'install': (False, {
-        # git-repos should be mandatory.
-        # TODO: Set to True once all test cases use git-repos
-        'git-repos' : (False, []),
+        'git-repos' : (True, []),
         'deps': (False, [])
     }),
     'run': (True, {
diff --git a/atc_renderer/renderer.py b/atc_renderer/renderer.py
index bf77be173d75e27bae37d6d1925f2b4271091a13..c05dd7ada1d23f7c808845666f132f9144c14656 100644
--- a/atc_renderer/renderer.py
+++ b/atc_renderer/renderer.py
@@ -82,7 +82,6 @@ def priority_color(priority):
         (priority == 'critical' and 'danger')    or 'light'
 
 def get_git_repo_dir(git_repo=None):
-    # TODO: Remove this `if` once all test cases use git-repos.
     if git_repo:
         try:
             return os.path.splitext(os.path.split(git_repo)[1])[0]
diff --git a/atc_renderer/tests_files/test_file5.html b/atc_renderer/tests_files/test_file5.html
index cef58ec9723f613b4f69ab551d32e4929e0a09bb..5cda47dacd8f9d67d9192ac87de9395da34bcfd8 100644
--- a/atc_renderer/tests_files/test_file5.html
+++ b/atc_renderer/tests_files/test_file5.html
@@ -20,7 +20,7 @@
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Type:</dt>
-	    <dd class="col-sm-9">functional</dd>
+	    <dd class="col-sm-9">unit</dd>
 	  </dl>
 
       <h4>Description</h4>
@@ -48,6 +48,14 @@
   <p><kbd>$ chown user:user -R /tmp/ribchester-*</kbd></p>
 
       
+  <li class="mb-sm-2">Clone the tests repository from another computer <i>(Note that the branch being tested may change depending on the release, please make sure to clone the correct branch for the release in question)</i>:</li>
+  <p><kbd>$ git clone --branch master https://gitlab.apertis.org/infrastructure/apertis-tests.git</kbd></p>
+  <li class="mb-sm-2">Copy the test directory apertis-tests to the target device:</li>
+  <p><kbd>$ DUT_IP=&ltdevice-ip&gt</kbd></p>
+  <p><kbd>$ scp -r apertis-tests user@$DUT_IP:</kbd></p>
+  <li class="mb-sm-2">Log into the target device:</li>
+  <p><kbd>$ ssh user@$DUT_IP</kbd></p>
+
       
       </ol>
       
@@ -56,6 +64,14 @@
       <h4>Execution Steps</h4>
       <ol>
       
+      <li class="mb-sm-2"> Enter test directory:</li>
+      
+      
+      
+      
+      <p><kbd>$ cd apertis-tests</kbd></p>
+      
+      
       <li class="mb-sm-2"> Execute the following command:</li>
       
       
diff --git a/atc_renderer/tests_files/test_file5.yaml b/atc_renderer/tests_files/test_file5.yaml
index 42f26712a4ef0a867a1e2b8f11151065d050bf21..c93293c38d8dc1bd23838512c65ee52a19c42414 100644
--- a/atc_renderer/tests_files/test_file5.yaml
+++ b/atc_renderer/tests_files/test_file5.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-type: any
   image-arch: any
-  type: functional
+  type: unit
   exec-type: automated
   priority: critical
   maintainer: "Apertis Project"
@@ -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