diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index 404540898f2bbf5095fc772e6e9cac5e5af47ded..81963ac54504e4a72e42bb2aa3c8c884f0ee99f1 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -158,6 +158,7 @@ test-suite package-tests
     PackageTests.BuildDeps.TargetSpecificDeps2.Check,
     PackageTests.BuildDeps.TargetSpecificDeps3.Check,
     PackageTests.BuildDeps.SameDepsAllRound.Check,
+    PackageTests.BuildTestSuiteDetailedV09.Check,
     PackageTests.PreProcess.Check,
     PackageTests.TestOptions.Check,
     PackageTests.TestStanza.Check,
diff --git a/Cabal/tests/PackageTests.hs b/Cabal/tests/PackageTests.hs
index a5e30eae2b2884521c558ab99889343f02e92c6a..69b6c8000eb6ac4b410162aac0bc4f007e3c5d14 100644
--- a/Cabal/tests/PackageTests.hs
+++ b/Cabal/tests/PackageTests.hs
@@ -28,6 +28,7 @@ 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 (compileSetup)
 import PackageTests.PathsModule.Executable.Check
 import PackageTests.PathsModule.Library.Check
@@ -77,6 +78,8 @@ tests version =
     , hunit "PathsModule/Library" PackageTests.PathsModule.Library.Check.suite
     , hunit "EmptyLib/emptyLib"
       PackageTests.EmptyLib.Check.emptyLib
+    , hunit "BuildTestSuiteDetailedV09"
+      PackageTests.BuildTestSuiteDetailedV09.Check.suite
     ] ++
     -- These tests are only required to pass on cabal version >= 1.7
     (if version >= Version [1, 7] []
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
new file mode 100644
index 0000000000000000000000000000000000000000..f23b0ac0558b96bb0d9ac9d3763979d22c7492bc
--- /dev/null
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
@@ -0,0 +1,15 @@
+module PackageTests.BuildTestSuiteDetailedV09.Check where
+
+import Test.HUnit
+import System.FilePath ((</>))
+
+import PackageTests.PackageTester
+
+suite :: Test
+suite = TestCase $ do
+    let dir = "PackageTests" </> "BuildTestSuiteDetailedV09"
+        spec = PackageSpec dir ["--enable-tests"]
+    confResult <- cabal_configure spec
+    assertEqual "configure failed!" (successful confResult) True
+    buildResult <- cabal_build spec
+    assertEqual "build failed!" (successful buildResult) True
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs
new file mode 100644
index 0000000000000000000000000000000000000000..50e44632bd64daa0a10c35c1e7a2e7515013474f
--- /dev/null
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy.hs
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..4ffe9022b17238d9dac37ca0f599e8999254ee11
--- /dev/null
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
@@ -0,0 +1,19 @@
+name: BuildTestSuiteDetailedV09
+version: 0.1
+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 dummy
+  type:       detailed-0.9
+  test-module: Dummy
+  build-depends: base, Cabal