diff --git a/spec/defines/005_elasticsearch_instance_spec.rb b/spec/defines/005_elasticsearch_instance_spec.rb
index ee7736787..c5cb66c13 100644
--- a/spec/defines/005_elasticsearch_instance_spec.rb
+++ b/spec/defines/005_elasticsearch_instance_spec.rb
@@ -802,13 +802,13 @@ class { 'elasticsearch':
                 -XX:\+AlwaysPreTouch.
                 -XX:\+HeapDumpOnOutOfMemoryError.
                 -XX:\+UseCMSInitiatingOccupancyOnly.
-                -XX:\+UseConcMarkSweepGC.
                 -XX:-OmitStackTraceInFastThrow.
                 -XX:CMSInitiatingOccupancyFraction=75.
                 -Xms4g.
                 -Xmx4g.
                 -Xss1m.
                 -server.
+                8:-XX:\+UseConcMarkSweepGC.
                 8:-XX:\+PrintGCApplicationStoppedTime.
                 8:-XX:\+PrintGCDateStamps.
                 8:-XX:\+PrintGCDetails.
@@ -849,13 +849,13 @@ class { 'elasticsearch':
                 -XX:\+AlwaysPreTouch.
                 -XX:\+HeapDumpOnOutOfMemoryError.
                 -XX:\+UseCMSInitiatingOccupancyOnly.
-                -XX:\+UseConcMarkSweepGC.
                 -XX:-OmitStackTraceInFastThrow.
                 -XX:CMSInitiatingOccupancyFraction=75.
                 -Xms8g.
                 -Xmx8g.
                 -Xss1m.
                 -server.
+                8:-XX:\+UseConcMarkSweepGC.
                 8:-XX:\+PrintGCApplicationStoppedTime.
                 8:-XX:\+PrintGCDateStamps.
                 8:-XX:\+PrintGCDetails.
diff --git a/templates/etc/elasticsearch/jvm.options.erb b/templates/etc/elasticsearch/jvm.options.erb
index b61eab5ec..31349f9f6 100644
--- a/templates/etc/elasticsearch/jvm.options.erb
+++ b/templates/etc/elasticsearch/jvm.options.erb
@@ -9,7 +9,7 @@ end
 defaults = {
   '-Xms' => '-Xms2g',
   '-Xmx' => '-Xmx2g',
-  'UseConcMarkSweepGC' => '-XX:+UseConcMarkSweepGC',
+  'UseConcMarkSweepGC' => '8:-XX:+UseConcMarkSweepGC',
   'CMSInitiatingOccupancyFraction=' => '-XX:CMSInitiatingOccupancyFraction=75',
   'UseCMSInitiatingOccupancyOnly' => '-XX:+UseCMSInitiatingOccupancyOnly',
   'AlwaysPreTouch' => '-XX:+AlwaysPreTouch',