--- old/test/java/lang/Float/BitwiseConversion.java	2014-08-19 20:24:05.000000000 +0800
+++ new/test/java/lang/Float/BitwiseConversion.java	2014-08-19 20:24:05.000000000 +0800
@@ -25,21 +25,23 @@
  * @test
  * @bug 5037596
  * @summary Verify bitwise conversion works for non-canonical NaN values
+ * @library ../Math
+ * @build FloatUtils
+ * @run main BitwiseConversion
  * @author Joseph D. Darcy
  */
 
 import static java.lang.Float.*;
-import static sun.misc.FloatConsts.*;
 
 public class BitwiseConversion {
     static int testNanCase(int x) {
         int errors  = 0;
         // Strip out sign and exponent bits
-        int y = x & SIGNIF_BIT_MASK;
+        int y = x & FloatUtils.SIGNIF_BIT_MASK;
 
         float values[] = {
-            intBitsToFloat(EXP_BIT_MASK | y),
-            intBitsToFloat(SIGN_BIT_MASK | EXP_BIT_MASK | y)
+            intBitsToFloat(FloatUtils.EXP_BIT_MASK | y),
+            intBitsToFloat(FloatUtils.SIGN_BIT_MASK | FloatUtils.EXP_BIT_MASK | y)
         };
 
         for(float value: values) {
@@ -60,7 +62,7 @@
     public static void main(String... argv) {
         int errors = 0;
 
-        for (int i = 0; i < SIGNIFICAND_WIDTH-1; i++) {
+        for (int i = 0; i < FloatUtils.SIGNIFICAND_WIDTH-1; i++) {
             errors += testNanCase(1<<i);
         }