--- a/hotspot/src/share/vm/utilities/internalVMTests.cpp	Thu Feb 04 11:38:11 2016 +0100
+++ b/hotspot/src/share/vm/utilities/internalVMTests.cpp	Thu Feb 04 14:06:43 2016 +0100
@@ -30,105 +30,62 @@
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 
-#define run_unit_test(unit_test_function_call)              \
-  tty->print_cr("Running test: " #unit_test_function_call); \
-  unit_test_function_call
+#define run_unit_test(unit_test_function_call)                \
+  void unit_test_function_call();                             \
+  run_test(#unit_test_function_call, unit_test_function_call);
 
-// Forward declaration
-void TestDependencyContext_test();
-void test_semaphore();
-void TestOS_test();
-void TestReservedSpace_test();
-void TestReserveMemorySpecial_test();
-void TestVirtualSpace_test();
-void TestMetaspaceAux_test();
-void TestMetachunk_test();
-void TestVirtualSpaceNode_test();
-void TestNewSize_test();
-void TestOldSize_test();
-void TestKlass_test();
-void TestBitMap_test();
-void TestAsUtf8();
-void Test_linked_list();
-void TestResourcehash_test();
-void TestChunkedList_test();
-void Test_log_length();
-void Test_configure_stdout();
-void Test_TempNewSymbol();
-void GlobalDefinitions_test();
-void GCTimer_test();
-void arrayOopDesc_test();
-void CollectedHeap_test();
-void QuickSort_test();
-void GuardedMemory_test();
-void AltHashing_test();
-void ObjectMonitor_test();
-void JSON_test();
-void DirectivesParser_test();
-
-#if INCLUDE_VM_STRUCTS
-void VMStructs_test();
-#endif
-
-#if INCLUDE_ALL_GCS
-void TestOldFreeSpaceCalculation_test();
-void TestG1BiasedArray_test();
-void TestBufferingOopClosure_test();
-void TestCodeCacheRemSet_test();
-void FreeRegionList_test();
-void IHOP_test();
-void test_memset_with_concurrent_readers();
-void TestPredictions_test();
-void WorkerDataArray_test();
-#endif
+void InternalVMTests::run_test(const char* name, void (*test)()) {
+  tty->print_cr("Running test: %s", name);
+  test();
+}
 
 void InternalVMTests::run() {
   tty->print_cr("Running internal VM tests");
-  run_unit_test(TestDependencyContext_test());
-  run_unit_test(test_semaphore());
-  run_unit_test(TestOS_test());
-  run_unit_test(TestReservedSpace_test());
-  run_unit_test(TestReserveMemorySpecial_test());
-  run_unit_test(TestVirtualSpace_test());
-  run_unit_test(TestMetaspaceAux_test());
-  run_unit_test(TestMetachunk_test());
-  run_unit_test(TestVirtualSpaceNode_test());
-  run_unit_test(GlobalDefinitions_test());
-  run_unit_test(GCTimer_test());
-  run_unit_test(arrayOopDesc_test());
-  run_unit_test(CollectedHeap_test());
-  run_unit_test(QuickSort_test());
-  run_unit_test(GuardedMemory_test());
-  run_unit_test(AltHashing_test());
-  run_unit_test(TestNewSize_test());
-  run_unit_test(TestOldSize_test());
-  run_unit_test(TestKlass_test());
-  run_unit_test(TestBitMap_test());
-  run_unit_test(TestAsUtf8());
-  run_unit_test(TestResourcehash_test());
-  run_unit_test(ObjectMonitor_test());
-  run_unit_test(Test_linked_list());
-  run_unit_test(TestChunkedList_test());
-  run_unit_test(JSON_test());
-  run_unit_test(Test_log_length());
-  run_unit_test(Test_configure_stdout());
-  run_unit_test(DirectivesParser_test());
-  run_unit_test(Test_TempNewSymbol());
+  run_unit_test(TestDependencyContext_test);
+  run_unit_test(test_semaphore);
+  run_unit_test(TestOS_test);
+  run_unit_test(TestReservedSpace_test);
+  run_unit_test(TestReserveMemorySpecial_test);
+  run_unit_test(TestVirtualSpace_test);
+  run_unit_test(TestMetaspaceAux_test);
+  run_unit_test(TestMetachunk_test);
+  run_unit_test(TestVirtualSpaceNode_test);
+  run_unit_test(GlobalDefinitions_test);
+  run_unit_test(GCTimer_test);
+  run_unit_test(arrayOopDesc_test);
+  run_unit_test(CollectedHeap_test);
+  run_unit_test(QuickSort_test);
+  run_unit_test(GuardedMemory_test);
+  run_unit_test(AltHashing_test);
+  run_unit_test(TestNewSize_test);
+  run_unit_test(TestOldSize_test);
+  run_unit_test(TestKlass_test);
+  run_unit_test(TestBitMap_test);
+  run_unit_test(TestAsUtf8);
+  run_unit_test(TestResourcehash_test);
+  run_unit_test(ObjectMonitor_test);
+  run_unit_test(Test_linked_list);
+  run_unit_test(TestChunkedList_test);
+  run_unit_test(JSON_test);
+  run_unit_test(Test_log_length);
+  run_unit_test(Test_configure_stdout);
+  run_unit_test(DirectivesParser_test);
+  run_unit_test(Test_TempNewSymbol);
 #if INCLUDE_VM_STRUCTS
-  run_unit_test(VMStructs_test());
+  run_unit_test(VMStructs_test);
 #endif
 #if INCLUDE_ALL_GCS
-  run_unit_test(TestOldFreeSpaceCalculation_test());
-  run_unit_test(TestG1BiasedArray_test());
-  run_unit_test(TestBufferingOopClosure_test());
-  run_unit_test(TestCodeCacheRemSet_test());
+  run_unit_test(TestOldFreeSpaceCalculation_test);
+  run_unit_test(TestG1BiasedArray_test);
+  run_unit_test(TestBufferingOopClosure_test);
+  run_unit_test(TestCodeCacheRemSet_test);
   if (UseG1GC) {
-    run_unit_test(FreeRegionList_test());
-    run_unit_test(IHOP_test());
+    run_unit_test(FreeRegionList_test);
+    run_unit_test(IHOP_test);
   }
-  run_unit_test(test_memset_with_concurrent_readers());
-  run_unit_test(TestPredictions_test());
-  run_unit_test(WorkerDataArray_test());
+  run_unit_test(test_memset_with_concurrent_readers);
+  run_unit_test(TestPredictions_test);
+  run_unit_test(WorkerDataArray_test);
 #endif
   tty->print_cr("All internal VM tests passed");
 }

--- a/hotspot/src/share/vm/utilities/internalVMTests.hpp	Thu Feb 04 11:38:11 2016 +0100
+++ b/hotspot/src/share/vm/utilities/internalVMTests.hpp	Thu Feb 04 14:06:43 2016 +0100
@@ -30,6 +30,7 @@
 #include "memory/allocation.hpp"
 
 class InternalVMTests : public AllStatic {
+  static void run_test(const char* name, void (*test)());
  public:
   static void run();
 };