--- old/test/gc/g1/TestRemsetLoggingPerRegion.java	2015-12-16 16:11:32.536322144 +0100
+++ new/test/gc/g1/TestRemsetLoggingPerRegion.java	2015-12-16 16:11:32.447319491 +0100
@@ -23,11 +23,14 @@
 
 /*
  * @test TestRemsetLoggingPerRegion.java
+ * @requires vm.gc=="G1" | vm.gc =="null"
  * @bug 8014078 8129977
- * @library /testlibrary
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management/sun.management
  * @build TestRemsetLoggingTools TestRemsetLoggingPerRegion
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @summary Verify output of -Xlog:gc+remset*=trace in regards to per-region type output
  * @run main TestRemsetLoggingPerRegion
  */
@@ -42,10 +45,6 @@
     public static void main(String[] args) throws Exception {
         String result;
 
-        if (!TestRemsetLoggingTools.testingG1GC()) {
-            return;
-        }
-
         // single remembered set summary output at the end
         result = TestRemsetLoggingTools.runTest(new String[] { "-Xlog:gc+remset*=trace" }, 0);
         TestRemsetLoggingTools.expectPerRegionRSetSummaries(result, 1, 0);