diff --git a/.travis.yml b/.travis.yml
index af1d9ee5..d07be296 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,6 @@ install:
  - travis_retry cabal install cpphs
  - travis_retry cabal install gtk2hs-buildtools
  - travis_retry cabal install arithmoi==0.4.* -fllvm
- - sudo `which ghc-pkg` expose ghc
 
 # Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
 script:
@@ -42,8 +41,8 @@ script:
      travis_retry ./build.sh display;
    fi
 # Build and run the test suite
- - travis_retry ghc --make Hspec.hs
- - ./Hspec
+ - travis_retry cabal install --dependencies-only --enable-tests
+ - travis_retry cabal test --show-details=streaming
 
  - cabal sdist
 
diff --git a/ihaskell.cabal b/ihaskell.cabal
index a93ac425..222776b6 100644
--- a/ihaskell.cabal
+++ b/ihaskell.cabal
@@ -151,6 +151,66 @@ executable IHaskell
   if flag(binPkgDb)
     build-depends:       bin-package-db
 
+Test-Suite hspec
+    Type: exitcode-stdio-1.0
+    Ghc-Options: -threaded
+    Main-Is: Hspec.hs
+    default-language: Haskell2010
+    build-depends:
+        ihaskell,
+        aeson >=0.6 && < 0.9,
+        base >=4.6 && < 4.9,
+        base64-bytestring >=1.0,
+        bytestring >=0.10,
+        cereal >=0.3,
+        classy-prelude >=0.9.2 && <0.11,
+        mono-traversable >=0.6,
+        cmdargs >=0.10,
+        containers >=0.5,
+        directory -any,
+        filepath -any,
+        ghc >=7.6 && < 7.11,
+        ghc-parser >=0.1.1,
+        ghc-paths ==0.1.*,
+        haskeline -any,
+        here ==1.2.*,
+        hlint >=1.9 && <2.0,
+        haskell-src-exts ==1.16.*,
+        hspec -any,
+        HUnit -any,
+        MissingH >=1.2,
+        mtl >=2.1,
+        parsec -any,
+        process >=1.1,
+        random >=1.0,
+        shelly >=1.5,
+        split >= 0.2,
+        stm -any,
+        strict >=0.3,
+        system-argv0 -any,
+        system-filepath -any,
+        tar -any,
+        text >=0.11,
+        http-client == 0.4.*,
+        http-client-tls == 0.2.*,
+        transformers -any,
+        unix >= 2.6,
+        unordered-containers -any,
+        utf8-string -any,
+        uuid >=1.3,
+        vector -any,
+        setenv ==0.1.*,
+        ipython-kernel >= 0.2
+
+    if flag(binPkgDb)
+        build-depends: bin-package-db
+
+    default-extensions:
+        DoAndIfThenElse
+        OverloadedStrings
+        ExtendedDefaultRules
+
+
 source-repository head
   type:     git
   location: git://github.com/gibiansky/IHaskell.git