diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java
index 0863adbcca6..aae4c0b01fc 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java
@@ -150,8 +150,6 @@ public class UnloadingTest extends GCTestBase {
     }
 
     private static void checkGCCounters() {
-//        System.out.println("WhiteBox.getWhiteBox().g1GetTotalCollections() = \t" + WhiteBox.getWhiteBox().g1GetTotalCollections());
-//        System.out.println("WhiteBox.getWhiteBox().g1GetTotalFullCollections() = \t" + WhiteBox.getWhiteBox().g1GetTotalFullCollections());
         GarbageCollectorMXBean oldGenBean = null;
         for (GarbageCollectorMXBean bean : ManagementFactory.getGarbageCollectorMXBeans()) {
             System.out.println("bean.getName() = \t\"" + bean.getName() + "\", bean.getCollectionCount() = \t" + bean.getCollectionCount());
@@ -159,9 +157,9 @@ public class UnloadingTest extends GCTestBase {
                 oldGenBean = bean;
             }
         }
-//        if (WhiteBox.getWhiteBox().g1GetTotalFullCollections() != 0 || (oldGenBean != null && oldGenBean.getCollectionCount() != 0)) {
+
         if (oldGenBean != null && oldGenBean.getCollectionCount() != 0) {
-            throw new RuntimeException("Full gc happened. Test was useless.");
+            throw new SkippedException("Full gc happened, skip the test.");
         }
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java b/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java
index b1755ed47e9..2d5dfa3f623 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java
@@ -23,6 +23,8 @@
 
 package nsk.share.test;
 
+import jtreg.SkippedException;
+
 import nsk.share.log.*;
 import nsk.share.runner.*;
 import nsk.share.TestFailure;
@@ -82,6 +84,8 @@ public class Tests {
                                         ((Runnable) o).run();
                                 if (o instanceof TestExitCode)
                                         exitCode = ((TestExitCode) o).getExitCode();
+                        } catch (SkippedException se) {
+                                throw se;
                         } catch (RuntimeException t) {
                                 getLog().error(t);
                                 exitCode = 97;