diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index 64be79af4c..77113c97c4 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -178,7 +178,6 @@ rule_test(
             "libHStestsZSlibrary-depsZSlibrary-deps.a",
         ],
         ":fastbuild_windows": [
-            "libHStestsZSlibrary-depsZSlibrary-deps-ghc{}.dll".format(test_ghc_version),
             "libHStestsZSlibrary-depsZSlibrary-deps.a",
         ],
         "//conditions:default": [
@@ -199,8 +198,22 @@ rule_test_exe(
 rule_test_exe(
     name = "test-haddock",
     size = "small",
-    generates =
-        [
+    generates = select({
+        "fastbuild_windows": [
+            "haddock/array-0.5.4.0.exe",
+            "haddock/base-4.13.0.0.exe",
+            "haddock/deepseq-1.4.4.0.exe",
+            "haddock/ghc-boot-th-8.8.3.exe",
+            "haddock/ghc-prim-0.5.3.exe",
+            "haddock/index.exe",
+            "haddock/integer-gmp-1.0.2.0.exe",
+            "haddock/pretty-1.1.3.6.exe",
+            "haddock/template-haskell-2.15.0.0.exe",
+            "haddock/testsZShaddockZShaddock-lib-a.exe",
+            "haddock/testsZShaddockZShaddock-lib-b.exe",
+            "haddock/testsZShaddockZShaddock-lib-deep.exe"
+        ],
+        "//conditions:default": [
             "haddock/array-0.5.4.0",
             "haddock/base-4.13.0.0",
             "haddock/deepseq-1.4.4.0",
@@ -214,6 +227,7 @@ rule_test_exe(
             "haddock/testsZShaddockZShaddock-lib-b",
             "haddock/testsZShaddockZShaddock-lib-deep",
         ],
+    }),
     rule = "//tests/haddock",
 )