--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp	Mon Aug 19 16:08:28 2019 -0700
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp	Tue Aug 20 18:39:09 2019 +0200
@@ -53,7 +53,7 @@
 }
 
 bool ShenandoahTraversalAggressiveHeuristics::is_experimental() {
-  return true;
+  return false;
 }
 
 bool ShenandoahTraversalAggressiveHeuristics::is_diagnostic() {

--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp	Mon Aug 19 16:08:28 2019 -0700
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp	Tue Aug 20 18:39:09 2019 +0200
@@ -37,7 +37,7 @@
   _last_cset_select(0) {}
 
 bool ShenandoahTraversalHeuristics::is_experimental() {
-  return true;
+  return false;
 }
 
 bool ShenandoahTraversalHeuristics::is_diagnostic() {

--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	Mon Aug 19 16:08:28 2019 -0700
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	Tue Aug 20 18:39:09 2019 +0200
@@ -48,7 +48,7 @@
         testWith("-XX:ShenandoahGCHeuristics=static", Mode.PRODUCT);
         testWith("-XX:ShenandoahGCHeuristics=compact", Mode.PRODUCT);
 
-        testWith("-XX:ShenandoahGCMode=traversal", Mode.EXPERIMENTAL);
+        testWith("-XX:ShenandoahGCMode=traversal", Mode.PRODUCT);
 
         testWith("-XX:ShenandoahGCHeuristics=aggressive", Mode.DIAGNOSTIC);
         testWith("-XX:ShenandoahGCHeuristics=passive", Mode.DIAGNOSTIC);