diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/DeleteUpdateWhereAnalyzerTest.java b/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/DeleteUpdateWhereAnalyzerTest.java
index 6f7e4ffac6..66ccf05811 100644
--- a/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/DeleteUpdateWhereAnalyzerTest.java
+++ b/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/DeleteUpdateWhereAnalyzerTest.java
@@ -33,85 +33,10 @@ private TestDataNames names() {
   // reading)
   // ==================================================================================================================
 
-  private static Stream<Arguments> emptyFilterTests() {
-    return Stream.of(
-        Arguments.of(
-            StatementType.DELETE_ONE, FilterException.Code.MISSING_FILTER_FOR_UPDATE_DELETE),
-        Arguments.of(
-            StatementType.DELETE_MANY, FilterException.Code.MISSING_FILTER_FOR_UPDATE_DELETE),
-        Arguments.of(
-            StatementType.UPDATE_ONE, FilterException.Code.MISSING_FILTER_FOR_UPDATE_DELETE));
-  }
-
-  @ParameterizedTest
-  @MethodSource("emptyFilterTests")
-  public void emptyFilter(StatementType statementType, FilterException.Code expectedCode) {
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "emptyFilter() for %s".formatted(statementType), statementType);
-    fixture.analyzeMaybeFilterError(expectedCode);
-  }
-
-  private static Stream<Arguments> eqAllPrimaryKeysTests() {
-    return Stream.of(
-        Arguments.of(StatementType.DELETE_ONE, null),
-        Arguments.of(StatementType.DELETE_MANY, null),
-        Arguments.of(StatementType.UPDATE_ONE, null));
-  }
-
-  @ParameterizedTest
-  @MethodSource("eqAllPrimaryKeysTests")
-  public void eqAllPrimaryKeys(StatementType statementType, FilterException.Code expectedCode) {
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "eqAllPrimaryKeys() for %s".formatted(statementType), statementType);
-    fixture.expression().eqAllPrimaryKeys().analyzeMaybeFilterError(expectedCode);
-  }
-
   // ==================================================================================================================
   // NON PK COLUMNS - INDEXED AND UNINDEXED
   // ==================================================================================================================
 
-  private static Stream<Arguments> eqOnNonPrimaryKeyOrIndexedTests() {
-    return Stream.of(
-        Arguments.of(
-            StatementType.DELETE_ONE,
-            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE),
-        Arguments.of(
-            StatementType.DELETE_MANY,
-            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE),
-        Arguments.of(
-            StatementType.UPDATE_ONE,
-            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE));
-  }
-
-  @ParameterizedTest
-  @MethodSource("eqOnNonPrimaryKeyOrIndexedTests")
-  public void eqOnNonPrimaryKeyOrIndexed(
-      StatementType statementType, FilterException.Code expectedCode) {
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "eqOnNonPrimaryKeyOrIndexed() for %s".formatted(statementType), statementType);
-    fixture.expression().eqFirstNonPKOrIndexed().analyzeMaybeFilterError(expectedCode);
-  }
-
-  @ParameterizedTest
-  @MethodSource("eqOnNonPrimaryKeyOrIndexedTests") // deliberately reusing the same test data
-  public void eqOnIndexed(StatementType statementType, FilterException.Code expectedCode) {
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "eqOnIndexed() for %s".formatted(statementType), statementType);
-    fixture.expression().eqOn(names().COL_INDEXED_1).analyzeMaybeFilterError(expectedCode);
-  }
-
   // ==================================================================================================================
   // PARTITION KEY - PARTIAL PARTITION KEY
   // ==================================================================================================================
diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/SelectWhereAnalyzerTest.java b/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/SelectWhereAnalyzerTest.java
index e35435bbfa..a300c59dc3 100644
--- a/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/SelectWhereAnalyzerTest.java
+++ b/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/SelectWhereAnalyzerTest.java
@@ -30,81 +30,10 @@ private static TestDataNames names() {
   // (there are a number of combinations to test, pls keep organised into sections for easier
   // reading)
   // ==================================================================================================================
-
-  @Test
-  public void emptyFilter() {
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "emptyFilter()", WhereCQLClauseAnalyzer.StatementType.SELECT);
-    fixture
-        .analyze()
-        .assertAllowFilteringEnabled()
-        .assertOneWarning(WarningException.Code.ZERO_FILTER_OPERATIONS);
-  }
-
-  @Test
-  public void eqAllPrimaryKeys() {
-
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "eqAllPrimaryKeys()", WhereCQLClauseAnalyzer.StatementType.SELECT);
-    fixture.expression().eqAllPrimaryKeys().analyze().assertNoFilteringNoWarnings();
-  }
-
   // ==================================================================================================================
   // NON PK COLUMNS - INDEXED AND UNINDEXED
   // ==================================================================================================================
 
