diff --git a/atc_renderer/renderer.py b/atc_renderer/renderer.py
index 9fc8457ddeaf8461eaa46b2b4e2ca299bf588e78..385a3c5f5b019e6d3baf71b9b8095819ac202f28 100644
--- a/atc_renderer/renderer.py
+++ b/atc_renderer/renderer.py
@@ -149,13 +149,16 @@ def get_template_values(testcase_data):
 
     # If the test is automated, it should always have 'install:git-repos'
     install = testcase_data.get('install')
-    if is_automated and install:
+    if install:
         git_repos = install.get('git-repos', [])
         git_repo_url, git_repo_branch = None, None
         for gr in git_repos:
             git_repo_url, git_repo_branch = gr.get('url'), gr.get('branch')
-            if not git_repo_url or not git_repo_branch:
-                print("Error: missing mandatory field git-repos:url/branch for " \
+            if not git_repo_url:
+                print("Error: missing mandatory field git-repos:url")
+                exit(1)
+            if is_automated and not git_repo_branch:
+                print("Error: missing mandatory field git-repos:branch for " \
                       "automated tests")
                 exit(1)