diff --git a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py b/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py
index 730b7911c0..b802c8894f 100755
--- a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py
+++ b/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py
@@ -196,11 +196,11 @@ if __name__ == '__main__':
 
         file_list += build_file_list(
             file_path, logserver_prefix, swift_destination_prefix,
-            (not (args.no_indexes and args.no_dir_indexes))
+            (not (args.no_indexes or args.no_dir_indexes))
         )
 
     index_file = ''
-    if not (args.no_indexes and args.no_root_index):
+    if not (args.no_indexes or args.no_root_index):
         index_file = make_index_file(root_list, logserver_prefix,
                                      swift_destination_prefix)
         file_list.append({