diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index b800ae5a5021658af094f3597be4da4429981fa4..ca4a2f92ce6d6dc55c8151742d6809a5cedd3143 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -74,8 +74,6 @@ extra-source-files:
   tests/PackageTests/BuildDeps/TargetSpecificDeps3/MyLibrary.hs
   tests/PackageTests/BuildDeps/TargetSpecificDeps3/lemon.hs
   tests/PackageTests/BuildDeps/TargetSpecificDeps3/my.cabal
-  tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs
-  tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
   tests/PackageTests/CMain/Bar.hs
   tests/PackageTests/CMain/Setup.hs
   tests/PackageTests/CMain/foo.c
@@ -117,7 +115,7 @@ extra-source-files:
   tests/PackageTests/TestSuiteTests/ExeV10/tests/test-Foo.hs
   tests/PackageTests/TestSuiteTests/LibV09/LibV09.cabal
   tests/PackageTests/TestSuiteTests/LibV09/Lib.hs
-  tests/PackageTests/TestSuiteTests/LibV09/Deadlock.hs
+  tests/PackageTests/TestSuiteTests/LibV09/tests/Deadlock.hs
   tests/Setup.hs
   tests/hackage/check.sh
   tests/hackage/download.sh
@@ -295,7 +293,6 @@ test-suite package-tests
     PackageTests.BuildDeps.TargetSpecificDeps1.Check
     PackageTests.BuildDeps.TargetSpecificDeps2.Check
     PackageTests.BuildDeps.TargetSpecificDeps3.Check
-    PackageTests.BuildTestSuiteDetailedV09.Check
     PackageTests.CMain.Check
     PackageTests.DeterministicAr.Check
     PackageTests.EmptyLib.Check
diff --git a/Cabal/tests/PackageTests.hs b/Cabal/tests/PackageTests.hs
index 6bf33fa118eaa18ed13f9f24c957dd760720a92b..458c2a0aa170147f946c5256d5fb5873640f4e43 100644
--- a/Cabal/tests/PackageTests.hs
+++ b/Cabal/tests/PackageTests.hs
@@ -20,7 +20,6 @@ import PackageTests.BuildDeps.SameDepsAllRound.Check
 import PackageTests.BuildDeps.TargetSpecificDeps1.Check
 import PackageTests.BuildDeps.TargetSpecificDeps2.Check
 import PackageTests.BuildDeps.TargetSpecificDeps3.Check
-import PackageTests.BuildTestSuiteDetailedV09.Check
 import PackageTests.PackageTester (PackageSpec(..), SuiteConfig(..), compileSetup)
 import PackageTests.PathsModule.Executable.Check
 import PackageTests.PathsModule.Library.Check
@@ -102,10 +101,8 @@ tests config version =
     , testCase "DeterministicAr"
       (PackageTests.DeterministicAr.Check.suite config)
     , testCase "EmptyLib/emptyLib"
-      (PackageTests.EmptyLib.Check.emptyLib config)
-    , testCase "Haddock" (PackageTests.Haddock.Check.suite config)
-    , testCase "BuildTestSuiteDetailedV09"
-      (PackageTests.BuildTestSuiteDetailedV09.Check.suite config)
+      (PackageTests.EmptyLib.Check.emptyLib ghcPath)
+    , testCase "Haddock" (PackageTests.Haddock.Check.suite ghcPath)
     , testCase "OrderFlags"
       (PackageTests.OrderFlags.Check.suite config)
     , testCase "TemplateHaskell/dynamic"
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
deleted file mode 100644
index 35df95eac845af98e68a1dc060e286f4c2ed8f80..0000000000000000000000000000000000000000
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-module PackageTests.BuildTestSuiteDetailedV09.Check where
-
-import Test.Tasty.HUnit
-import System.FilePath ((</>))
-
-import PackageTests.PackageTester
-
-suite :: SuiteConfig -> Assertion
-suite config = do
-    let dir = "PackageTests" </> "BuildTestSuiteDetailedV09"
-        spec = (inplaceSpec config)
-            { directory = dir
-            , configOpts = "--enable-tests" : configOpts (inplaceSpec config)
-            }
-    confResult <- cabal_configure config spec
-    assertConfigureSucceeded confResult
-    buildResult <- cabal_build config spec
-    assertBuildSucceeded buildResult
-    testResult <- cabal_test config spec [] ["test-Dummy", "test-Dummy2"]
-    assertTestSucceeded testResult
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs
deleted file mode 100644
index 50e44632bd64daa0a10c35c1e7a2e7515013474f..0000000000000000000000000000000000000000
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Dummy where
-
-import Distribution.TestSuite (Test)
-
-tests :: IO [Test]
-tests = return []
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
deleted file mode 100644
index 85d0992b499001e36d43f35f3551571d073b5182..0000000000000000000000000000000000000000
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
+++ /dev/null
@@ -1,25 +0,0 @@
-name: BuildTestSuiteDetailedV09
-version: 0.1
-cabal-version: >= 1.2
-license: BSD3
-author: Thomas Tuegel
-stability: stable
-category: PackageTests
-build-type: Simple
-
-description:
-    Check that Cabal can build test suites of type detailed-0.9.
-
-Library
-    exposed-modules: Dummy
-    build-depends: base, Cabal
-
-test-suite test-Dummy
-  type:       detailed-0.9
-  test-module: Dummy
-  build-depends: base, Cabal
-
-test-suite test-Dummy2
-  type:       detailed-0.9
-  test-module: Dummy2
-  build-depends: base, Cabal