--- a/hotspot/src/share/vm/gc/g1/heapRegionSet.cpp	Thu Oct 20 16:53:39 2016 +0300
+++ b/hotspot/src/share/vm/gc/g1/heapRegionSet.cpp	Thu Oct 20 23:09:03 2016 +0300
@@ -370,50 +370,3 @@
               "master humongous set MT safety protocol outside a safepoint");
   }
 }
-
-void FreeRegionList_test() {
-  FreeRegionList l("test");
-
-  const uint num_regions_in_test = 5;
-  // Create a fake heap. It does not need to be valid, as the HeapRegion constructor
-  // does not access it.
-  MemRegion heap(NULL, num_regions_in_test * HeapRegion::GrainWords);
-  // Allocate a fake BOT because the HeapRegion constructor initializes
-  // the BOT.
-  size_t bot_size = G1BlockOffsetTable::compute_size(heap.word_size());
-  HeapWord* bot_data = NEW_C_HEAP_ARRAY(HeapWord, bot_size, mtGC);
-  ReservedSpace bot_rs(G1BlockOffsetTable::compute_size(heap.word_size()));
-  G1RegionToSpaceMapper* bot_storage =
-    G1RegionToSpaceMapper::create_mapper(bot_rs,
-                                         bot_rs.size(),
-                                         os::vm_page_size(),
-                                         HeapRegion::GrainBytes,
-                                         BOTConstants::N_bytes,
-                                         mtGC);
-  G1BlockOffsetTable bot(heap, bot_storage);
-  bot_storage->commit_regions(0, num_regions_in_test);
-
-  // Set up memory regions for the heap regions.
-  MemRegion mr0(heap.start(), HeapRegion::GrainWords);
-  MemRegion mr1(mr0.end(), HeapRegion::GrainWords);
-  MemRegion mr2(mr1.end(), HeapRegion::GrainWords);
-  MemRegion mr3(mr2.end(), HeapRegion::GrainWords);
-  MemRegion mr4(mr3.end(), HeapRegion::GrainWords);
-
-  HeapRegion hr0(0, &bot, mr0);
-  HeapRegion hr1(1, &bot, mr1);
-  HeapRegion hr2(2, &bot, mr2);
-  HeapRegion hr3(3, &bot, mr3);
-  HeapRegion hr4(4, &bot, mr4);
-  l.add_ordered(&hr1);
-  l.add_ordered(&hr0);
-  l.add_ordered(&hr3);
-  l.add_ordered(&hr4);
-  l.add_ordered(&hr2);
-  assert(l.length() == num_regions_in_test, "wrong length");
-  l.verify_list();
-
-  bot_storage->uncommit_regions(0, num_regions_in_test);
-  delete bot_storage;
-  FREE_C_HEAP_ARRAY(HeapWord, bot_data);
-}

--- a/hotspot/src/share/vm/utilities/internalVMTests.cpp	Thu Oct 20 16:53:39 2016 +0300
+++ b/hotspot/src/share/vm/utilities/internalVMTests.cpp	Thu Oct 20 23:09:03 2016 +0300
@@ -61,9 +61,6 @@
 #endif
 #if INCLUDE_ALL_GCS
   run_unit_test(TestBufferingOopClosure_test);
-  if (UseG1GC) {
-    run_unit_test(FreeRegionList_test);
-  }
   run_unit_test(WorkerDataArray_test);
   run_unit_test(ParallelCompact_test);
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/gc/g1/test_freeRegionList.cpp	Thu Oct 20 23:09:03 2016 +0300
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "unittest.hpp"
+
+// @requires UseG1GC
+TEST_VM(FreeRegionList, length) {
+  if (!UseG1GC) {
+    return;
+  }
+
+  FreeRegionList l("test");
+  const uint num_regions_in_test = 5;
+
+  // Create a fake heap. It does not need to be valid, as the HeapRegion constructor
+  // does not access it.
+  MemRegion heap(NULL, num_regions_in_test * HeapRegion::GrainWords);
+
+  // Allocate a fake BOT because the HeapRegion constructor initializes
+  // the BOT.
+  size_t bot_size = G1BlockOffsetTable::compute_size(heap.word_size());
+  HeapWord* bot_data = NEW_C_HEAP_ARRAY(HeapWord, bot_size, mtGC);
+  ReservedSpace bot_rs(G1BlockOffsetTable::compute_size(heap.word_size()));
+  G1RegionToSpaceMapper* bot_storage =
+    G1RegionToSpaceMapper::create_mapper(bot_rs,
+                                         bot_rs.size(),
+                                         os::vm_page_size(),
+                                         HeapRegion::GrainBytes,
+                                         BOTConstants::N_bytes,
+                                         mtGC);
+  G1BlockOffsetTable bot(heap, bot_storage);
+  bot_storage->commit_regions(0, num_regions_in_test);
+
+  // Set up memory regions for the heap regions.
+  MemRegion mr0(heap.start(), HeapRegion::GrainWords);
+  MemRegion mr1(mr0.end(), HeapRegion::GrainWords);
+  MemRegion mr2(mr1.end(), HeapRegion::GrainWords);
+  MemRegion mr3(mr2.end(), HeapRegion::GrainWords);
+  MemRegion mr4(mr3.end(), HeapRegion::GrainWords);
+
+  HeapRegion hr0(0, &bot, mr0);
+  HeapRegion hr1(1, &bot, mr1);
+  HeapRegion hr2(2, &bot, mr2);
+  HeapRegion hr3(3, &bot, mr3);
+  HeapRegion hr4(4, &bot, mr4);
+  l.add_ordered(&hr1);
+  l.add_ordered(&hr0);
+  l.add_ordered(&hr3);
+  l.add_ordered(&hr4);
+  l.add_ordered(&hr2);
+
+  EXPECT_EQ(l.length(), num_regions_in_test) << "Wrong free region list length";
+  l.verify_list();
+
+  bot_storage->uncommit_regions(0, num_regions_in_test);
+  delete bot_storage;
+  FREE_C_HEAP_ARRAY(HeapWord, bot_data);
+}