1 files changed, 8 insertions, 6 deletions
diff --git a/test/scanstatus.test b/test/scanstatus.test
index 46249f665..caad70c5b 100644
--- a/test/scanstatus.test
+++ b/test/scanstatus.test
@@ -36,7 +36,9 @@ proc do_scanstatus_test {tn res} {
   while {1} {
     set r [sqlite3_stmt_scanstatus $stmt $idx]
     if {[llength $r]==0} break
-    lappend ret {*}$r
+    foreach v {nLoop nVisit nEst zName zExplain} {
+      lappend ret $v [dict get $r $v]
+    }
     incr idx
   }
 
@@ -312,8 +314,8 @@ do_execsql_test 5.1.1 {
   SELECT count(*) FROM t1 WHERE a IN (SELECT b FROM t1 AS ii)
 } {2}
 do_scanstatus_test 5.1.2 { 
-  nLoop 1 nVisit 10 nEst 10.0 zName t1bc 
-  zExplain {SCAN ii USING COVERING INDEX t1bc}
+  nLoop 1 nVisit 10 nEst 10.0 zName t1
+  zExplain {SCAN ii}
   nLoop 1 nVisit 2 nEst 8.0 zName sqlite_autoindex_t1_1
   zExplain {SEARCH t1 USING COVERING INDEX sqlite_autoindex_t1_1 (a=?)}
 }
@@ -341,15 +343,15 @@ do_eqp_test 5.4.1 {
   SELECT count(*) FROM t1, t2 WHERE y = c;
 } {
   QUERY PLAN
-  |--SCAN t1 USING COVERING INDEX t1bc
+  |--SCAN t1
   `--SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)
 }
 do_execsql_test 5.4.2 {
   SELECT count(*) FROM t1, t2 WHERE y = c;
 } {200}
 do_scanstatus_test 5.4.3 { 
-  nLoop 1 nVisit 10 nEst 10.0 zName t1bc 
-  zExplain {SCAN t1 USING COVERING INDEX t1bc}
+  nLoop 1 nVisit 10 nEst 10.0 zName t1
+  zExplain {SCAN t1}
   nLoop 10 nVisit 200 nEst 56.0 zName t2xy 
   zExplain {SEARCH t2 USING COVERING INDEX t2xy (ANY(x) AND y=?)}
 }