diff --git a/Test/Crypto.hs b/Test/Crypto.hs
--- a/Test/Crypto.hs
+++ b/Test/Crypto.hs
@@ -35,7 +35,6 @@
 import Test.ParseNistKATs
 import Crypto.Classes
 import Crypto.Types
-import qualified Crypto.Modes as M
 import Crypto.Padding
 import qualified Data.ByteString.Lazy.Char8 as LC
 import qualified Data.ByteString.Lazy as L
@@ -208,19 +207,19 @@
         in ctStrict == first l2b ctLazy && ptStrict == first l2b ptLazy
                                       
 
-prop_OFBStrictLazyEq = prop_StrictLazyEq ofb M.ofb unOfb M.unOfb
-prop_CBCStrictLazyEq = prop_StrictLazyEq cbc M.cbc unCbc M.unCbc
-prop_CFBStrictLazyEq = prop_StrictLazyEq cfb M.cfb unCfb M.unCfb
-prop_CTRStrictLazyEq = prop_StrictLazyEq ctr (M.ctr incIV) unCtr (M.unCtr incIV)
+prop_OFBStrictLazyEq = prop_StrictLazyEq ofb ofbLazy unOfb unOfbLazy
+prop_CBCStrictLazyEq = prop_StrictLazyEq cbc cbcLazy unCbc unCbcLazy
+prop_CFBStrictLazyEq = prop_StrictLazyEq cfb cfbLazy unCfb unCfbLazy
+prop_CTRStrictLazyEq = prop_StrictLazyEq ctr ctrLazy unCtr unCtrLazy
 
 prop_ECBStrictLazyEq :: BlockCipher k => k -> B.ByteString -> L.ByteString -> Property
 prop_ECBStrictLazyEq k kBS msg = goodKey k kBS ==>
         let key = bKey k kBS
             msg' = takeBlockSize k msg
             ctStrict = ecb key (l2b msg')
-            ctLazy   = M.ecb  key msg'
+            ctLazy   = ecbLazy  key msg'
             ptStrict = unEcb key (l2b msg')
-            ptLazy   = M.unEcb key msg'
+            ptLazy   = unEcbLazy key msg'
         in ctStrict == l2b ctLazy && ptStrict == l2b ptLazy
 
 -- | Build test groups for encrypt/decrypt identity and 
diff --git a/crypto-api-tests.cabal b/crypto-api-tests.cabal
--- a/crypto-api-tests.cabal
+++ b/crypto-api-tests.cabal
@@ -1,5 +1,5 @@
 name:           crypto-api-tests
-version:        0.2
+version:        0.3
 license:        BSD3
 license-file:   LICENSE
 copyright:      Thomas DuBuisson <thomas.dubuisson@gmail.com>
@@ -32,7 +32,7 @@
 
 Library
   build-depends: base >= 4 && < 5, test-framework-quickcheck2 >= 0.3,
-                 directory >= 1.0.1.0, filepath, crypto-api,
+                 directory >= 1.0.1.0, filepath, crypto-api >= 0.13,
                  cereal, bytestring, test-framework >= 0.4,
                  test-framework-hunit >= 0.2, HUnit, QuickCheck >= 2.4
   ghc-options: