diff --git a/libs/cardano-data/cardano-data.cabal b/libs/cardano-data/cardano-data.cabal
index b083869d34e..a53ec20ab16 100644
--- a/libs/cardano-data/cardano-data.cabal
+++ b/libs/cardano-data/cardano-data.cabal
@@ -91,5 +91,5 @@ test-suite cardano-data-tests
         cardano-ledger-binary:{cardano-ledger-binary, testlib},
         testlib,
         QuickCheck,
-        quickcheck-classes-base,
+        quickcheck-classes,
         microlens
diff --git a/libs/cardano-data/test/Test/Cardano/Data/OMap/StrictSpec.hs b/libs/cardano-data/test/Test/Cardano/Data/OMap/StrictSpec.hs
index fca3dc01529..93fb069e6db 100644
--- a/libs/cardano-data/test/Test/Cardano/Data/OMap/StrictSpec.hs
+++ b/libs/cardano-data/test/Test/Cardano/Data/OMap/StrictSpec.hs
@@ -19,7 +19,7 @@ import Test.Hspec
 import Test.Hspec.QuickCheck
 import Test.QuickCheck (Arbitrary)
 import Test.QuickCheck.Arbitrary (Arbitrary (arbitrary))
-import Test.QuickCheck.Classes.Base
+import Test.QuickCheck.Classes
 import Prelude hiding (elem, filter, lookup, null)
 
 spec :: Spec
@@ -148,10 +148,12 @@ spec =
       it "Type" $
         lawsCheckOne
           (Proxy :: Proxy (OMap Int Int))
-          [ isListLaws
+          [ eqLaws
+          , isListLaws
           , semigroupLaws
           , monoidLaws
           , semigroupMonoidLaws
+          , commutativeMonoidLaws
           ]
 
 instance HasOKey Int Int where
diff --git a/libs/cardano-data/test/Test/Cardano/Data/OSet/StrictSpec.hs b/libs/cardano-data/test/Test/Cardano/Data/OSet/StrictSpec.hs
index 30d06cc8a25..f6f0b6565ac 100644
--- a/libs/cardano-data/test/Test/Cardano/Data/OSet/StrictSpec.hs
+++ b/libs/cardano-data/test/Test/Cardano/Data/OSet/StrictSpec.hs
@@ -16,7 +16,7 @@ import Test.Cardano.Data.Arbitrary ()
 import Test.Cardano.Ledger.Binary.RoundTrip (cborTrip, embedTripSpec, roundTripCborSpec)
 import Test.Hspec
 import Test.Hspec.QuickCheck
-import Test.QuickCheck.Classes.Base
+import Test.QuickCheck.Classes
 
 spec :: Spec
 spec =
@@ -95,8 +95,11 @@ spec =
       it "Type" $
         lawsCheckOne
           (Proxy :: Proxy (OSet Int))
-          [ isListLaws
+          [ eqLaws
+          , ordLaws
+          , isListLaws
           , semigroupLaws
           , monoidLaws
           , semigroupMonoidLaws
+          , commutativeMonoidLaws
           ]