--- a/hotspot/src/os/windows/vm/os_windows.cpp	Fri May 20 01:47:32 2016 -0400
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Fri May 20 14:57:18 2016 +0000
@@ -5277,7 +5277,8 @@
         }
       }
       DWORD err = GetLastError();
-      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED) {
+      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED &&
+         (err == ERROR_INVALID_FUNCTION && phe.lpData != NULL)) {
         HeapUnlock(heap);
         fatal("heap walk aborted with error %d", err);
       }

--- a/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java	Fri May 20 01:47:32 2016 -0400
+++ b/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java	Fri May 20 14:57:18 2016 +0000
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- *
+ * @requires vm.flavor != "minimal"
  * @run main/othervm/native -agentlib:SimpleClassFileLoadHook=Foo,XXX,YYY
  *      SimpleClassFileLoadHookTest
  */