diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,34 +1,6 @@
-{-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -Wall #-}
-
-module Main ( main ) where
-
-#ifndef MIN_VERSION_cabal_doctest
-#define MIN_VERSION_cabal_doctest(x,y,z) 0
-#endif
-
-#if MIN_VERSION_cabal_doctest(1,0,0)
-
-import Distribution.Extra.Doctest ( defaultMainWithDoctests )
-main :: IO ()
-main = defaultMainWithDoctests "doctests"
-
-#else
-
-#ifdef MIN_VERSION_Cabal
--- If the macro is defined, we have new cabal-install,
--- but for some reason we don't have cabal-doctest in package-db
---
--- Probably we are running cabal sdist, when otherwise using new-build
--- workflow
-#warning You are configuring this package without cabal-doctest installed. \
-         The doctests test-suite will not work as a result. \
-         To fix this, install cabal-doctest before configuring.
-#endif
+module Main (main) where
 
 import Distribution.Simple
 
 main :: IO ()
 main = defaultMain
-
-#endif
diff --git a/hopenssl.cabal b/hopenssl.cabal
--- a/hopenssl.cabal
+++ b/hopenssl.cabal
@@ -1,6 +1,6 @@
 name:                   hopenssl
-version:                2.2.1
-copyright:              (c) 2004-2017 Peter Simons
+version:                2.2.2
+copyright:              (c) 2004-2018 Peter Simons
 license:                BSD3
 license-file:           LICENSE
 author:                 Peter Simons, Markus Rothe
@@ -14,14 +14,9 @@
                         RIPEMD160, and various SHA variants through the EVP
                         digest interface.
 cabal-version:          >= 1.8
-build-type:             Custom
-tested-with:            GHC > 7.6 && < 8.1
-
-custom-setup
-  setup-depends:
-    base >= 4 && <5,
-    Cabal,
-    cabal-doctest >= 1 && <1.1
+build-type:             Simple
+tested-with:            GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2
+                      , GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.1
 
 source-repository head
   type:                 git
@@ -58,11 +53,4 @@
   other-modules:        OpenSesame
   hs-source-dirs:       test
   build-depends:        base >= 3 && < 5, hopenssl, HUnit
-  ghc-options:          -threaded
-
-test-suite doctests
-  type:                 exitcode-stdio-1.0
-  main-is:              doctests.hs
-  hs-source-dirs:       test
-  build-depends:        base, hopenssl, doctest
   ghc-options:          -threaded
diff --git a/test/doctests.hs b/test/doctests.hs
deleted file mode 100644
--- a/test/doctests.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-module Main where
-
-import Build_doctests (flags, pkgs, module_sources)
-import Data.Foldable (traverse_)
-import Test.DocTest (doctest)
-
-main :: IO ()
-main = do let args = flags ++ pkgs ++ module_sources
-          traverse_ putStrLn args -- optionally print arguments
-          doctest args