diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
index beba2ca86a9df1..4ce0b1af961a37 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
@@ -33,6 +33,7 @@
 import com.google.devtools.common.options.OptionDefinition;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
+import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
 import com.google.devtools.common.options.TriState;
@@ -211,7 +212,7 @@ public static class TestOptions extends FragmentOptions {
     public Label coverageReportGenerator;
 
     @Option(
-        name = "experimental_windows_native_test_wrapper",
+        name = "incompatible_windows_native_test_wrapper",
         // Design:
         // https://github.com/laszlocsomor/proposals/blob/win-test-runner/designs/2018-07-18-windows-native-test-runner.md
         documentationCategory = OptionDocumentationCategory.TESTING,
@@ -221,6 +222,10 @@ public static class TestOptions extends FragmentOptions {
           OptionEffectTag.LOADING_AND_ANALYSIS,
           OptionEffectTag.TEST_RUNNER,
         },
+        metadataTags = {
+          OptionMetadataTag.INCOMPATIBLE_CHANGE,
+          OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES,
+        },
         defaultValue = "false",
         help =
             "On Windows: if true, uses the C++ test wrapper to run tests, otherwise uses "
diff --git a/src/test/py/bazel/test_wrapper_test.py b/src/test/py/bazel/test_wrapper_test.py
index ba91bd6e41f0ea..7665f6810d93f3 100644
--- a/src/test/py/bazel/test_wrapper_test.py
+++ b/src/test/py/bazel/test_wrapper_test.py
@@ -558,7 +558,7 @@ def _AssertXmlGeneratedByTestIsRetained(self, flag, split_xml=False):
 
   def testTestExecutionWithTestSetupSh(self):
     self._CreateMockWorkspace()
-    flag = '--noexperimental_windows_native_test_wrapper'
+    flag = '--noincompatible_windows_native_test_wrapper'
     self._AssertPassingTest(flag)
     self._AssertFailingTest(flag)
     self._AssertPrintingTest(flag)
@@ -596,7 +596,7 @@ def testTestExecutionWithTestSetupSh(self):
 
   def testTestExecutionWithTestWrapperExe(self):
     self._CreateMockWorkspace()
-    flag = '--experimental_windows_native_test_wrapper'
+    flag = '--incompatible_windows_native_test_wrapper'
     self._AssertPassingTest(flag)
     self._AssertFailingTest(flag)
     self._AssertPrintingTest(flag)