Fix testJdbcDriver2 failure after merge.