diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
index 96821beb8a..42019d9676 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
@@ -123,6 +123,7 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
         // are the same
         switch (getDialect()) {
             case ASE:
+            case CUBRID:
             case DERBY:
             case H2:
             case INGRES:
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
index 5b760bfab6..1c632218cb 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
@@ -43,6 +43,7 @@ import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.jooq.SQLDialect.ASE;
+import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DB2;
 import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.HSQLDB;
@@ -504,12 +505,17 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
                 sequences++;
 
                 // DB2 has an additional sequence for the T_TRIGGERS table
-                if (getDialect() == SQLDialect.DB2 ||
-                    getDialect() == SQLDialect.H2) {
+                if (getDialect() == DB2 ||
+                    getDialect() == H2) {
 
                     sequences++;
                 }
 
+                // CUBRID generates sequences for AUTO_INCREMENT columns
+                else if (getDialect() == CUBRID) {
+                    sequences += 3;
+                }
+
                 // Oracle has additional sequences for [#961]
                 else if (getDialect() == ORACLE) {
                     sequences += 5;
@@ -562,6 +568,7 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
 
             // [#986] Some foreign key name collision checks
             if (getDialect() == ASE ||
+                getDialect() == CUBRID ||
                 getDialect() == DB2 ||
                 getDialect() == POSTGRES ||
                 getDialect() == SQLITE ||
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
index a72cc02aa9..3899bd1f20 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -622,6 +622,7 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
     public void testMerge() throws Exception {
         switch (getDialect()) {
             case ASE:
+            case CUBRID:
             case DERBY:
             case H2:
             case INGRES:
diff --git a/jOOQ-test/src/org/jooq/test/cubrid/create.sql b/jOOQ-test/src/org/jooq/test/cubrid/create.sql
index 636e847f9b..a13cb5b846 100644
--- a/jOOQ-test/src/org/jooq/test/cubrid/create.sql
+++ b/jOOQ-test/src/org/jooq/test/cubrid/create.sql
@@ -276,7 +276,6 @@ CREATE TABLE t_986_2 (
 
 CREATE TABLE t_639_numbers_table (
   ID INT NOT NULL,
-  BYTE TINYINT NULL,
   "SHORT" SMALLINT NULL,
   "INTEGER" INT NULL,
   "LONG" BIGINT NULL,
diff --git a/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/T_639NumbersTable.java
index c5d76d78fe..e90926ece3 100644
--- a/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/T_639NumbersTable.java
@@ -8,7 +8,7 @@ package org.jooq.test.cubrid.generatedclasses.tables;
  */
 public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.cubrid.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = -918138381;
+	private static final long serialVersionUID = 450704777;
 
 	/**
 	 * The singleton instance of DBA.t_639_numbers_table
@@ -35,11 +35,6 @@ public class T_639NumbersTable extends org.jooq.impl.UpdatableTableImpl<org.jooq
 	 */
 	public static final org.jooq.TableField<org.jooq.test.cubrid.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Integer> ID = createField("id", org.jooq.impl.SQLDataType.INTEGER, T_639_NUMBERS_TABLE);
 
-	/**
-	 * An uncommented item
-	 */
-	public static final org.jooq.TableField<org.jooq.test.cubrid.generatedclasses.tables.records.T_639NumbersTableRecord, java.lang.Short> BYTE = createField("byte", org.jooq.impl.SQLDataType.SMALLINT, T_639_NUMBERS_TABLE);
-
 	/**
 	 * An uncommented item
 	 */
diff --git a/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/records/T_639NumbersTableRecord.java
index 0c8c8ee3ad..3c3d54a4e0 100644
--- a/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/records/T_639NumbersTableRecord.java
+++ b/jOOQ-test/src/org/jooq/test/cubrid/generatedclasses/tables/records/T_639NumbersTableRecord.java
@@ -8,7 +8,7 @@ package org.jooq.test.cubrid.generatedclasses.tables.records;
  */
 public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.cubrid.generatedclasses.tables.records.T_639NumbersTableRecord> {
 
-	private static final long serialVersionUID = 246731630;
+	private static final long serialVersionUID = -252235026;
 
 	/**
 	 * An uncommented item
@@ -28,20 +28,6 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl<o
 		return getValue(org.jooq.test.cubrid.generatedclasses.tables.T_639NumbersTable.ID);
 	}
 
-	/**
-	 * An uncommented item
-	 */
-	public void setByte(java.lang.Short value) {
-		setValue(org.jooq.test.cubrid.generatedclasses.tables.T_639NumbersTable.BYTE, value);
-	}
-
-	/**
-	 * An uncommented item
-	 */
-	public java.lang.Short getByte() {
-		return getValue(org.jooq.test.cubrid.generatedclasses.tables.T_639NumbersTable.BYTE);
-	}
-
 	/**
 	 * An uncommented item
 	 */