diff --git a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
index c837d7ee1..20197ef96 100644
--- a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
+++ b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
@@ -524,10 +524,12 @@ class TestDeployUndercloud(TestPluginV1):
             mock_process_hiera, mock_open, mock_os, mock_yaml_dump,
             mock_yaml_load, mock_time):
 
-        parsed_args = self.check_parser(self.cmd,
-                                        ['--local-ip', '127.0.0.1/8',
-                                         '--templates', 'tht_from',
-                                         '--output-dir', 'tht_to'], [])
+        parsed_args = self.check_parser(
+            self.cmd, ['--local-ip', '127.0.0.1/8',
+                       '--templates', 'tht_from',
+                       '--output-dir', 'tht_to',
+                       '--roles-file', '/roles_file,yaml',
+                       '--networks-file', '/networks_file.yaml'], [])
         dropin = 'tht_from/standalone-stack-vstate-dropin.yaml'
         self.cmd.output_dir = 'tht_to'
         self.cmd.tht_render = 'tht_from'
diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py
index 1ca0b4e43..d4a35d1f4 100644
--- a/tripleoclient/utils.py
+++ b/tripleoclient/utils.py
@@ -1773,15 +1773,11 @@ def jinja_render_files(log, templates, working_dir,
         templates, 'tools/process-templates.py')
     args = [python_cmd, process_templates]
 
-    if roles_file:
-        roles_file_path = get_roles_file_path(
-            roles_file, base_path)
-        args.extend(['--roles-data', roles_file_path])
+    roles_file_path = get_roles_file_path(roles_file, base_path)
+    args.extend(['--roles-data', roles_file_path])
 
-    if networks_file:
-        networks_file_path = get_networks_file_path(
-            networks_file, base_path)
-        args.extend(['--network-data', networks_file_path])
+    networks_file_path = get_networks_file_path(networks_file, base_path)
+    args.extend(['--network-data', networks_file_path])
 
     if base_path:
         args.extend(['-p', base_path])