diff --git a/dublincore-xml-conduit.cabal b/dublincore-xml-conduit.cabal
--- a/dublincore-xml-conduit.cabal
+++ b/dublincore-xml-conduit.cabal
@@ -1,5 +1,5 @@
 name:                dublincore-xml-conduit
-version:             0.1.0.1
+version:             0.1.0.2
 synopsis:            XML streaming parser/renderer for the Dublin Core standard elements.
 description:         Cf README file.
 homepage:            https://github.com/k0ral/dublincore-xml-conduit
@@ -15,6 +15,11 @@
   type:     git
   location: git://github.com/k0ral/dublincore-xml-conduit.git
 
+flag enable-hlint-test
+  description: Enable hlint test-suite
+  manual: True
+  default: False
+
 library
   exposed-modules:
     Text.XML.DublinCore
@@ -31,5 +36,18 @@
   hs-source-dirs: test
   main-is: Main.hs
   -- other-modules:
-  build-depends: dublincore-xml-conduit, base >= 4.8 && < 5, bytestring, conduit, conduit-combinators, data-default, safe-exceptions, hlint, QuickCheck, quickcheck-instances, resourcet, tasty, tasty-hunit, tasty-quickcheck, time >= 1.5, text, uri-bytestring >= 0.2, xml-conduit >= 1.3, xml-types
+  build-depends: dublincore-xml-conduit, base >= 4.8 && < 5, bytestring, conduit, conduit-combinators, data-default, safe-exceptions, QuickCheck, quickcheck-instances, resourcet, tasty, tasty-hunit, tasty-quickcheck, time >= 1.5, text, uri-bytestring >= 0.2, xml-conduit >= 1.3, xml-types
   default-language: Haskell2010
+
+test-suite hlint
+  if flag(enable-hlint-test)
+    buildable: True
+  else
+    buildable: False
+  type: exitcode-stdio-1.0
+  main-is: HLint.hs
+  build-depends:
+    base >=4.8,
+    hlint -any
+  default-language: Haskell2010
+  hs-source-dirs: test
diff --git a/src/Text/XML/DublinCore/Conduit/Parse.hs b/src/Text/XML/DublinCore/Conduit/Parse.hs
--- a/src/Text/XML/DublinCore/Conduit/Parse.hs
+++ b/src/Text/XML/DublinCore/Conduit/Parse.hs
@@ -29,7 +29,7 @@
 -- {{{ Imports
 import           Text.XML.DublinCore
 
-import           Conduit                hiding (throwM)
+import           Conduit
 import           Control.Applicative
 import           Control.Exception.Safe as Exception
 import           Data.Text
diff --git a/test/HLint.hs b/test/HLint.hs
new file mode 100644
--- /dev/null
+++ b/test/HLint.hs
@@ -0,0 +1,8 @@
+import qualified Language.Haskell.HLint as HLint (hlint)
+import           System.Exit
+
+
+main :: IO ()
+main = do
+  result <- HLint.hlint [ "test/", "src/" ]
+  if null result then exitSuccess else exitFailure
diff --git a/test/Main.hs b/test/Main.hs
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -8,7 +8,6 @@
 import           Data.Text
 import           Data.Time.Clock
 import           Data.XML.Types
-import qualified Language.Haskell.HLint             as HLint (hlint)
 import           Test.QuickCheck
 import           Test.QuickCheck.Instances          ()
 import           Test.Tasty
@@ -18,7 +17,6 @@
 main :: IO ()
 main = defaultMain $ testGroup "Tests"
   [ properties
-  , hlint
   ]
 
 properties :: TestTree
@@ -49,11 +47,6 @@
 roundtripTest' name render parse gen = testProperty ("parse . render = id (" <> name <> ")") $ do
   a <- gen
   return $ either (const False) (Just a ==) $ runConduit (render a =$= parse)
-
-hlint :: TestTree
-hlint = testCase "HLint check" $ do
-  result <- HLint.hlint [ "test/", "src/" ]
-  Prelude.null result @?= True
 
 -- | Generate 'UTCTime' with rounded seconds.
 genTime :: Gen UTCTime