diff --git a/tools/test.py b/tools/test.py
index 05cd9243449d27..6e1840b7672006 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -42,6 +42,7 @@
 import utils
 import multiprocessing
 import errno
+import copy
 
 from os.path import join, dirname, abspath, basename, isdir, exists
 from datetime import datetime
@@ -792,7 +793,9 @@ def AddTestsToList(self, result, current_path, path, context, arch, mode):
       tests = self.GetConfiguration(context).ListTests(current_path, path,
                                                        arch, mode)
       for t in tests: t.variant_flags = v
-      result += tests * context.repeat
+      result += tests
+      for i in range(1, context.repeat):
+        result += copy.deepcopy(tests)
 
   def GetTestStatus(self, context, sections, defs):
     self.GetConfiguration(context).GetTestStatus(sections, defs)