--- a/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java	Fri Oct 02 06:06:22 2015 -0700
+++ b/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java	Fri Oct 02 16:48:31 2015 +0000
@@ -505,10 +505,7 @@
 
         runJavaCheckExitValue(pb, JVM_SUCCESS);
 
-/*
- * This check can be enabled after 8136552 is fixed:
- *      outputShouldNotContain("VM option '+PrintVMOptions'");
- */
+        outputShouldNotContain("VM option '+PrintVMOptions'");
         checkProperty("shared.property", "command_line_before");
         checkVMOption("MinHeapFreeRatio", "7");