diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
index 815207bc89..e2fb31a36e 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -755,6 +755,45 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         return create().selectFrom(TTriggers()).fetchOne(TTriggers_ID_GENERATED());
     }
 
+    @Test
+    public void testInsertReturningWithSetClause() throws Exception {
+        if (TTriggers() == null) {
+            log.info("SKIPPING", "INSERT RETURNING tests");
+            return;
+        }
+
+        jOOQAbstractTest.reset = false;
+
+        {
+            T result =
+            create().insertInto(TTriggers())
+                    .set(TTriggers_ID(), 1)
+                    .set(TTriggers_COUNTER(), 1)
+                    .returning()
+                    .fetchOne();
+
+            assertEquals(1, (int) result.getValue(TTriggers_ID()));
+            assertEquals(1, (int) result.getValue(TTriggers_ID_GENERATED()));
+            assertEquals(2, (int) result.getValue(TTriggers_COUNTER()));
+        }
+
+        {
+            T record = create().newRecord(TTriggers());
+            record.setValue(TTriggers_ID(), 2);
+            record.setValue(TTriggers_COUNTER(), 2);
+
+            T result =
+            create().insertInto(TTriggers())
+                    .set(record)
+                    .returning()
+                    .fetchOne();
+
+            assertEquals(2, (int) result.getValue(TTriggers_ID()));
+            assertEquals(2, (int) result.getValue(TTriggers_ID_GENERATED()));
+            assertEquals(4, (int) result.getValue(TTriggers_COUNTER()));
+        }
+    }
+
     @Test
     public void testInsertReturningWithCaseSensitiveColumns() throws Exception {
         if (CASE() == null) {
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 3b48f1746e..151b547021 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1756,6 +1756,11 @@ public abstract class jOOQAbstractTest<
         new InsertUpdateTests(this).testInsertReturning();
     }
 
+    @Test
+    public void testInsertReturningWithSetClause() throws Exception {
+        new InsertUpdateTests(this).testInsertReturningWithSetClause();
+    }
+
     @Test
     public void testInsertReturningWithCaseSensitiveColumns() throws Exception {
         new InsertUpdateTests(this).testInsertReturningWithCaseSensitiveColumns();