diff --git a/cabal2spec.cabal b/cabal2spec.cabal
--- a/cabal2spec.cabal
+++ b/cabal2spec.cabal
@@ -1,5 +1,5 @@
 name:               cabal2spec
-version:            2.2.1
+version:            2.2.2
 synopsis:           Convert Cabal files into rpm spec files
 description:        Convert
                     Cabal files into a
@@ -14,7 +14,7 @@
 license-file:       LICENSE
 author:             Peter Simons, Bryan O'Sullivan, Jens Petersen
 maintainer:         simons@cryp.to
-tested-with:        GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3
+tested-with:        GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1
 category:           Distribution
 homepage:           https://github.com/peti/cabal2spec
 build-type:         Simple
diff --git a/src/Cabal2Spec.hs b/src/Cabal2Spec.hs
--- a/src/Cabal2Spec.hs
+++ b/src/Cabal2Spec.hs
@@ -377,7 +377,8 @@
 -- returns list of deps and whether package is self-dependent
 buildDependencies :: PackageDescription -> String -> ([String], Bool)
 buildDependencies pkgDesc self =
-  let bdeps = map depName (buildDepends pkgDesc)
+  let bis   = map libBuildInfo (allLibraries pkgDesc) ++ map buildInfo (executables pkgDesc)
+      bdeps = map depName (concatMap targetBuildDepends (filter buildable bis))
       sdeps = maybe [] (map depName . setupDepends) (setupBuildInfo pkgDesc)
       deps  = nub $ bdeps ++ sdeps
   in
@@ -451,7 +452,7 @@
                       -> String             -- ^self
                       -> [String]           -- ^depends
 testsuiteDependencies pkgDesc self =
-  map showDep . delete self . filter (excludedPkgs pkgDesc) . nub . map depName $ concatMap (targetBuildDepends . testBuildInfo) (testSuites pkgDesc)
+  map showDep . delete self . filter (excludedPkgs pkgDesc) . nub . map depName $ concatMap targetBuildDepends (filter buildable (map testBuildInfo (testSuites pkgDesc)))
 
 badDescription :: String -> Bool
 badDescription s = null s
diff --git a/test/golden-test-cases/butcher.spec.golden b/test/golden-test-cases/butcher.spec.golden
--- a/test/golden-test-cases/butcher.spec.golden
+++ b/test/golden-test-cases/butcher.spec.golden
@@ -17,7 +17,6 @@
 
 
 %global pkg_name butcher
-%bcond_with tests
 Name:           %{pkg_name}
 Version:        1.2.1.0
 Release:        0
@@ -73,9 +72,6 @@
 
 %install
 %ghc_lib_install
-
-%check
-%cabal_test
 
 %post -n ghc-%{name}-devel
 %ghc_pkg_recache
diff --git a/test/golden-test-cases/mwc-random.spec.golden b/test/golden-test-cases/mwc-random.spec.golden
--- a/test/golden-test-cases/mwc-random.spec.golden
+++ b/test/golden-test-cases/mwc-random.spec.golden
@@ -17,7 +17,6 @@
 
 
 %global pkg_name mwc-random
-%bcond_with tests
 Name:           %{pkg_name}
 Version:        0.13.6.0
 Release:        0
@@ -32,14 +31,6 @@
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-vector-devel
-%if %{with tests}
-BuildRequires:  ghc-HUnit-devel
-BuildRequires:  ghc-QuickCheck-devel
-BuildRequires:  ghc-statistics-devel
-BuildRequires:  ghc-test-framework-devel
-BuildRequires:  ghc-test-framework-hunit-devel
-BuildRequires:  ghc-test-framework-quickcheck2-devel
-%endif
 
 %description
 This package contains code for generating high quality random numbers that
@@ -80,9 +71,6 @@
 
 %install
 %ghc_lib_install
-
-%check
-%cabal_test
 
 %post -n ghc-%{name}-devel
 %ghc_pkg_recache
diff --git a/test/golden-test-cases/weigh.spec.golden b/test/golden-test-cases/weigh.spec.golden
--- a/test/golden-test-cases/weigh.spec.golden
+++ b/test/golden-test-cases/weigh.spec.golden
@@ -34,12 +34,6 @@
 BuildRequires:  ghc-split-devel
 BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-temporary-devel
-%if %{with tests}
-BuildRequires:  ghc-bytestring-trie-devel
-BuildRequires:  ghc-containers-devel
-BuildRequires:  ghc-random-devel
-BuildRequires:  ghc-unordered-containers-devel
-%endif
 
 %description
 Measure allocations of a Haskell functions/values.