--- old/make/jprt.properties	2015-11-24 12:23:33.000000000 -0800
+++ new/make/jprt.properties	2015-11-24 12:23:33.000000000 -0800
@@ -156,13 +156,13 @@
 
 # Test target list (no fastdebug & limited c2 testing)
 my.test.target.set=							\
-    solaris_sparcv9_5.11-product-c2-TESTNAME,				\
-    solaris_x64_5.11-product-c2-TESTNAME,				\
-    linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
-    linux_x64_2.6-product-c2-TESTNAME,					\
-    macosx_x64_10.9-product-c2-TESTNAME,				\
-    windows_i586_6.2-product-c1-TESTNAME,				\
-    windows_x64_6.2-product-c2-TESTNAME
+    solaris_sparcv9_5.11-{product|fastdebug}-c2-TESTNAME,				\
+    solaris_x64_5.11-{product|fastdebug}-c2-TESTNAME,				\
+    linux_i586_2.6-{product|fastdebug}-{c1|c2}-TESTNAME,				\
+    linux_x64_2.6-{product|fastdebug}-c2-TESTNAME,					\
+    macosx_x64_10.9-{product|fastdebug}-c2-TESTNAME,				\
+    windows_i586_6.2-{product|fastdebug}-c1-TESTNAME,				\
+    windows_x64_6.2-{product|fastdebug}-c2-TESTNAME
 
 # Default vm test targets (testset=default)
 my.test.targets.default=						\