1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 81f7dc433b..77ab72ce06 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -1240,7 +1240,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
   }
 
   protected BuildConfiguration getDataConfiguration() {
-    return getTargetConfiguration().getConfiguration(ConfigurationTransition.DATA);
+    BuildConfiguration targetConfig = getTargetConfiguration();
+    // TODO(bazel-team): do a proper data transition for dynamic configurations.
+    return targetConfig.useDynamicConfigurations()
+        ? targetConfig
+        : targetConfig.getConfiguration(ConfigurationTransition.DATA);
   }
 
   protected BuildConfiguration getHostConfiguration() {