diff --git a/tracker/common.py b/tracker/common.py
index 14f35e5cf375fd7000f8a3cdb77391f784ef704f..28a7de69608e23715956dc13c28a678d0839f751 100644
--- a/tracker/common.py
+++ b/tracker/common.py
@@ -111,9 +111,13 @@ class TrackerIndexer():
         self.loop.run()
 
     def assert_indexed(self, path, extra=None):
+        # Select entries for the given URL. Also check that is has the
+        # tracker:extractor-data-source flag added by tracker-extract when
+        # metadata has been extracted.
         query = ('select ?urn where { '
                  '  ?urn nie:url "file://%s" ; '
-                 '  tracker:available true . ') % (path)
+                 '  tracker:available true ; '
+                 '  nie:dataSource tracker:extractor-data-source . ') % (path)
         if extra is not None:
             query += extra
         query += ' }'