diff --git a/lib/syskit/log/datastore/dataset.rb b/lib/syskit/log/datastore/dataset.rb
index 4383341..7859218 100644
--- a/lib/syskit/log/datastore/dataset.rb
+++ b/lib/syskit/log/datastore/dataset.rb
@@ -700,6 +700,9 @@ def roby
             #
             # @return [Pathname]
             def roby_sql_index_path
+                p = dataset_path + "roby.sql"
+                return p if p.exist?
+
                 cache_path + "roby.sql"
             end
 
diff --git a/test/datastore/import_test.rb b/test/datastore/import_test.rb
index 56b64bc..1d3a9c5 100644
--- a/test/datastore/import_test.rb
+++ b/test/datastore/import_test.rb
@@ -212,6 +212,7 @@ def tty_reporter
 
                     assert (imported.dataset_path + "roby.sql").exist?
                     assert index_path.exist?
+                    assert imported.roby_sql_index_path.exist?
 
                     index = Roby::DRoby::Logfile::Index.read(index_path)
                     assert index.valid_for?(log_path)