diff --git a/src/test/py/bazel/bazel_windows_cpp_test.py b/src/test/py/bazel/bazel_windows_cpp_test.py
index 42a2ab75ca6739..7d9cd20d8c2bdd 100644
--- a/src/test/py/bazel/bazel_windows_cpp_test.py
+++ b/src/test/py/bazel/bazel_windows_cpp_test.py
@@ -386,24 +386,28 @@ def testDynamicLinkingMSVCRT(self):
     # By default, it should link to msvcrt dynamically.
     exit_code, _, stderr = self.RunBazel(
         ['build', '//:A', '--output_groups=dynamic_library', '-s'])
-    paramfile = os.path.join(bazel_output,
-                             'x64_windows-fastbuild/bin/A_0.dll-2.params')
+    compile_params = os.path.join(
+        bazel_output, 'x64_windows-fastbuild/bin/_objs/A/a.obj.params')
+    link_params = os.path.join(
+        bazel_output, 'x64_windows-fastbuild/bin/A_0.dll-2.params')
     self.AssertExitCode(exit_code, 0, stderr)
-    self.assertIn('/MD', ''.join(stderr))
-    self.AssertFileContentContains(paramfile, '/DEFAULTLIB:msvcrt.lib')
-    self.assertNotIn('/MT', ''.join(stderr))
-    self.AssertFileContentNotContains(paramfile, '/DEFAULTLIB:libcmt.lib')
+    self.AssertFileContentContains(compile_params, '/MD')
+    self.AssertFileContentContains(link_params, '/DEFAULTLIB:msvcrt.lib')
+    self.AssertFileContentNotContains(compile_params, '/MT')
+    self.AssertFileContentNotContains(link_params, '/DEFAULTLIB:libcmt.lib')
 
     # Test build in debug mode.
     exit_code, _, stderr = self.RunBazel(
         ['build', '-c', 'dbg', '//:A', '--output_groups=dynamic_library', '-s'])
-    paramfile = os.path.join(bazel_output,
-                             'x64_windows-dbg/bin/A_0.dll-2.params')
+    compile_params = os.path.join(
+        bazel_output, 'x64_windows-dbg/bin/_objs/A/a.obj.params')
+    link_params = os.path.join(
+        bazel_output, 'x64_windows-dbg/bin/A_0.dll-2.params')
     self.AssertExitCode(exit_code, 0, stderr)
-    self.assertIn('/MDd', ''.join(stderr))
-    self.AssertFileContentContains(paramfile, '/DEFAULTLIB:msvcrtd.lib')
-    self.assertNotIn('/MTd', ''.join(stderr))
-    self.AssertFileContentNotContains(paramfile, '/DEFAULTLIB:libcmtd.lib')
+    self.AssertFileContentContains(compile_params, '/MDd')
+    self.AssertFileContentContains(link_params, '/DEFAULTLIB:msvcrtd.lib')
+    self.AssertFileContentNotContains(compile_params, '/MTd')
+    self.AssertFileContentNotContains(link_params, '/DEFAULTLIB:libcmtd.lib')
 
   def testStaticLinkingMSVCRT(self):
     self.createProjectFiles()
@@ -414,26 +418,30 @@ def testStaticLinkingMSVCRT(self):
         'build', '//:A', '--output_groups=dynamic_library',
         '--features=static_link_msvcrt', '-s'
     ])
-    paramfile = os.path.join(bazel_output,
-                             'x64_windows-fastbuild/bin/A_0.dll-2.params')
+    compile_params = os.path.join(
+        bazel_output, 'x64_windows-fastbuild/bin/_objs/A/a.obj.params')
+    link_params = os.path.join(
+        bazel_output, 'x64_windows-fastbuild/bin/A_0.dll-2.params')
     self.AssertExitCode(exit_code, 0, stderr)
-    self.assertNotIn('/MD', ''.join(stderr))
-    self.AssertFileContentNotContains(paramfile, '/DEFAULTLIB:msvcrt.lib')
-    self.assertIn('/MT', ''.join(stderr))
-    self.AssertFileContentContains(paramfile, '/DEFAULTLIB:libcmt.lib')
+    self.AssertFileContentNotContains(compile_params, '/MD')
+    self.AssertFileContentNotContains(link_params, '/DEFAULTLIB:msvcrt.lib')
+    self.AssertFileContentContains(compile_params, '/MT')
+    self.AssertFileContentContains(link_params, '/DEFAULTLIB:libcmt.lib')
 
     # Test build in debug mode.
     exit_code, _, stderr = self.RunBazel([
         'build', '-c', 'dbg', '//:A', '--output_groups=dynamic_library',
         '--features=static_link_msvcrt', '-s'
     ])
-    paramfile = os.path.join(bazel_output,
-                             'x64_windows-dbg/bin/A_0.dll-2.params')
+    compile_params = os.path.join(
+        bazel_output, 'x64_windows-dbg/bin/_objs/A/a.obj.params')
+    link_params = os.path.join(
+        bazel_output, 'x64_windows-dbg/bin/A_0.dll-2.params')
     self.AssertExitCode(exit_code, 0, stderr)
-    self.assertNotIn('/MDd', ''.join(stderr))
-    self.AssertFileContentNotContains(paramfile, '/DEFAULTLIB:msvcrtd.lib')
-    self.assertIn('/MTd', ''.join(stderr))
-    self.AssertFileContentContains(paramfile, '/DEFAULTLIB:libcmtd.lib')
+    self.AssertFileContentNotContains(compile_params, '/MDd')
+    self.AssertFileContentNotContains(link_params, '/DEFAULTLIB:msvcrtd.lib')
+    self.AssertFileContentContains(compile_params, '/MTd')
+    self.AssertFileContentContains(link_params, '/DEFAULTLIB:libcmtd.lib')
 
   def testBuildSharedLibraryFromCcBinaryWithStaticLink(self):
     self.createProjectFiles()
@@ -1071,6 +1079,24 @@ def testBuildArm64CppBinaryWithMsvcCLAndCpuArm64Windows(self):
     self.AssertExitCode(exit_code, 0, stderr)
     self.assertIn('arm64\\cl.exe', ''.join(stderr))
 
+  def testLongCompileCommandLines(self):
+    self.CreateWorkspaceWithDefaultRepos('WORKSPACE')
+    self.ScratchFile('BUILD', [
+      'cc_binary(',
+      '    name = "long",',
+      '    srcs = ["long.cc"],',
+      # Creates a command that is longer than 32767 characters, which is the
+      # maximum length of a command line on Windows.
+      '    includes = [str(i) + 450 * "a"  for i in range(120)],',
+      ')',
+    ])
+    self.ScratchFile('long.cc', ['int main() { return 0; }'])
+
+    exit_code, _, stderr = self.RunBazel([
+      'build', '--verbose_failures', '//:long'
+    ])
+    self.AssertExitCode(exit_code, 0, stderr)
+
 
 if __name__ == '__main__':
   unittest.main()
diff --git a/tools/cpp/windows_cc_toolchain_config.bzl b/tools/cpp/windows_cc_toolchain_config.bzl
index d913692b7e05d7..3ac914a948ee72 100644
--- a/tools/cpp/windows_cc_toolchain_config.bzl
+++ b/tools/cpp/windows_cc_toolchain_config.bzl
@@ -377,6 +377,7 @@ def _impl(ctx):
 
         compiler_param_file_feature = feature(
             name = "compiler_param_file",
+            enabled = True,
         )
 
         copy_dynamic_libraries_to_binary_feature = feature(