diff --git a/amazonka-test.cabal b/amazonka-test.cabal
--- a/amazonka-test.cabal
+++ b/amazonka-test.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-test
-version:               1.3.6
+version:               1.3.7
 synopsis:              Common functionality for Amazonka library test-suites.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -37,7 +37,7 @@
 
     build-depends:
           aeson                >= 0.8
-        , amazonka-core        == 1.3.6.*
+        , amazonka-core        == 1.3.7.*
         , base                 >= 4.7     && < 5
         , bifunctors           >= 4.1
         , bytestring           >= 0.9
@@ -47,7 +47,6 @@
         , groom                >= 0.1.1
         , http-client          >= 0.4.9
         , http-types           >= 0.8
-        , lens                 >= 4.4
         , process              >= 1.2
         , resourcet            >= 1.1
         , tasty                >= 0.10
diff --git a/src/Test/AWS/Fixture.hs b/src/Test/AWS/Fixture.hs
--- a/src/Test/AWS/Fixture.hs
+++ b/src/Test/AWS/Fixture.hs
@@ -19,7 +19,6 @@
 --
 module Test.AWS.Fixture where
 
-import           Control.Exception.Lens       (trying)
 import           Control.Monad.Trans.Resource
 import           Data.Aeson
 import           Data.Bifunctor
@@ -33,7 +32,8 @@
 import           Data.Time
 import qualified Data.Yaml                    as YAML
 import           Network.AWS.Data.ByteString
-import           Network.AWS.Prelude          hiding ((<.>))
+import           Network.AWS.Lens             (trying, (<&>))
+import           Network.AWS.Prelude
 import           Network.HTTP.Client.Internal hiding (Proxy, Request, Response)
 import qualified Network.HTTP.Client.Internal as Client
 import           Network.HTTP.Types
diff --git a/src/Test/AWS/Prelude.hs b/src/Test/AWS/Prelude.hs
--- a/src/Test/AWS/Prelude.hs
+++ b/src/Test/AWS/Prelude.hs
@@ -10,10 +10,10 @@
     ( module Export
     ) where
 
-import           Control.Lens.Operators as Export
-import           Data.Traversable       as Export (traverse)
-import           Test.AWS.Assert        as Export
-import           Test.AWS.Orphans       as Export ()
-import           Test.AWS.TH            as Export
-import           Test.Tasty             as Export (TestTree, testGroup)
-import           Test.Tasty.HUnit       as Export (testCase)
+import           Data.Traversable as Export (traverse)
+import           Network.AWS.Lens as Export
+import           Test.AWS.Assert  as Export
+import           Test.AWS.Orphans as Export ()
+import           Test.AWS.TH      as Export
+import           Test.Tasty       as Export (TestTree, testGroup)
+import           Test.Tasty.HUnit as Export (testCase)
diff --git a/src/Test/AWS/TH.hs b/src/Test/AWS/TH.hs
--- a/src/Test/AWS/TH.hs
+++ b/src/Test/AWS/TH.hs
@@ -12,13 +12,13 @@
 --
 module Test.AWS.TH where
 
-import           Control.Lens
+import           Control.Applicative
 import           Data.Time
 import           Language.Haskell.TH
 import           Language.Haskell.TH.Syntax
 import           Network.AWS.Data.Text
 import           Network.AWS.Data.Time
-import           Network.AWS.Prelude
+import           Network.AWS.Lens           (view)
 
 mkTime :: Text -> Q Exp
 mkTime x =