--- old/test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp	2017-11-29 16:41:21.064885944 +0100
+++ new/test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp	2017-11-29 16:41:20.824876458 +0100
@@ -34,7 +34,8 @@
 
   // Default is to verify everything.
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
+  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyInitialMark));
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
@@ -43,25 +44,29 @@
   // Setting one will disable all other.
   verifier.parse_verification_type("full");
   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
+  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyInitialMark));
   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
 
   // Verify case sensitivity.
-  verifier.parse_verification_type("YOUNG");
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
-  verifier.parse_verification_type("young");
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoung));
+  verifier.parse_verification_type("YOUNG-ONLY");
+  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  verifier.parse_verification_type("young-only");
+  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
 
   // Verify perfect match
   verifier.parse_verification_type("mixedgc");
   ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
+  verifier.parse_verification_type("mixe");
+  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
   verifier.parse_verification_type("mixed");
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
 
-  // Verify the last two
+  // Verify the last three
+  verifier.parse_verification_type("initial-mark");
   verifier.parse_verification_type("remark");
   verifier.parse_verification_type("cleanup");
   ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));