--- a/hotspot/src/share/vm/gc/shared/collectedHeap.cpp	Tue Nov 01 16:23:29 2016 +0300
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.cpp	Wed Nov 23 12:01:57 2016 +0300
@@ -601,34 +601,3 @@
   _reserved.set_start(start);
   _reserved.set_end(end);
 }
-
-/////////////// Unit tests ///////////////
-
-#ifndef PRODUCT
-void CollectedHeap::test_is_in() {
-  CollectedHeap* heap = Universe::heap();
-
-  uintptr_t epsilon    = (uintptr_t) MinObjAlignment;
-  uintptr_t heap_start = (uintptr_t) heap->_reserved.start();
-  uintptr_t heap_end   = (uintptr_t) heap->_reserved.end();
-
-  // Test that NULL is not in the heap.
-  assert(!heap->is_in(NULL), "NULL is unexpectedly in the heap");
-
-  // Test that a pointer to before the heap start is reported as outside the heap.
-  assert(heap_start >= ((uintptr_t)NULL + epsilon), "sanity");
-  void* before_heap = (void*)(heap_start - epsilon);
-  assert(!heap->is_in(before_heap),
-         "before_heap: " PTR_FORMAT " is unexpectedly in the heap", p2i(before_heap));
-
-  // Test that a pointer to after the heap end is reported as outside the heap.
-  assert(heap_end <= ((uintptr_t)-1 - epsilon), "sanity");
-  void* after_heap = (void*)(heap_end + epsilon);
-  assert(!heap->is_in(after_heap),
-         "after_heap: " PTR_FORMAT " is unexpectedly in the heap", p2i(after_heap));
-}
-
-void CollectedHeap_test() {
-  CollectedHeap::test_is_in();
-}
-#endif

--- a/hotspot/src/share/vm/gc/shared/collectedHeap.hpp	Tue Nov 01 16:23:29 2016 +0300
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.hpp	Wed Nov 23 12:01:57 2016 +0300
@@ -612,9 +612,6 @@
     return false;
   }
 
-  /////////////// Unit tests ///////////////
-
-  NOT_PRODUCT(static void test_is_in();)
 };
 
 // Class to set and reset the GC cause for a CollectedHeap.

--- a/hotspot/src/share/vm/utilities/internalVMTests.cpp	Tue Nov 01 16:23:29 2016 +0300
+++ b/hotspot/src/share/vm/utilities/internalVMTests.cpp	Wed Nov 23 12:01:57 2016 +0300
@@ -49,7 +49,6 @@
   run_unit_test(TestVirtualSpaceNode_test);
   run_unit_test(TestGlobalDefinitions_test);
   run_unit_test(GCTimer_test);
-  run_unit_test(CollectedHeap_test);
   run_unit_test(ObjectMonitor_test);
   run_unit_test(DirectivesParser_test);
 #if INCLUDE_VM_STRUCTS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/gc/shared/test_collectedHeap.cpp	Wed Nov 23 12:01:57 2016 +0300
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2001, 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/shared/collectedHeap.hpp"
+#include "unittest.hpp"
+
+TEST_VM(CollectedHeap, is_in) {
+  CollectedHeap* heap = Universe::heap();
+
+  uintptr_t epsilon = (uintptr_t) MinObjAlignment;
+  uintptr_t heap_start = (uintptr_t) heap->reserved_region().start();
+  uintptr_t heap_end = (uintptr_t) heap->reserved_region().end();
+
+  // Test that NULL is not in the heap.
+  ASSERT_FALSE(heap->is_in(NULL)) << "NULL is unexpectedly in the heap";
+
+  // Test that a pointer to before the heap start is reported as outside the heap.
+  ASSERT_GE(heap_start, ((uintptr_t) NULL + epsilon))
+          << "Sanity check - heap should not start at 0";
+
+  void* before_heap = (void*) (heap_start - epsilon);
+  ASSERT_FALSE(heap->is_in(before_heap)) << "before_heap: " << p2i(before_heap)
+          << " is unexpectedly in the heap";
+
+  // Test that a pointer to after the heap end is reported as outside the heap.
+  ASSERT_LE(heap_end, ((uintptr_t)-1 - epsilon))
+          << "Sanity check - heap should not end at the end of address space";
+
+  void* after_heap = (void*) (heap_end + epsilon);
+  ASSERT_FALSE(heap->is_in(after_heap)) << "after_heap: " << p2i(after_heap)
+          << " is unexpectedly in the heap";
+}