--- old/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	2016-04-21 12:15:23.633095057 +0200
+++ new/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	2016-04-21 12:15:23.505095063 +0200
@@ -90,13 +90,6 @@
         excludeTestMaxRange("CICompilerCount");
 
         /*
-         * JDK-8153340
-         * Temporary exclude AllocatePrefetchDistance option from testing
-         */
-        excludeTestRange("AllocatePrefetchDistance");
-
-
-        /*
          * JDK-8136766
          * Temporarily remove ThreadStackSize from testing because Windows can set it to 0
          * (for default OS size) but other platforms insist it must be greater than 0
--- old/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	2016-04-21 12:15:23.633095057 +0200
+++ new/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	2016-04-21 12:15:23.505095063 +0200
@@ -90,10 +90,17 @@
 }
 
 Flag::Error AllocatePrefetchDistanceConstraintFunc(intx value, bool verbose) {
-  if (value < 0) {
+  intx min_value;
+  if (AllocatePrefetchStyle == 3) {
+    min_value = AllocatePrefetchStepSize;
+  } else {
+    min_value = 0;
+  }
+  if (value < min_value) {
     CommandLineError::print(verbose,
-                            "Unable to determine system-specific value for AllocatePrefetchDistance. "
-                            "Please provide appropriate value, if unsure, use 0 to disable prefetching\n");
+                            "Unable to determine system-specific value for AllocatePrefetchDistance, "
+                            "please provide appropriate value. If unsure, set value to AllocatePrefetchStepSize "
+                             "(if AllocatePrefetchStyle = 3) or to 0 (for other values of AllocatePrefetchStyle).\n");
     return Flag::VIOLATES_CONSTRAINT;
   }