diff --git a/Cabal/Distribution/Simple/Build.hs b/Cabal/Distribution/Simple/Build.hs
index ea68988492669ef3df971347230431c927cf1b52..b5a027b6627eb2641b91460ddeb296c98647a121 100644
--- a/Cabal/Distribution/Simple/Build.hs
+++ b/Cabal/Distribution/Simple/Build.hs
@@ -407,7 +407,7 @@ testSuiteLibV09AsLibAndExe pkg_descr
     libClbi = LibComponentLocalBuildInfo
                 { componentPackageDeps = componentPackageDeps clbi
                 , componentPackageRenaming = componentPackageRenaming clbi
-                , componentLibraryName = LibraryName "test"
+                , componentLibraryName = LibraryName (testName test)
                 , componentExposedModules = [IPI.ExposedModule m Nothing Nothing]
                 , componentPackageKey = OldPackageKey (PackageIdentifier (PackageName (testName test)) (pkgVersion (package pkg_descr)))
                 }
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
index 17c16edaace2bbeff90bf2fe4a78879e4818c9e2..35df95eac845af98e68a1dc060e286f4c2ed8f80 100644
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
@@ -16,3 +16,5 @@ suite config = do
     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/Dummy2.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs
new file mode 100644
index 0000000000000000000000000000000000000000..6de3176f6ee70f73622405f75b794a4995e7db73
--- /dev/null
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs
@@ -0,0 +1,6 @@
+module Dummy2 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
index d3c3e7cd686a886d7b7cdf046b4695d947e48e03..85d0992b499001e36d43f35f3551571d073b5182 100644
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
@@ -18,3 +18,8 @@ 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