diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 341dae8f0..560993f84 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -24,9 +24,10 @@ use {
         system_program,
     },
     solana_streamer::socket::SocketAddrSpace,
+    solana_test_validator::*,
     solana_validator::{
         admin_rpc_service, dashboard::Dashboard, ledger_lockfile, lock_ledger, println_name_value,
-        redirect_stderr_to_file, solana_test_validator::*,
+        redirect_stderr_to_file,
     },
     std::{
         collections::HashSet,
diff --git a/validator/src/lib.rs b/validator/src/lib.rs
index 347437c24..fe29b45d6 100644
--- a/validator/src/lib.rs
+++ b/validator/src/lib.rs
@@ -13,7 +13,10 @@ use {
         thread::JoinHandle,
     },
 };
-pub use {solana_gossip::cluster_info::MINIMUM_VALIDATOR_PORT_RANGE_WIDTH, solana_test_validator};
+pub use {
+    solana_gossip::cluster_info::MINIMUM_VALIDATOR_PORT_RANGE_WIDTH,
+    solana_test_validator as test_validator,
+};
 
 pub mod admin_rpc_service;
 pub mod bootstrap;