diff --git a/tools/test_api.py b/tools/test_api.py
index fd903bc2a0..0cd790d0c3 100644
--- a/tools/test_api.py
+++ b/tools/test_api.py
@@ -17,6 +17,7 @@ limitations under the License.
 Author: Przemyslaw Wirkus <Przemyslaw.wirkus@arm.com>
 """
 from __future__ import print_function
+import six
 
 import os
 import re
@@ -2126,12 +2127,12 @@ def find_tests(base_dir, target_name, toolchain_name, app_config=None):
 
     # Apply common directories
     for pred, path in commons:
-        for test_identity, test_paths in tests.iteritems():
+        for test_identity, test_paths in six.iteritems(tests):
             if pred(test_identity):
                 test_paths.append(path)
 
     # Drop identity besides name
-    return {name: paths for (name, _, _, _), paths in tests.iteritems()}
+    return {name: paths for (name, _, _, _), paths in six.iteritems(tests)}
 
 def print_tests(tests, format="list", sort=True):
     """Given a dictionary of tests (as returned from "find_tests"), print them