diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
index 79f8fa5..8b5192b 100644
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
@@ -97,12 +97,12 @@ void ConcurrentMarkSweepPolicy::initialize_size_policy(size_t init_eden_size,
 }
 
 void ConcurrentMarkSweepPolicy::initialize_gc_policy_counters() {
-  // initialize the policy counters - 2 collectors, 3 generations
+  // initialize the policy counters - 2 collectors, 2 generations
   if (UseParNewGC) {
-    _gc_policy_counters = new GCPolicyCounters("ParNew:CMS", 2, 3);
+    _gc_policy_counters = new GCPolicyCounters("ParNew:CMS", 2, number_of_generations());
   }
   else {
-    _gc_policy_counters = new GCPolicyCounters("Copy:CMS", 2, 3);
+    _gc_policy_counters = new GCPolicyCounters("Copy:CMS", 2, number_of_generations());
   }
 }
 
@@ -120,13 +120,13 @@ bool ConcurrentMarkSweepPolicy::has_soft_ended_eden()
 void ASConcurrentMarkSweepPolicy::initialize_gc_policy_counters() {
 
   assert(size_policy() != NULL, "A size policy is required");
-  // initialize the policy counters - 2 collectors, 3 generations
+  // initialize the policy counters - 2 collectors, 2 generations
   if (UseParNewGC) {
-    _gc_policy_counters = new CMSGCAdaptivePolicyCounters("ParNew:CMS", 2, 3,
+    _gc_policy_counters = new CMSGCAdaptivePolicyCounters("ParNew:CMS", 2, number_of_generations(),
       size_policy());
   }
   else {
-    _gc_policy_counters = new CMSGCAdaptivePolicyCounters("Copy:CMS", 2, 3,
+    _gc_policy_counters = new CMSGCAdaptivePolicyCounters("Copy:CMS", 2, number_of_generations(),
       size_policy());
   }
 }
diff --git a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index b1397f3..2a974d5 100644
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -490,7 +490,7 @@ void G1CollectorPolicy::init() {
 
 // Create the jstat counters for the policy.
 void G1CollectorPolicy::initialize_gc_policy_counters() {
-  _gc_policy_counters = new GCPolicyCounters("GarbageFirst", 1, 3);
+  _gc_policy_counters = new GCPolicyCounters("GarbageFirst", 1, 2);
 }
 
 bool G1CollectorPolicy::predict_will_fit(uint young_length,
diff --git a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
index 7a78053..80baec7 100644
--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
@@ -118,9 +118,9 @@ jint ParallelScavengeHeap::initialize() {
     (old_gen()->virtual_space()->high_boundary() ==
      young_gen()->virtual_space()->low_boundary()),
     "Boundaries must meet");
-  // initialize the policy counters - 2 collectors, 3 generations
+  // initialize the policy counters - 2 collectors, 2 generations
   _gc_policy_counters =
-    new PSGCAdaptivePolicyCounters("ParScav:MSC", 2, 3, _size_policy);
+    new PSGCAdaptivePolicyCounters("ParScav:MSC", 2, 2, _size_policy);
   _psh = this;
 
   // Set up the GCTaskManager
diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp
index db6af88..0e9c1e4 100644
--- a/src/share/vm/memory/collectorPolicy.cpp
+++ b/src/share/vm/memory/collectorPolicy.cpp
@@ -984,11 +984,11 @@ void MarkSweepPolicy::initialize_generations() {
 }
 
 void MarkSweepPolicy::initialize_gc_policy_counters() {
-  // initialize the policy counters - 2 collectors, 3 generations
+  // initialize the policy counters - 2 collectors, 2 generations
   if (UseParNewGC) {
-    _gc_policy_counters = new GCPolicyCounters("ParNew:MSC", 2, 3);
+    _gc_policy_counters = new GCPolicyCounters("ParNew:MSC", 2, number_of_generations());
   } else {
-    _gc_policy_counters = new GCPolicyCounters("Copy:MSC", 2, 3);
+    _gc_policy_counters = new GCPolicyCounters("Copy:MSC", 2, number_of_generations());
   }
 }