diff --git a/test/compiler/ciReplay/TestVM.sh b/test/compiler/ciReplay/TestVM.sh
index e6c3cc569466709e7f55f1896769bb9589f5cb0f..6154466671d129fc00abbb017b55ea43a90657e2 100644
--- a/test/compiler/ciReplay/TestVM.sh
+++ b/test/compiler/ciReplay/TestVM.sh
@@ -78,8 +78,8 @@ then
         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
diff --git a/test/compiler/ciReplay/common.sh b/test/compiler/ciReplay/common.sh
index bcfdad823df331280007350dbde26d23ecdc4f10..34fd729a8fb65491a2258b101b2bbcb6d825ee65 100644
--- a/test/compiler/ciReplay/common.sh
+++ b/test/compiler/ciReplay/common.sh
@@ -99,13 +99,12 @@ common_tests() {
 # $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