diff --git a/hlint.cabal b/hlint.cabal
index 688c48640..61f92947e 100644
--- a/hlint.cabal
+++ b/hlint.cabal
@@ -62,7 +62,7 @@ flag hsyaml
   manual: True
   description: Use HsYAML instead of yaml
 
-library
+library hlint-lib
     default-language:   Haskell2010
     build-depends:
         base == 4.*, process, filepath, directory, containers,
@@ -107,6 +107,8 @@ library
 
     hs-source-dirs:     src
     exposed-modules:
+        HLint
+        -- this doesn't seem used anywhere in its own right?
         Language.Haskell.HLint
     other-modules:
         Paths_hlint
@@ -114,7 +116,6 @@ library
         CmdLine
         Extension
         Fixity
-        HLint
         HsColour
         Idea
         Report
@@ -174,10 +175,9 @@ library
         Test.Util
     ghc-options: -Wunused-binds -Wunused-imports -Worphans -Wprepositive-qualified-module
 
-
 executable hlint
     default-language:   Haskell2010
-    build-depends:      base, hlint
+    build-depends:      base, hlint-lib
     main-is:            src/Main.hs
 
     -- See https://github.com/ndmitchell/hlint/pull/1169 for benchmarks
@@ -185,3 +185,8 @@ executable hlint
     ghc-options:        -rtsopts -with-rtsopts=-A32m
     if flag(threaded)
         ghc-options:    -threaded
+
+test-suite test-hlint
+    type:               exitcode-stdio-1.0
+    main-is:            tests/Main.hs
+    build-depends:      base, hlint-lib
diff --git a/misc/HLint_NoDataFiles.hs b/misc/HLint_NoDataFiles.hs
index 6236fc7e9..1fd1658c8 100644
--- a/misc/HLint_NoDataFiles.hs
+++ b/misc/HLint_NoDataFiles.hs
@@ -4,7 +4,7 @@
 -- Running this script should report two errors
 
 import Data.List
-import Language.Haskell.HLint
+import HLint
 import Language.Haskell.TH.Syntax
 import Network.HTTP
 
diff --git a/src/Main.hs b/src/Main.hs
index 6858d928d..e1754a050 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,7 +1,7 @@
 
 module Main(main) where
 
-import Language.Haskell.HLint
+import HLint
 import Control.Monad
 import System.Environment
 import System.Exit
diff --git a/tests/Main.hs b/tests/Main.hs
new file mode 100644
index 000000000..b7451a913
--- /dev/null
+++ b/tests/Main.hs
@@ -0,0 +1,5 @@
+module Main where
+
+import HLint (hlint)
+
+main = hlint ["--test"]