diff --git a/make/profile-rtjar-includes.txt b/make/profile-rtjar-includes.txt
index fc25e4800bcd224c1ba53a4d8eb123adf9642fd6..bda322fa91e702319f0c515020521d10602bfc00 100644
--- a/make/profile-rtjar-includes.txt
+++ b/make/profile-rtjar-includes.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -207,6 +207,8 @@ FULL_JRE_RTJAR_INCLUDE_PACKAGES := \
     javax/xml/bind \
     javax/xml/soap \
     javax/xml/ws \
+    jdk/internal/instrumentation \
+    jdk/management/resource \
     org/omg \
     sun/applet \
     sun/audio \
diff --git a/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java b/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
index 83b2c690410de679abb92803fa9a41294fd7d941..a0eac8d4056e786d603f5c753e66790e089e364c 100644
--- a/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
+++ b/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
@@ -66,9 +66,9 @@ public class TestProviderLeak {
                 megaByte = new byte [MB];
                 data.add(megaByte);
             } catch (OutOfMemoryError e) {
+                megaByte = null;    // Free memory ASAP
                 System.out.println("OOME is thrown when allocating "
                         + data.size() + "MB memory.");
-                megaByte = null;
 
                 for (int j = 0; j < RESERVATION && !data.isEmpty(); j++) {
                     data.removeLast();