diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
index 87bfc172a5..ae9f349011 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
@@ -87,22 +87,26 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
         super(delegate);
     }
 
+    @Test
+    public void testEmptyGrouping() throws Exception {
+
+        // [#1665] Test the empty GROUP BY clause
+        assertEquals(1, (int) create().selectOne()
+            .from(TBook())
+            .groupBy()
+            .fetchOne(0, Integer.class));
+
+        // [#1665] Test the empty GROUP BY clause
+        assertEquals(1, (int) create().selectOne()
+            .from(TBook())
+            .groupBy()
+            .having("1 = 1")
+            .fetchOne(0, Integer.class));
+    }
+
     @Test
     public void testGrouping() throws Exception {
 
-        // [#1665] Test the empty GROUP BY clause
-        assertEquals(1, (int) create().selectOne()
-                                      .from(TBook())
-                                      .groupBy()
-                                      .fetchOne(0, Integer.class));
-
-        // [#1665] Test the empty GROUP BY clause
-        assertEquals(1, (int) create().selectOne()
-                                      .from(TBook())
-                                      .groupBy()
-                                      .having("1 = 1")
-                                      .fetchOne(0, Integer.class));
-
         // Test a simple group by query
         Field<Integer> count = count().as("c");
         Result<Record> result = create()
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 37fc8cb2d9..07690e6308 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1076,6 +1076,11 @@ public abstract class jOOQAbstractTest<
         new ThreadSafetyTests(this).testConcurrentExecution();
     }
 
+    @Test
+    public void testEmptyGrouping() throws Exception {
+        new GroupByTests(this).testEmptyGrouping();
+    }
+
     @Test
     public void testGrouping() throws Exception {
         new GroupByTests(this).testGrouping();