--- old/test/Makefile	2016-11-28 17:57:36.000000000 +0300
+++ new/test/Makefile	2016-11-28 17:57:35.000000000 +0300
@@ -314,6 +314,21 @@
   endif
 endif
 
+# Problematic tests to be excluded
+PROBLEM_LISTS=$(call MixedDirs,$(wildcard ProblemList.txt closed/ProblemList.txt))
+
+# Create exclude list for this platform and arch
+ifdef NO_EXCLUDES
+  JTREG_EXCLUSIONS =
+else
+  JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%)
+endif
+
+# convert list of directories to dos paths
+define MixedDirs
+$(foreach i,$1,$(shell $(GETMIXEDPATH) "${i}"))
+endef
+
 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run
 ifdef TESTDIRS
   TEST_SELECTION = $(TESTDIRS)
@@ -327,7 +342,7 @@
   else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1)
     CONCURRENCY := 12
   endif
-else 
+else
   CONCURRENCY := 1
 endif
 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
--- old/test/compiler/codecache/stress/OverloadCompileQueueTest.java	2016-11-28 17:57:38.000000000 +0300
+++ new/test/compiler/codecache/stress/OverloadCompileQueueTest.java	2016-11-28 17:57:38.000000000 +0300
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
- * @ignore 8166554
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
--- old/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	2016-11-28 17:57:41.000000000 +0300
+++ new/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	2016-11-28 17:57:40.000000000 +0300
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
  *
- * @ignore 8140405
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
--- old/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	2016-11-28 17:57:43.000000000 +0300
+++ new/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	2016-11-28 17:57:43.000000000 +0300
@@ -31,7 +31,6 @@
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta
  *
- * @ignore 8158860
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  *        jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject
  *        sun.hotspot.WhiteBox
--- old/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	2016-11-28 17:57:46.000000000 +0300
+++ new/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	2016-11-28 17:57:45.000000000 +0300
@@ -34,7 +34,6 @@
  *          jdk.vm.ci/jdk.vm.ci.code
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *
- * @ignore 8163894
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.InvalidateInstalledCodeTest
  * @build sun.hotspot.WhiteBox
--- old/test/compiler/startup/SmallCodeCacheStartup.java	2016-11-28 17:57:49.000000000 +0300
+++ new/test/compiler/startup/SmallCodeCacheStartup.java	2016-11-28 17:57:49.000000000 +0300
@@ -31,7 +31,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
- * @ignore 8134286
  * @run driver compiler.startup.SmallCodeCacheStartup
  */
 
--- old/test/compiler/tiered/LevelTransitionTest.java	2016-11-28 17:57:52.000000000 +0300
+++ new/test/compiler/tiered/LevelTransitionTest.java	2016-11-28 17:57:52.000000000 +0300
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
- * @ignore 8067651
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
@@ -266,4 +265,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
--- old/test/compiler/types/correctness/CorrectnessTest.java	2016-11-28 17:57:54.000000000 +0300
+++ new/test/compiler/types/correctness/CorrectnessTest.java	2016-11-28 17:57:54.000000000 +0300
@@ -30,7 +30,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
- * @ignore 8066173
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
--- old/test/compiler/types/correctness/OffTest.java	2016-11-28 17:57:58.000000000 +0300
+++ new/test/compiler/types/correctness/OffTest.java	2016-11-28 17:57:57.000000000 +0300
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *
- * @ignore 8066173
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
--- old/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java	2016-11-28 17:58:01.000000000 +0300
+++ new/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java	2016-11-28 17:58:00.000000000 +0300
@@ -52,7 +52,6 @@
  * @library /test/lib /
  * @modules java.management java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
- * @ignore 8156755
  *
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
--- old/test/gc/survivorAlignment/TestPromotionToSurvivor.java	2016-11-28 17:58:05.000000000 +0300
+++ new/test/gc/survivorAlignment/TestPromotionToSurvivor.java	2016-11-28 17:58:04.000000000 +0300
@@ -30,7 +30,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @ignore 8129886
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- old/test/runtime/CompressedOops/UseCompressedOops.java	2016-11-28 17:58:09.000000000 +0300
+++ new/test/runtime/CompressedOops/UseCompressedOops.java	2016-11-28 17:58:08.000000000 +0300
@@ -26,7 +26,6 @@
  * @bug 8022865
  * @summary Tests for different combination of UseCompressedOops options
  * @library /test/lib
- * @ignore 8079353
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main UseCompressedOops
--- old/test/runtime/NMT/MallocStressTest.java	2016-11-28 17:58:12.000000000 +0300
+++ new/test/runtime/NMT/MallocStressTest.java	2016-11-28 17:58:12.000000000 +0300
@@ -29,7 +29,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build sun.hotspot.WhiteBox
- * @ignore - This test is disabled since it will stress NMT and timeout during normal testing
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
  */
