diff --git a/beacon_node/rest_api/tests/test.rs b/beacon_node/rest_api/tests/test.rs
index e5c404c430..7937c9bc34 100644
--- a/beacon_node/rest_api/tests/test.rs
+++ b/beacon_node/rest_api/tests/test.rs
@@ -3,7 +3,7 @@
 use beacon_chain::{BeaconChain, BeaconChainTypes};
 use node_test_rig::{
     environment::{Environment, EnvironmentBuilder},
-    testing_client_config, ClientGenesis, LocalBeaconNode,
+    testing_client_config, ClientConfig, ClientGenesis, LocalBeaconNode,
 };
 use remote_beacon_node::{PublishStatus, ValidatorDuty};
 use std::sync::Arc;
@@ -26,13 +26,10 @@ fn build_env() -> Environment<E> {
         .expect("environment should build")
 }
 
-fn build_node<E: EthSpec>(env: &mut Environment<E>) -> LocalBeaconNode<E> {
+fn build_node<E: EthSpec>(env: &mut Environment<E>, config: ClientConfig) -> LocalBeaconNode<E> {
     let context = env.core_context();
     env.runtime()
-        .block_on(LocalBeaconNode::production(
-            context,
-            testing_client_config(),
-        ))
+        .block_on(LocalBeaconNode::production(context, config))
         .expect("should block until node created")
 }
 
@@ -74,7 +71,7 @@ fn validator_produce_attestation() {
 
     let spec = &E::default_spec();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let beacon_chain = node
@@ -170,7 +167,7 @@ fn validator_duties_bulk() {
 
     let spec = &E::default_spec();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let beacon_chain = node
@@ -207,7 +204,7 @@ fn validator_duties() {
 
     let spec = &E::default_spec();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let beacon_chain = node
@@ -331,7 +328,7 @@ fn validator_block_post() {
         genesis_time: 13_371_337,
     };
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, config);
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let beacon_chain = node
@@ -397,7 +394,7 @@ fn validator_block_get() {
 
     let spec = &E::default_spec();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let beacon_chain = node
@@ -435,7 +432,7 @@ fn validator_block_get() {
 fn beacon_state() {
     let mut env = build_env();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let (state_by_slot, root) = env
@@ -479,7 +476,7 @@ fn beacon_state() {
 fn beacon_block() {
     let mut env = build_env();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let (block_by_slot, root) = env
@@ -523,7 +520,7 @@ fn beacon_block() {
 fn genesis_time() {
     let mut env = build_env();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let genesis_time = env
@@ -547,7 +544,7 @@ fn genesis_time() {
 fn fork() {
     let mut env = build_env();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let fork = env
@@ -571,7 +568,7 @@ fn fork() {
 fn eth2_config() {
     let mut env = build_env();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let eth2_config = env
@@ -595,7 +592,7 @@ fn eth2_config() {
 fn get_version() {
     let mut env = build_env();
 
-    let node = build_node(&mut env);
+    let node = build_node(&mut env, testing_client_config());
     let remote_node = node.remote_node().expect("should produce remote node");
 
     let version = env