diff --git a/Cargo.lock b/Cargo.lock
index 42cf193b72..03852d24b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3400,7 +3400,6 @@ name = "solana-gossip"
 version = "0.18.0-pre0"
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana 0.18.0-pre0",
  "solana-client 0.18.0-pre0",
  "solana-netutil 0.18.0-pre0",
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 257d101c51..e715712881 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -10,9 +10,9 @@ homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.0"
-env_logger = "0.6.2"
 solana = { path = "../core", version = "0.18.0-pre0" }
 solana-client = { path = "../client", version = "0.18.0-pre0" }
+solana-logger = { path = "../logger", version = "0.18.0-pre0" }
 solana-netutil = { path = "../netutil", version = "0.18.0-pre0" }
 solana-sdk = { path = "../sdk", version = "0.18.0-pre0" }
 
diff --git a/gossip/src/main.rs b/gossip/src/main.rs
index a80963bbca..f984aa11ea 100644
--- a/gossip/src/main.rs
+++ b/gossip/src/main.rs
@@ -20,7 +20,7 @@ fn pubkey_validator(pubkey: String) -> Result<(), String> {
 }
 
 fn main() -> Result<(), Box<dyn error::Error>> {
-    env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("solana=info")).init();
+    solana_logger::setup_with_filter("solana=info");
 
     let mut entrypoint_addr = SocketAddr::from(([127, 0, 0, 1], 8001));
     let entrypoint_string = entrypoint_addr.to_string();
diff --git a/logger/src/lib.rs b/logger/src/lib.rs
index fdc5d04d5f..bebd8f0e16 100644
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@@ -6,11 +6,14 @@ use std::sync::Once;
 
 static INIT: Once = Once::new();
 
-/// Setup function that is only run once, even if called multiple times.
-pub fn setup() {
+pub fn setup_with_filter(filter: &str) {
     INIT.call_once(|| {
-        env_logger::Builder::from_default_env()
+        env_logger::Builder::from_env(env_logger::Env::new().default_filter_or(filter))
             .default_format_timestamp_nanos(true)
             .init();
     });
 }
+
+pub fn setup() {
+    setup_with_filter("error");
+}
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index 37b412cbee..bec76498be 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -60,7 +60,6 @@ solana_ledger_tool=$(solana_program ledger-tool)
 solana_wallet=$(solana_program wallet)
 solana_replicator=$(solana_program replicator)
 
-export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 export RUST_BACKTRACE=1
 
 # shellcheck source=scripts/configure-metrics.sh
diff --git a/validator/src/main.rs b/validator/src/main.rs
index e278bbad12..aa2a2f55fd 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -23,7 +23,7 @@ fn port_range_validator(port_range: String) -> Result<(), String> {
 }
 
 fn main() {
-    solana_logger::setup();
+    solana_logger::setup_with_filter("solana=info");
     solana_metrics::set_panic_hook("validator");
 
     let default_dynamic_port_range =