Index: test/cursorhint2.test
==================================================================
--- test/cursorhint2.test
+++ test/cursorhint2.test
@@ -89,13 +89,13 @@
   SELECT * FROM t1 LEFT JOIN t2 ON (a=c) LEFT JOIN t3 ON (d=f);
 } {
   t2 {EQ(r[2],c0)} t3 {EQ(r[6],c1)}
 }
 
-do_extract_hints_test 1.6 {
+do_extract_hints_test 1.7 {
   SELECT * FROM t1 LEFT JOIN t2 ON (a=c AND d=e) LEFT JOIN t3 ON (d=f);
 } {
   t2 {EQ(r[2],c0)} t3 {EQ(r[6],c1)}
 }
 
 finish_test
 

Index: test/where3.test
==================================================================
--- test/where3.test
+++ test/where3.test
@@ -43,11 +43,11 @@
     
     SELECT * FROM t1, t2 LEFT JOIN t3 ON q=x WHERE p=2 AND a=q;
   }
 } {222 two 2 222 {} {}}
 
-ifcapable explain {
+ifcapable explain&&!cursorhints {
   do_test where3-1.1.1 {
      explain_no_trace {SELECT * FROM t1, t2 LEFT JOIN t3 ON q=x
                         WHERE p=2 AND a=q}
   } [explain_no_trace {SELECT * FROM t1, t2 LEFT JOIN t3 ON x=q
                         WHERE p=2 AND a=q}]
@@ -84,11 +84,11 @@
     LEFT OUTER JOIN child1 ON child1.child1key = parent1.child1key
     INNER JOIN child2 ON child2.child2key = parent1.child2key;
   }
 } {1 {Value for C1.1} {Value for C2.1} 2 {} {Value for C2.2} 3 {Value for C1.3} {Value for C2.3}}
 
-ifcapable explain {
+ifcapable explain&&!cursorhints {
   do_test where3-1.2.1 {
      explain_no_trace {
        SELECT parent1.parent1key, child1.value, child2.value
        FROM parent1
        LEFT OUTER JOIN child1 ON child1.child1key = parent1.child1key