diff --git a/scripts/suite_objects.py b/scripts/suite_objects.py
index 24b92488..4fac98b8 100755
--- a/scripts/suite_objects.py
+++ b/scripts/suite_objects.py
@@ -2485,7 +2485,9 @@ def write(self, outfile, host_arglist, indent, const_mod,
         call_vars = self.call_list.variable_list()
         self._ddt_library.write_ddt_use_statements(call_vars, outfile,
                                                    indent+1, pad=modmax)
-        decl_vars = [x[0] for x in subpart_allocate_vars.values()]
+        decl_vars = ([x[0] for x in subpart_allocate_vars.values()] +
+                     [x[0] for x in subpart_scalar_vars.values()] +
+                     [x[0] for x in subpart_optional_vars.values()])
         self._ddt_library.write_ddt_use_statements(decl_vars, outfile,
                                                    indent+1, pad=modmax)
         outfile.write('', 0)