-  @Test
-  public void oneIndexed() {
-
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index("oneIndexed()", WhereCQLClauseAnalyzer.StatementType.SELECT);
-    fixture.expression().eqOn(names().COL_INDEXED_1).analyze().assertNoFilteringNoWarnings();
-  }
-
-  @Test
-  public void oneIndexedOneRegular() {
-
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index(
-                "oneIndexedOneRegular()", WhereCQLClauseAnalyzer.StatementType.SELECT);
-
-    fixture
-        .expression()
-        .eqOn(names().COL_INDEXED_1)
-        .expression()
-        .eqOn(names().COL_REGULAR_1)
-        .analyze()
-        .assertAllowFilteringEnabled()
-        .assertOneWarning(WarningException.Code.MISSING_INDEX)
-        .assertWarnOnUnindexedColumns(names().COL_REGULAR_1);
-  }
-
-  @Test
-  public void oneRegular() {
-
-    var fixture =
-        TEST_DATA
-            .whereAnalyzer()
-            .table2PK3Clustering1Index("oneRegular()", WhereCQLClauseAnalyzer.StatementType.SELECT);
-    fixture
-        .expression()
-        .eqOn(names().COL_REGULAR_1)
-        .analyze()
-        .assertAllowFilteringEnabled()
-        .assertOneWarning(WarningException.Code.MISSING_INDEX)
-        .assertWarnOnUnindexedColumns(names().COL_REGULAR_1);
-  }
-
   // ==================================================================================================================
   // NOT EQUAL OPERATIONS - INDEXED AND UNINDEXED
   // ==================================================================================================================
diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/WhereAnalyzerTest.java b/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/WhereAnalyzerTest.java
new file mode 100644
index 0000000000..47660f4808
--- /dev/null
+++ b/src/test/java/io/stargate/sgv2/jsonapi/service/operation/tables/WhereAnalyzerTest.java
@@ -0,0 +1,195 @@
+package io.stargate.sgv2.jsonapi.service.operation.tables;
+
+import io.stargate.sgv2.jsonapi.exception.FilterException;
+import io.stargate.sgv2.jsonapi.exception.WarningException;
+import io.stargate.sgv2.jsonapi.fixtures.testdata.TestData;
+import io.stargate.sgv2.jsonapi.fixtures.testdata.TestDataNames;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Tests for the {@link WhereCQLClauseAnalyzer} Testing the paths for select, delete one, delete
+ * many, and update one.
+ */
+public class WhereAnalyzerTest {
+
+  private static final TestData TEST_DATA = new TestData();
+
+  private TestDataNames names() {
+    return TEST_DATA.names;
+  }
+
+  // ==================================================================================================================
+  // EASY CASES
+  // (there are a number of combinations to test, pls keep organised into sections for easier
+  // reading)
+  // ==================================================================================================================
+
+  private static Stream<Arguments> emptyFilterTests() {
+    return Stream.of(
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.SELECT,
+            WarningException.Code.ZERO_FILTER_OPERATIONS,
+            null),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.DELETE_ONE,
+            null,
+            FilterException.Code.MISSING_FILTER_FOR_UPDATE_DELETE),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.DELETE_MANY,
+            null,
+            FilterException.Code.MISSING_FILTER_FOR_UPDATE_DELETE),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.UPDATE_ONE,
+            null,
+            FilterException.Code.MISSING_FILTER_FOR_UPDATE_DELETE));
+  }
+
+  @ParameterizedTest
+  @MethodSource("emptyFilterTests")
+  public void emptyFilter(
+      WhereCQLClauseAnalyzer.StatementType statementType,
+      WarningException.Code expectedWarningCode,
+      FilterException.Code expectedFilterCode) {
+    var fixture =
+        TEST_DATA
+            .whereAnalyzer()
+            .table2PK3Clustering1Index(
+                "emptyFilter() for %s".formatted(statementType), statementType);
+
+    if (statementType == WhereCQLClauseAnalyzer.StatementType.SELECT) {
+      fixture.analyze().assertAllowFilteringEnabled().assertOneWarning(expectedWarningCode);
+    } else {
+      fixture.analyzeMaybeFilterError(expectedFilterCode);
+    }
+  }
+
+  private static Stream<Arguments> eqAllPrimaryKeysTests() {
+    return Stream.of(
+        Arguments.of(WhereCQLClauseAnalyzer.StatementType.SELECT),
+        Arguments.of(WhereCQLClauseAnalyzer.StatementType.DELETE_ONE),
+        Arguments.of(WhereCQLClauseAnalyzer.StatementType.DELETE_MANY),
+        Arguments.of(WhereCQLClauseAnalyzer.StatementType.UPDATE_ONE));
+  }
+
+  @ParameterizedTest
+  @MethodSource("eqAllPrimaryKeysTests")
+  public void eqAllPrimaryKeys(WhereCQLClauseAnalyzer.StatementType statementType) {
+    var fixture =
+        TEST_DATA
+            .whereAnalyzer()
+            .table2PK3Clustering1Index(
+                "eqAllPrimaryKeys() for %s".formatted(statementType), statementType);
+    fixture.expression().eqAllPrimaryKeys().analyze().assertNoFilteringNoWarnings();
+  }
+
+  // ==================================================================================================================
+  // NON PK COLUMNS - INDEXED AND UNINDEXED
+  // ==================================================================================================================
+  private static Stream<Arguments> eqOnNonPrimaryKeyOrIndexedTests() {
+    return Stream.of(
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.SELECT, WarningException.Code.MISSING_INDEX, null),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.DELETE_ONE,
+            null,
+            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.DELETE_MANY,
+            null,
+            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.UPDATE_ONE,
+            null,
+            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE));
+  }
+
+  @ParameterizedTest
+  @MethodSource("eqOnNonPrimaryKeyOrIndexedTests")
+  public void eqOnNonPrimaryKeyOrIndexed(
+      WhereCQLClauseAnalyzer.StatementType statementType,
+      WarningException.Code expectedWarningCode,
+      FilterException.Code expectedFilterCode) {
+    var fixture =
+        TEST_DATA
+            .whereAnalyzer()
+            .table2PK3Clustering1Index(
+                "eqOnNonPrimaryKeyOrIndexed() for %s".formatted(statementType), statementType)
+            .expression()
+            .eqOn(names().COL_REGULAR_1);
+
+    if (statementType == WhereCQLClauseAnalyzer.StatementType.SELECT) {
+      fixture
+          .analyze()
+          .assertAllowFilteringEnabled()
+          .assertOneWarning(expectedWarningCode)
+          .assertWarnOnUnindexedColumns(names().COL_REGULAR_1);
+    } else {
+      fixture.analyzeMaybeFilterError(expectedFilterCode);
+    }
+  }
+
+  @ParameterizedTest
+  @MethodSource("eqOnNonPrimaryKeyOrIndexedTests") // deliberately reusing the same test data
+  public void eqOnIndexedAndRegular(
+      WhereCQLClauseAnalyzer.StatementType statementType,
+      WarningException.Code expectedWarningCode,
+      FilterException.Code expectedFilterCode) {
+    var fixture =
+        TEST_DATA
+            .whereAnalyzer()
+            .table2PK3Clustering1Index(
+                "eqOnIndexed() for %s".formatted(statementType), statementType)
+            .expression()
+            .eqOn(names().COL_INDEXED_1)
+            .expression()
+            .eqOn(names().COL_INDEXED_1)
+            .expression()
+            .eqOn(names().COL_REGULAR_1);
+
+    if (statementType == WhereCQLClauseAnalyzer.StatementType.SELECT) {
+      fixture
+          .analyze()
+          .assertAllowFilteringEnabled()
+          .assertOneWarning(expectedWarningCode)
+          .assertWarnOnUnindexedColumns(names().COL_REGULAR_1);
+    } else {
+      fixture.analyzeMaybeFilterError(expectedFilterCode);
+    }
+  }
+
+  private static Stream<Arguments> eqOnIndexedTests() {
+    return Stream.of(
+        Arguments.of(WhereCQLClauseAnalyzer.StatementType.SELECT, null),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.DELETE_ONE,
+            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.DELETE_MANY,
+            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE),
+        Arguments.of(
+            WhereCQLClauseAnalyzer.StatementType.UPDATE_ONE,
+            FilterException.Code.UNSUPPORTED_NON_PRIMARY_KEY_FILTER_FOR_UPDATE_DELETE));
+  }
+
+  @ParameterizedTest
+  @MethodSource("eqOnIndexedTests")
+  public void eqOnIndexed(
+      WhereCQLClauseAnalyzer.StatementType statementType, FilterException.Code expectedCode) {
+    var fixture =
+        TEST_DATA
+            .whereAnalyzer()
+            .table2PK3Clustering1Index(
+                "eqOnIndexed() for %s".formatted(statementType), statementType)
+            .expression()
+            .eqOn(names().COL_INDEXED_1);
+
+    if (statementType == WhereCQLClauseAnalyzer.StatementType.SELECT) {
+      fixture.analyze().assertNoFilteringNoWarnings();
+    } else {
+      fixture.analyzeMaybeFilterError(expectedCode);
+    }
+  }
+}