diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py
index 4fbad0774e..1164ee6014 100644
--- a/bitbake/lib/bb/tinfoil.py
+++ b/bitbake/lib/bb/tinfoil.py
@@ -104,6 +104,11 @@ class TinfoilDataStoreConnector:
         setattr(self, name, newfunc)
         return newfunc
 
+    def __iter__(self):
+        keys = self.tinfoil.run_command('dataStoreConnectorCmd', self.dsindex, "keys", [], {})
+        for k in keys:
+            yield k
+
 class TinfoilCookerAdapter:
     """
     Provide an adapter for existing code that expects to access a cooker object via Tinfoil,