--- old/test/runtime/SharedArchiveFile/BootAppendTests.java	2016-11-28 17:58:15.000000000 +0300
+++ new/test/runtime/SharedArchiveFile/BootAppendTests.java	2016-11-28 17:58:15.000000000 +0300
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
- * @ignore 8150683
  * @compile javax/sound/sampled/MyClass.jasm
  * @compile org/omg/CORBA/Context.jasm
  * @compile nonjdk/myPackage/MyClass.java
--- old/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	2016-11-28 17:58:18.000000000 +0300
+++ new/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	2016-11-28 17:58:17.000000000 +0300
@@ -27,7 +27,6 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @ignore 8154204
  * @run main DefaultUseWithClient
  * @bug 8032224
  */
--- old/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	2016-11-28 17:58:20.000000000 +0300
+++ new/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	2016-11-28 17:58:20.000000000 +0300
@@ -43,7 +43,6 @@
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
  * @build SimpleJvmtiAgent
- * @ignore 8150318
  * @run main ClassFileInstaller SimpleJvmtiAgent
  * @run testng LoadAgentDcmdTest
  */
--- old/test/serviceability/jdwp/AllModulesCommandTest.java	2016-11-28 17:58:23.000000000 +0300
+++ new/test/serviceability/jdwp/AllModulesCommandTest.java	2016-11-28 17:58:23.000000000 +0300
@@ -32,7 +32,6 @@
  * @test
  * @summary Tests the modules-related JDWP commands
  * @library /test/lib
- * @ignore 8168478
  * @modules jdk.jdwp.agent
  * @modules java.base/jdk.internal.misc
  * @compile AllModulesCommandTestDebuggee.java
--- old/test/serviceability/sa/sadebugd/SADebugDTest.java	2016-11-28 17:58:26.000000000 +0300
+++ new/test/serviceability/sa/sadebugd/SADebugDTest.java	2016-11-28 17:58:25.000000000 +0300
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  *
- * @ignore 8163805
  * @run main/othervm SADebugDTest
  */
 import java.io.File;
--- /dev/null	2016-11-28 17:58:28.000000000 +0300
+++ new/test/ProblemList.txt	2016-11-28 17:58:28.000000000 +0300
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2009, 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.
+#
+
+#############################################################################
+#
+# List of quarantined tests -- tests that should not be run by default, because
+# they introduce noise in test results.
+#
+# List items are testnames followed by labels, all MUST BE commented
+#   as to why they are here and use a label:
+#     generic-all   Problems on all platforms
+#     generic-ARCH  Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
+#     OSNAME-all    Where OSNAME is one of: solaris, linux, windows, macosx, aix
+#     OSNAME-ARCH   Specific on to one OSNAME and ARCH, e.g. solaris-amd64
+#     OSNAME-REV    Specific on to one OSNAME and REV, e.g. solaris-5.8
+#
+# More than one label is allowed but must be on the same line.
+#
+#############################################################################
+
+# :hotspot_compiler
+
+compiler/codecache/stress/OverloadCompileQueueTest.java 8166554 generic-all
+compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8140405 generic-all
+compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all
+compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all
+compiler/startup/SmallCodeCacheStartup.java 8134286 generic-all
+compiler/tiered/LevelTransitionTest.java 8067651 generic-all
+compiler/types/correctness/CorrectnessTest.java 8066173 generic-all
+compiler/types/correctness/OffTest.java 8066173 generic-all
+
+#############################################################################
+
+# :hotspot_gc
+
+gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 8156755 generic-all
+gc/survivorAlignment/TestPromotionToSurvivor.java 8129886 generic-all
+
+#############################################################################
+
+# :hotspot_runtime
+
+runtime/CompressedOops/UseCompressedOops.java 8079353 generic-all
+# This test is disabled since it will stress NMT and timeout during normal testing
+runtime/NMT/MallocStressTest.java 8166548 generic-all
+runtime/SharedArchiveFile/BootAppendTests.java 8150683 generic-all
+runtime/SharedArchiveFile/DefaultUseWithClient.java 8154204 generic-all
+
+#############################################################################
+
+# :hotspot_serviceability
+
+serviceability/dcmd/jvmti/LoadAgentDcmdTest.java 8150318 generic-all
+serviceability/jdwp/AllModulesCommandTest.java 8168478 generic-all
+serviceability/sa/sadebugd/SADebugDTest.java 8163805 generic-all
+
+#############################################################################
+
+# :hotspot_misc
+
+#############################################################################
+