--- a/hotspot/test/compiler/ciReplay/TestVM.sh	Thu Mar 06 12:45:59 2014 +0400
+++ b/hotspot/test/compiler/ciReplay/TestVM.sh	Thu Mar 06 12:46:04 2014 +0400
@@ -78,8 +78,8 @@
         positive_test `expr $stop_level + 50` "TIERED LEVEL $stop_level :: REPLAY" \
                 "-XX:TieredStopAtLevel=$stop_level"
         stop_level=`expr $stop_level + 1`
+        cleanup
     done
-    cleanup
 fi
 
 echo TEST PASSED

--- a/hotspot/test/compiler/ciReplay/common.sh	Thu Mar 06 12:45:59 2014 +0400
+++ b/hotspot/test/compiler/ciReplay/common.sh	Thu Mar 06 12:46:04 2014 +0400
@@ -99,14 +99,13 @@
 # $2 - non-tiered comp_level 
 nontiered_tests() {
     level=`grep "^compile " $replay_data | awk '{print $6}'`
-    # is level available in non-tiere
+    # is level available in non-tiered
     if [ "$level" -eq $2 ]
     then
         positive_test $1 "NON-TIERED :: AVAILABLE COMP_LEVEL" \
                 -XX:-TieredCompilation
     else
         negative_test `expr $1 + 1` "NON-TIERED :: UNAVAILABLE COMP_LEVEL" \
-        negative_test `expr $1 + 1` "NON-TIERED :: UNAVAILABLE COMP_LEVEL" \
                 -XX:-TieredCompilation
     fi
 }