--- a/hotspot/src/share/vm/prims/jni.cpp	Fri Nov 27 12:37:38 2015 +0100
+++ b/hotspot/src/share/vm/prims/jni.cpp	Mon Nov 30 19:38:51 2015 +0100
@@ -3865,7 +3865,7 @@
   unit_test_function_call
 
 // Forward declaration
-void TestNmethodBucket_test();
+void TestDependencyContext_test();
 void test_semaphore();
 void TestOS_test();
 void TestReservedSpace_test();
@@ -3890,7 +3890,7 @@
 void TestCodeCacheRemSet_test();
 void FreeRegionList_test();
 void IHOP_test();
-void test_memset_with_concurrent_readers();
+void test_memset_with_concurrent_readers() NOT_DEBUG_RETURN;
 void TestPredictions_test();
 void WorkerDataArray_test();
 #endif
@@ -3898,7 +3898,7 @@
 void execute_internal_vm_tests() {
   if (ExecuteInternalVMTests) {
     tty->print_cr("Running internal VM tests");
-    run_unit_test(TestNmethodBucket_test());
+    run_unit_test(TestDependencyContext_test());
     run_unit_test(test_semaphore());
     run_unit_test(TestOS_test());
     run_unit_test(TestReservedSpace_test());