diff --git a/platform/platform-tests/testData/diagnostic/analysis-baseline/testClassNameClash.25.txt b/platform/platform-tests/testData/diagnostic/analysis-baseline/testClassNameClash.25.txt
new file mode 100644
index 000000000000..459202cee368
--- /dev/null
+++ b/platform/platform-tests/testData/diagnostic/analysis-baseline/testClassNameClash.25.txt
@@ -0,0 +1,29 @@
+==================== HISTOGRAM ====================
+Histogram. Top 2147483647 by instance count [All-objects] [Only-strong-ref]:
+    1: [    7/  812B] [    7/  812B] java.lang.Class
+    2: [    1/    8B] [    1/    8B] MyTestClass!2
+    3: [    1/    8B] [    1/    8B] MyTestClass!1
+Total -        All:     9   828B 3 classes (Total instances: 9)
+Total - Strong-ref:     9   828B 3 classes (Total instances: 9)
+Unreachable objects:     0      0B
+=================== HEAP SUMMARY ==================
+Class count: 7
+Finalizable size: 0B
+Soft-reachable size: 0B
+Weak-reachable size: 0B
+Reachable only from disposer tree: 0
+======== INSTANCES OF EACH NOMINATED CLASS ========
+Nominated classes:
+ --> [1/8B] MyTestClass!1
+ --> [1/8B] MyTestClass!2
+
+CLASS: MyTestClass!1 (1 objects)
+Root 1:
+[    1/100%/    8B]     8B          1   ROOT: Global JNI
+[    1/100%/    8B]     8B          1 * (root): MyTestClass!1
+
+CLASS: MyTestClass!2 (1 objects)
+Root 1:
+[    1/100%/    8B]     8B          1   ROOT: Unknown
+[    1/100%/    8B]     8B          1 * (root): MyTestClass!2
+
diff --git a/platform/platform-tests/testData/diagnostic/analysis-baseline/testDominatorTreeFlameGraph.25.txt b/platform/platform-tests/testData/diagnostic/analysis-baseline/testDominatorTreeFlameGraph.25.txt
new file mode 100644
index 000000000000..535c7efb1b0a
--- /dev/null
+++ b/platform/platform-tests/testData/diagnostic/analysis-baseline/testDominatorTreeFlameGraph.25.txt
@@ -0,0 +1,32 @@
+============ DOMINATOR TREE FLAME GRAPH ===========
+9
+root
+A
+B
+E
+G
+C
+D
+F
+java.lang.Class
+0 15 14
+1 8 4
+2 6 1
+3 4 1
+4 4 0
+5 4 0
+6 2 0
+7 2 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
+8 29 0
diff --git a/platform/platform-tests/testData/diagnostic/analysis-baseline/testIgnoreRootWithNoMatchingObject.25.txt b/platform/platform-tests/testData/diagnostic/analysis-baseline/testIgnoreRootWithNoMatchingObject.25.txt
new file mode 100644
index 000000000000..12bd9209f780
--- /dev/null
+++ b/platform/platform-tests/testData/diagnostic/analysis-baseline/testIgnoreRootWithNoMatchingObject.25.txt
@@ -0,0 +1,22 @@
+==================== HISTOGRAM ====================
+Histogram. Top 2147483647 by instance count [All-objects] [Only-strong-ref]:
+    1: [    6/  696B] [    6/  696B] java.lang.Class
+    2: [    1/    8B] [    1/    8B] C1
+Total -        All:     7   704B 2 classes (Total instances: 7)
+Total - Strong-ref:     7   704B 2 classes (Total instances: 7)
+Unreachable objects:     0      0B
+=================== HEAP SUMMARY ==================
+Class count: 6
+Finalizable size: 0B
+Soft-reachable size: 0B
+Weak-reachable size: 0B
+Reachable only from disposer tree: 0
+======== INSTANCES OF EACH NOMINATED CLASS ========
+Nominated classes:
+ --> [1/8B] C1
+
+CLASS: C1 (1 objects)
+Root 1:
+[    1/100%/    8B]     8B          1   ROOT: Unknown
+[    1/100%/    8B]     8B          1 * (root): C1
+