diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/Equals.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/Equals.java
index 011b70c46c3a7..12a0d141cf83a 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/Equals.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/Equals.java
@@ -116,7 +116,7 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(Function<Expression,
         if (commonType.equals(DataTypes.BOOLEAN)) {
             return new EqualsBoolsEvaluator.Factory(source(), lhs, rhs);
         }
-        if (DataTypes.isString(commonType)) {
+        if (DataTypes.isString(commonType) || commonType.equals(DataTypes.VERSION) || commonType.equals(DataTypes.IP)) {
             return new EqualsKeywordsEvaluator.Factory(source(), lhs, rhs);
         }
         throw new EsqlIllegalArgumentException("Unsupported type " + left().dataType());
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
index dded86fdd8aee..deff06b4de520 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
@@ -958,6 +958,24 @@ protected static String typeErrorMessage(boolean includeOrdinal, List<Set<DataTy
             ),
             "boolean or cartesian_point or datetime or geo_point or numeric or string"
         ),
+        Map.entry(
+            Set.of(
+                DataTypes.BOOLEAN,
+                DataTypes.DATETIME,
+                DataTypes.DOUBLE,
+                EsqlDataTypes.GEO_POINT,
+                EsqlDataTypes.GEO_SHAPE,
+                DataTypes.INTEGER,
+                DataTypes.IP,
+                DataTypes.KEYWORD,
+                DataTypes.LONG,
+                DataTypes.TEXT,
+                DataTypes.UNSIGNED_LONG,
+                DataTypes.VERSION,
+                DataTypes.NULL
+            ),
+            "cartesian_point or datetime or geo_point or numeric or string"
+        ),
         Map.entry(Set.of(EsqlDataTypes.GEO_POINT, DataTypes.KEYWORD, DataTypes.TEXT, DataTypes.NULL), "geo_point or string"),
         Map.entry(Set.of(EsqlDataTypes.CARTESIAN_POINT, DataTypes.KEYWORD, DataTypes.TEXT, DataTypes.NULL), "cartesian_point or string"),
         Map.entry(
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
index 02ab7453eef83..7e5b6416b21a7 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
@@ -925,7 +925,7 @@ public static List<TypedDataSupplier> doubleCases(double min, double max) {
         return cases;
     }
 
-    private static List<TypedDataSupplier> booleanCases() {
+    public static List<TypedDataSupplier> booleanCases() {
         return List.of(
             new TypedDataSupplier("<true>", () -> true, DataTypes.BOOLEAN),
             new TypedDataSupplier("<false>", () -> false, DataTypes.BOOLEAN)
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java
index 6c222032cb94f..23cfd081027c5 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java
@@ -76,8 +76,44 @@ public static Iterable<Object[]> parameters() {
                 List.of()
             )
         );
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "EqualsBoolsEvaluator",
+                "lhs",
+                "rhs",
+                Object::equals,
+                DataTypes.BOOLEAN,
+                TestCaseSupplier.booleanCases(),
+                TestCaseSupplier.booleanCases(),
+                List.of()
+            )
+        );
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "EqualsKeywordsEvaluator",
+                "lhs",
+                "rhs",
+                Object::equals,
+                DataTypes.BOOLEAN,
+                TestCaseSupplier.ipCases(),
+                TestCaseSupplier.ipCases(),
+                List.of()
+            )
+        );
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "EqualsKeywordsEvaluator",
+                "lhs",
+                "rhs",
+                Object::equals,
+                DataTypes.BOOLEAN,
+                TestCaseSupplier.versionCases(""),
+                TestCaseSupplier.versionCases(""),
+                List.of()
+            )
+        );
         // Datetime
-        // TODO: I'm surprised this passes.  Shouldn't there be a cast from DateTime to Long? 
+        // TODO: I'm surprised this passes.  Shouldn't there be a cast from DateTime to Long?
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "EqualsLongsEvaluator",
@@ -130,7 +166,7 @@ public static Iterable<Object[]> parameters() {
             )
         );
 
-        return parameterSuppliersFromTypedData(suppliers);
+        return parameterSuppliersFromTypedData(errorsForCasesWithoutExamples(anyNullIsNull(true, suppliers)));
     }
 
     @Override