diff --git a/eth2/state_processing/benches/benches.rs b/eth2/state_processing/benches/benches.rs
index 239b782a3..516f15215 100644
--- a/eth2/state_processing/benches/benches.rs
+++ b/eth2/state_processing/benches/benches.rs
@@ -1,11 +1,15 @@
+use criterion::Criterion;
 use criterion::{criterion_group, criterion_main};
 
 mod block_processing_benches;
 mod epoch_processing_benches;
 
-criterion_group!(
-    benches,
-    epoch_processing_benches::epoch_processing_16k_validators,
-    block_processing_benches::block_processing_16k_validators,
-);
+pub const VALIDATOR_COUNT: usize = 300_032;
+
+pub fn state_processing(c: &mut Criterion) {
+    block_processing_benches::bench_block_processing_n_validators(c, VALIDATOR_COUNT);
+    epoch_processing_benches::bench_epoch_processing_n_validators(c, VALIDATOR_COUNT);
+}
+
+criterion_group!(benches, state_processing,);
 criterion_main!(benches);
diff --git a/eth2/state_processing/benches/block_processing_benches.rs b/eth2/state_processing/benches/block_processing_benches.rs
index ea1ada193..06563b05b 100644
--- a/eth2/state_processing/benches/block_processing_benches.rs
+++ b/eth2/state_processing/benches/block_processing_benches.rs
@@ -13,11 +13,9 @@ use types::test_utils::{TestingBeaconBlockBuilder, TestingBeaconStateBuilder};
 use types::*;
 
 /// Run the benchmarking suite on a foundation spec with 16,384 validators.
-pub fn block_processing_16k_validators(c: &mut Criterion) {
+pub fn bench_block_processing_n_validators(c: &mut Criterion, validator_count: usize) {
     let spec = ChainSpec::foundation();
 
-    let validator_count = 300_032;
-
     let (mut state, keypairs) = build_state(validator_count, &spec);
     let block = build_block(&mut state, &keypairs, &spec);
 
diff --git a/eth2/state_processing/benches/epoch_processing_benches.rs b/eth2/state_processing/benches/epoch_processing_benches.rs
index 342889b3f..f7ae13676 100644
--- a/eth2/state_processing/benches/epoch_processing_benches.rs
+++ b/eth2/state_processing/benches/epoch_processing_benches.rs
@@ -17,11 +17,9 @@ pub const BENCHING_SAMPLE_SIZE: usize = 10;
 pub const SMALL_BENCHING_SAMPLE_SIZE: usize = 10;
 
 /// Run the benchmarking suite on a foundation spec with 16,384 validators.
-pub fn epoch_processing_16k_validators(c: &mut Criterion) {
+pub fn bench_epoch_processing_n_validators(c: &mut Criterion, validator_count: usize) {
     let spec = ChainSpec::foundation();
 
-    let validator_count = 300_032;
-
     let mut builder = TestingBeaconStateBuilder::new(validator_count, &spec);
 
     // Set the state to be just before an epoch transition.