diff -r 003aa3e59090 -r 9937ef7499dc test/jdk/jdk/jfr/event/os/TestCPUInformation.java
--- a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java	Wed Jul 11 13:41:25 2018 +0300
+++ b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java	Tue Jul 10 11:36:36 2018 +0200
@@ -53,8 +53,8 @@
             Events.assertField(event, "hwThreads").atLeast(1);
             Events.assertField(event, "cores").atLeast(1);
             Events.assertField(event, "sockets").atLeast(1);
-            Events.assertField(event, "cpu").containsAny("Intel", "AMD", "Unknown x86", "sparc", "ARM", "PPC", "PowerPC", "AArch64");
-            Events.assertField(event, "description").containsAny("Intel", "AMD", "Unknown x86", "SPARC", "ARM", "PPC", "PowerPC", "AArch64");
+            Events.assertField(event, "cpu").containsAny("Intel", "AMD", "Unknown x86", "sparc", "ARM", "PPC", "PowerPC", "AArch64", "s390");
+            Events.assertField(event, "description").containsAny("Intel", "AMD", "Unknown x86", "SPARC", "ARM", "PPC", "PowerPC", "AArch64", "zArch");
         }
     }
 }