diff --git a/driver/src/test/java/com/arangodb/ArangoSearchAsyncTest.java b/driver/src/test/java/com/arangodb/ArangoSearchAsyncTest.java
index 39aa7ca2e..a24dbc837 100644
--- a/driver/src/test/java/com/arangodb/ArangoSearchAsyncTest.java
+++ b/driver/src/test/java/com/arangodb/ArangoSearchAsyncTest.java
@@ -716,9 +716,8 @@ void arangoSearchOptions(ArangoDatabaseAsync db) throws ExecutionException, Inte
             assertThat(nested.getName()).isEqualTo("f2");
         }
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
         }
 
     }
diff --git a/driver/src/test/java/com/arangodb/ArangoSearchTest.java b/driver/src/test/java/com/arangodb/ArangoSearchTest.java
index a4216477b..c3f84297f 100644
--- a/driver/src/test/java/com/arangodb/ArangoSearchTest.java
+++ b/driver/src/test/java/com/arangodb/ArangoSearchTest.java
@@ -715,9 +715,8 @@ void arangoSearchOptions(ArangoDatabase db) {
             assertThat(nested.getName()).isEqualTo("f2");
         }
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
         }
 
     }
diff --git a/driver/src/test/java/com/arangodb/InvertedIndexAsyncTest.java b/driver/src/test/java/com/arangodb/InvertedIndexAsyncTest.java
index c3ecf32a8..fe9620264 100644
--- a/driver/src/test/java/com/arangodb/InvertedIndexAsyncTest.java
+++ b/driver/src/test/java/com/arangodb/InvertedIndexAsyncTest.java
@@ -147,9 +147,8 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI
         assertThat(indexResult.getCache()).isEqualTo(options.getCache());
         assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
         }
     }
 
diff --git a/driver/src/test/java/com/arangodb/InvertedIndexTest.java b/driver/src/test/java/com/arangodb/InvertedIndexTest.java
index e5562f299..7476b4c4f 100644
--- a/driver/src/test/java/com/arangodb/InvertedIndexTest.java
+++ b/driver/src/test/java/com/arangodb/InvertedIndexTest.java
@@ -146,9 +146,8 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI
         assertThat(indexResult.getCache()).isEqualTo(options.getCache());
         assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
         }
     }