diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
index b2a68c0e48..d348815988 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
@@ -314,6 +314,27 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         assertEquals(Integer.valueOf(2), result.getValue(0, TBook_ID()));
         assertEquals(Integer.valueOf(3), result.getValue(1, TBook_ID()));
+    }
+
+    @Test
+    public void testLimitDistinct() throws Exception {
+
+        // [#2580] The various emulations using ROW_NUMBER() might be tricky when
+        // used with DISTINCT
+        assertEquals(1, (int)
+        create().selectDistinct(TBookToBookStore_BOOK_ID())
+                .from(TBookToBookStore())
+                .orderBy(TBookToBookStore_BOOK_ID())
+                .limit(1)
+                .fetchOne(TBookToBookStore_BOOK_ID()));
+
+        assertEquals(2, (int)
+        create().selectDistinct(TBookToBookStore_BOOK_ID())
+                .from(TBookToBookStore())
+                .orderBy(TBookToBookStore_BOOK_ID())
+                .limit(1)
+                .offset(1)
+                .fetchOne(TBookToBookStore_BOOK_ID()));
     }
 
     @Test
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 806cddee75..29eaa3d33e 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1802,11 +1802,16 @@ public abstract class jOOQAbstractTest<
     public void testOrderByAndLimit() throws Exception {
         new OrderByTests(this).testOrderByAndLimit();
     }
-
-    @Test
-    public void testLimit() throws Exception {
-        new OrderByTests(this).testLimit();
-    }
+
+    @Test
+    public void testLimit() throws Exception {
+        new OrderByTests(this).testLimit();
+    }
+
+    @Test
+    public void testLimitDistinct() throws Exception {
+        new OrderByTests(this).testLimitDistinct();
+    }
 
     @Test
     public void testLimitAliased() throws Exception {