@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2025 The LmdbJava Open Source Project
+ * Copyright © 2016-2026 The LmdbJava Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,6 +85,18 @@ public String toString() {
     return FlagSet.asString(this);
   }
 
+  @Override
+  public boolean equals(Object object) {
+    if (object == null || getClass() != object.getClass()) return false;
+    AbstractFlagSet<?> that = (AbstractFlagSet<?>) object;
+    return mask == that.mask && Objects.equals(flags, that.flags);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(flags, mask);
+  }
+
   static class AbstractEmptyFlagSet<T extends MaskedFlag> implements FlagSet<T> {
 
     @Override
 
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2025 The LmdbJava Open Source Project
+ * Copyright © 2016-2026 The LmdbJava Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,8 +67,14 @@ void testSingleFlagSet() {
     final List<T> allFlags = getAllFlags();
     for (T flag : allFlags) {
       final F flagSet = getBuilder().addFlag(flag).build();
+
+      // Compare as a Set
+      assertThat(flagSet.getFlags()).isEqualTo(flag.getFlags());
+      // Compare as a FlagSet
+      assertThat(flagSet).isEqualTo(flag);
+
       assertThat(FlagSet.equals(flagSet, flag)).isTrue();
-      assertThat(FlagSet.equals(flagSet, flag.getFlags())).isTrue();
+
       assertThat(flagSet.getMask()).isEqualTo(flag.getMask());
       assertThat(flagSet.getMask()).isEqualTo(MaskedFlag.mask(flag));
       assertThat(flagSet.getFlags()).containsExactly(flag);
 
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2016-2026 The LmdbJava Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.lmdbjava;
 
 import static org.junit.jupiter.api.Assertions.*;