diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index cf4c514a24..29a508f2a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -2277,7 +2277,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
     private static final Set<SQLDialect> NO_SUPPORT_UNION_PARENTHESES = SQLDialect.supportedBy(SQLITE);
     private static final Set<SQLDialect> UNION_PARENTHESIS = SQLDialect.supportedBy(DERBY, MARIADB, MYSQL);
-    private static final Set<SQLDialect> UNION_PARENTHESIS_IN_DERIVED_TABLES = SQLDialect.supportedBy(DERBY);
 
     final boolean hasUnions() {
         return !unionOp.isEmpty();
@@ -2334,9 +2333,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
             // [#2995] Ambiguity may need to be resolved when parentheses could mean both:
             //         Set op subqueries or insert column lists
             || TRUE.equals(ctx.data(DATA_INSERT_SELECT_WITHOUT_INSERT_COLUMN_LIST))
-
-            // [#7222] [#7711] Workaround for https://issues.apache.org/jira/browse/DERBY-6984
-            || (ctx.subquery() && UNION_PARENTHESIS_IN_DERIVED_TABLES.contains(ctx.dialect()))
             ;
 
         parensRequired |= derivedTable;
diff --git a/pom.xml b/pom.xml
index dd90560732..91cf5b31fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
         <!-- These in-memory DBs are used by jOOQ-meta-extensions and a variety of integration tests -->
         <h2.version>1.4.200</h2.version>
         <sqlite.version>3.30.1</sqlite.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.15.2.0</derby.version>
         <hsqldb.version>2.5.1</hsqldb.version>
 
         <!-- From JDK 11 onwards, we need to depend on the JAXB API explicitly -->