diff --git a/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc b/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc
index 285e1ca3db0..0b5ff48febc 100644
--- a/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc
@@ -316,17 +316,17 @@ DATASET_OUTPUT_SHAPES_TEST_P(MapAndBatchDatasetOpTest, MapAndBatchDatasetParams,
 std::vector<CardinalityTestCase<MapAndBatchDatasetParams>>
 CardinalityTestCases() {
   return {{/*dataset_params=*/MapAndBatchDatasetParams1(),
-           /*expected_cardinality=*/-2},
+           /*expected_cardinality=*/kUnknownCardinality},
           {/*dataset_params=*/MapAndBatchDatasetParams2(),
            /*expected_cardinality=*/2},
           {/*dataset_params=*/MapAndBatchDatasetParams3(),
            /*expected_cardinality=*/3},
           {/*dataset_params=*/MapAndBatchDatasetParams4(),
-           /*expected_cardinality=*/-2},
+           /*expected_cardinality=*/kUnknownCardinality},
           {/*dataset_params=*/MapAndBatchDatasetParams5(),
            /*expected_cardinality=*/2},
           {/*dataset_params=*/MapAndBatchDatasetParams6(),
-           /*expected_cardinality=*/-2}};
+           /*expected_cardinality=*/kUnknownCardinality}};
 }
 
 DATASET_CARDINALITY_TEST_P(MapAndBatchDatasetOpTest, MapAndBatchDatasetParams,
diff --git a/tensorflow/core/kernels/data/map_dataset_op_test.cc b/tensorflow/core/kernels/data/map_dataset_op_test.cc
index b5fb7709bb1..e773fc5509f 100644
--- a/tensorflow/core/kernels/data/map_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/map_dataset_op_test.cc
@@ -134,7 +134,7 @@ std::vector<CardinalityTestCase<MapDatasetParams>> CardinalityTestCases() {
   return {{/*dataset_params=*/MapDatasetParams1(),
            /*expected_cardinality=*/4},
           {/*dataset_params=*/MapDatasetParams2(),
-           /*expected_cardinality=*/-2},
+           /*expected_cardinality=*/kUnknownCardinality},
           {/*dataset_params=*/MapDatasetParams3(),
            /*expected_cardinality=*/4}};
 }
diff --git a/tensorflow/core/kernels/data/parallel_map_dataset_op_test.cc b/tensorflow/core/kernels/data/parallel_map_dataset_op_test.cc
index ea701c691c1..2e56b1b2685 100644
--- a/tensorflow/core/kernels/data/parallel_map_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/parallel_map_dataset_op_test.cc
@@ -329,17 +329,17 @@ TEST_F(ParallelMapDatasetOpTest, DatasetOutputShapes) {
 std::vector<CardinalityTestCase<ParallelMapDatasetParams>>
 CardinalityTestCases() {
   return {{/*dataset_params=*/ParallelMapDatasetParams1(),
-           /*expected_cardinality=*/-2},
+           /*expected_cardinality=*/kUnknownCardinality},
           {/*dataset_params=*/ParallelMapDatasetParams2(),
            /*expected_cardinality=*/4},
           {/*dataset_params=*/ParallelMapDatasetParams3(),
-           /*expected_cardinality=*/-2},
+           /*expected_cardinality=*/kUnknownCardinality},
           {/*dataset_params=*/ParallelMapDatasetParams4(),
-           /*expected_cardinality=*/-2},
+           /*expected_cardinality=*/kUnknownCardinality},
           {/*dataset_params=*/ParallelMapDatasetParams5(),
            /*expected_cardinality=*/4},
           {/*dataset_params=*/ParallelMapDatasetParams6(),
-           /*expected_cardinality=*/-2}};
+           /*expected_cardinality=*/kUnknownCardinality}};
 }
 
 DATASET_CARDINALITY_TEST_P(ParallelMapDatasetOpTest, ParallelMapDatasetParams,