diff --git a/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/Catalog.java b/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/Catalog.java
index a12b38a1..304f9e36 100644
--- a/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/Catalog.java
+++ b/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/Catalog.java
@@ -68,8 +68,6 @@ public interface Catalog extends DataRepository<Product, String> {
 
     int countByPriceGreaterThanEqual(Double price);
 
-    int countBySurgePriceGreaterThanEqual(Double price);
-
     @Query("WHERE LENGTH(name) = ?1 AND price < ?2 ORDER BY name")
     List<Product> findByNameLengthAndPriceBelow(int nameLength, double maxPrice);
 
diff --git a/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/PersistenceEntityTests.java b/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/PersistenceEntityTests.java
index 8dc75de0..c9b2d2ba 100644
--- a/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/PersistenceEntityTests.java
+++ b/tck/src/main/java/ee/jakarta/tck/data/standalone/persistence/PersistenceEntityTests.java
@@ -31,7 +31,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
 
 import ee.jakarta.tck.data.framework.junit.anno.Assertion;
 import ee.jakarta.tck.data.framework.junit.anno.Persistence;
@@ -41,7 +40,6 @@
 import jakarta.data.Order;
 import jakarta.data.Sort;
 import jakarta.data.exceptions.EntityExistsException;
-import jakarta.data.exceptions.MappingException;
 import jakarta.data.exceptions.OptimisticLockingFailureException;
 import jakarta.inject.Inject;
 
@@ -151,10 +149,6 @@ public void testNotRunOnNOSQL() {
         int countExpensive = catalog.countByPriceGreaterThanEqual(2.99);
         assertEquals(2, countExpensive, "Expected two products to be more than 3.00");
         
-        Assertions.assertThrows(MappingException.class, () -> {
-            catalog.countBySurgePriceGreaterThanEqual(2.99);
-        });
-
         assertEquals(5L, catalog.deleteByProductNumLike("TEST-PROD-%"));
     }