diff --git a/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh b/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh
index 7057adee90f..36f149be3b9 100755
--- a/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh
+++ b/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh
@@ -60,6 +60,7 @@ touch "$TOOLS_DIR"/src/proto/grpc/health/v1/__init__.py
 
 bazel build test/cpp/interop:xds_interop_client
 
+set -o history -H
 # Test cases "path_matching" and "header_matching" are not included in "all",
 # because not all interop clients in all languages support these new tests.
 #
@@ -76,3 +77,4 @@ GRPC_VERBOSITY=debug GRPC_TRACE=xds_client,xds_resolver,xds_cluster_manager_lb,c
     --client_cmd='bazel-bin/test/cpp/interop/xds_interop_client --server=xds:///{server_uri} --stats_port={stats_port} --qps={qps} {fail_on_failed_rpc} \
       {rpcs_to_send} \
       {metadata_to_send}'
+!! --xds_v3_support
diff --git a/tools/run_tests/run_xds_tests.py b/tools/run_tests/run_xds_tests.py
index 6b397d49b95..69967eda131 100755
--- a/tools/run_tests/run_xds_tests.py
+++ b/tools/run_tests/run_xds_tests.py
@@ -2241,7 +2241,8 @@ try:
                 # Workaround for Python 3, as report_utils will invoke decode() on
                 # result.message, which has a default value of ''.
                 result.message = result.message.encode('UTF-8')
-                test_results[test_case] = [result]
+                xds_version = 'v3' if args.xds_v3_support else 'v2'
+                test_results[test_case + '_' + xds_version] = [result]
                 if args.log_client_output:
                     logger.info('Client output:')
                     with open(test_log_filename, 'r') as client_output: