diff --git a/sea-orm-macros/src/derives/column.rs b/sea-orm-macros/src/derives/column.rs
index 0315fa1e..917dc669 100644
--- a/sea-orm-macros/src/derives/column.rs
+++ b/sea-orm-macros/src/derives/column.rs
@@ -63,7 +63,7 @@ pub fn impl_col_from_str(ident: &Ident, data: &Data) -> syn::Result<TokenStream>
     });
 
     Ok(quote!(
-        #[derive(Debug, Clone, Copy, PartialEq)]
+        #[derive(Debug, Clone, Copy)]
         pub struct #parse_error_iden;
 
         impl std::str::FromStr for #ident {
diff --git a/src/entity/column.rs b/src/entity/column.rs
index 2456aba7..85100421 100644
--- a/src/entity/column.rs
+++ b/src/entity/column.rs
@@ -324,7 +324,6 @@ mod tests {
         tests_cfg::*, ColumnTrait, Condition, DbBackend, EntityTrait, QueryFilter, QueryTrait,
     };
     use sea_query::Query;
-    use std::str::FromStr;
 
     #[test]
     fn test_in_subquery() {
@@ -352,25 +351,24 @@ mod tests {
 
     #[test]
     fn test_col_from_str() {
+        use std::str::FromStr;
+
         match fruit::Column::from_str("id") {
-            Ok(col) => assert_eq!(col, fruit::Column::Id),
+            Ok(col) => assert!(matches!(col, fruit::Column::Id)),
             Err(_) => panic!("fruit from_str fails"),
         }
         match fruit::Column::from_str("name") {
-            Ok(col) => assert_eq!(col, fruit::Column::Name),
+            Ok(col) => assert!(matches!(col, fruit::Column::Name)),
             Err(_) => panic!("fruit from_str fails"),
         }
         match fruit::Column::from_str("cake_id") {
-            Ok(col) => assert_eq!(col, fruit::Column::CakeId),
+            Ok(col) => assert!(matches!(col, fruit::Column::CakeId)),
             Err(_) => panic!("fruit from_str fails"),
         }
         match fruit::Column::from_str("cakeId") {
-            Ok(col) => assert_eq!(col, fruit::Column::CakeId),
+            Ok(col) => assert!(matches!(col, fruit::Column::CakeId)),
             Err(_) => panic!("fruit from_str fails"),
         }
-        match fruit::Column::from_str("does_not_exist") {
-            Ok(_) => panic!("fruit from_str found match when it shouldn't have"),
-            Err(err) => assert_eq!(err, fruit::ParseColumnErr),
-        }
+        assert!(matches!(fruit::Column::from_str("does_not_exist"), Err(_)));
     }
 }
diff --git a/src/query/combine.rs b/src/query/combine.rs
index 71783e8b..8cce0510 100644
--- a/src/query/combine.rs
+++ b/src/query/combine.rs
@@ -167,7 +167,7 @@ mod tests {
                 .left_join(fruit::Entity)
                 .select_also(fruit::Entity)
                 .filter(cake::Column::Id.eq(1))
-                .filter(ColumnTrait::eq(&fruit::Column::Id, 2))
+                .filter(fruit::Column::Id.eq(2))
                 .build(DbBackend::MySql)
                 .to_string(),
             [
@@ -186,7 +186,7 @@ mod tests {
                 .left_join(fruit::Entity)
                 .select_with(fruit::Entity)
                 .filter(cake::Column::Id.eq(1))
-                .filter(ColumnTrait::eq(&fruit::Column::Id, 2))
+                .filter(fruit::Column::Id.eq(2))
                 .build(DbBackend::MySql)
                 .to_string(),
             [
diff --git a/src/query/update.rs b/src/query/update.rs
index 014f6ae1..21fd39cb 100644
--- a/src/query/update.rs
+++ b/src/query/update.rs
@@ -233,7 +233,7 @@ mod tests {
         assert_eq!(
             Update::many(fruit::Entity)
                 .col_expr(fruit::Column::CakeId, Expr::value(Value::Int(None)))
-                .filter(ColumnTrait::eq(&fruit::Column::Id, 2))
+                .filter(fruit::Column::Id.eq(2))
                 .build(DbBackend::Postgres)
                 .to_string(),
             r#"UPDATE "fruit" SET "cake_id" = NULL WHERE "fruit"."id" = 2"#,
diff --git a/src/tests_cfg/fruit.rs b/src/tests_cfg/fruit.rs
index 48d7fcfb..0511ae58 100644
--- a/src/tests_cfg/fruit.rs
+++ b/src/tests_cfg/fruit.rs
@@ -17,7 +17,7 @@ pub struct Model {
     pub cake_id: Option<i32>,
 }
 
-#[derive(Copy, Clone, PartialEq, Debug, EnumIter, DeriveColumn)]
+#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
 pub enum Column {
     Id,
     Name,