diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
index 9b9c74b944..905da3743d 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -47,6 +47,8 @@ import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
+import static org.jooq.SQLDialect.HSQLDB;
+// ...
 // ...
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.impl.DSL.count;
@@ -70,7 +72,6 @@ import org.jooq.Record2;
 import org.jooq.Record3;
 import org.jooq.Record6;
 import org.jooq.Result;
-import org.jooq.SQLDialect;
 import org.jooq.Select;
 import org.jooq.SelectQuery;
 import org.jooq.Table;
@@ -309,10 +310,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     @Test
     public void testNaturalJoin() throws Exception {
         boolean unqualified = false;
-        /* [pro] xx
-        xx xxxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxx
-            xxxxxxxxxxx x xxxxx
-        xx [/pro] */
+        if (asList(HSQLDB).contains(dialect().family()))
+            unqualified = true;
 
         Result<Record2<String, String>> result =
         create().select(TAuthor_LAST_NAME(), TBook_TITLE())
@@ -356,10 +355,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     @Test
     public void testJoinUsing() throws Exception {
         boolean unqualified = false;
-        /* [pro] xx
-        xx xxxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxx
-            xxxxxxxxxxx x xxxxx
-        xx [/pro] */
+        if (asList(HSQLDB).contains(dialect().family()))
+            unqualified = true;
 
         Result<Record2<String, String>> result =
         create().select(TAuthor_LAST_NAME(), TBook_TITLE())