diff --git a/core/src/validator.rs b/core/src/validator.rs
index e0278eaa3..f047d014f 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -230,9 +230,10 @@ impl Default for ValidatorConfig {
 
 impl ValidatorConfig {
     pub fn default_for_test() -> Self {
-        let mut config = Self::default();
-        config.rpc_config.full_api = true;
-        config
+        Self {
+            rpc_config: JsonRpcConfig::default_for_test(),
+            ..Self::default()
+        }
     }
 }
 
diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
index 52b45a769..963cebc7b 100644
--- a/rpc/src/rpc.rs
+++ b/rpc/src/rpc.rs
@@ -154,6 +154,15 @@ pub struct JsonRpcConfig {
     pub rpc_scan_and_fix_roots: bool,
 }
 
+impl JsonRpcConfig {
+    pub fn default_for_test() -> Self {
+        Self {
+            full_api: true,
+            ..Self::default()
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct JsonRpcRequestProcessor {
     bank_forks: Arc<RwLock<BankForks>>,
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 08b5e2102..293c83724 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -617,7 +617,7 @@ fn main() {
             enable_rpc_transaction_history: true,
             enable_cpi_and_log_storage: true,
             faucet_addr,
-            ..JsonRpcConfig::default()
+            ..JsonRpcConfig::default_for_test()
         })
         .pubsub_config(PubSubConfig {
             enable_vote_subscription,