diff --git a/include/envoy/server/configuration.h b/include/envoy/server/configuration.h
index 1c91da638828..9d62cfdba206 100644
--- a/include/envoy/server/configuration.h
+++ b/include/envoy/server/configuration.h
@@ -63,15 +63,9 @@ class Main {
   virtual RateLimit::ClientFactory& rateLimitClientFactory() PURE;
 
   /**
-   * @return Optional<std::string> the optional local/remote TCP statsd cluster to write to.
-   *         This cluster must be defined via the cluster manager configuration.
+   * @return std::list<Stats::SinkPtr>& the list of stats sinks initialized from the configuration.
    */
-  virtual Optional<std::string> statsdTcpClusterName() PURE;
-
-  /**
-   * @return Network::Address::InstanceConstSharedPtr the optional UDP statsd address to write to.
-   */
-  virtual Network::Address::InstanceConstSharedPtr statsdUdpIpAddress() PURE;
+  virtual std::list<Stats::SinkPtr>& statsSinks() PURE;
 
   /**
    * @return std::chrono::milliseconds the time interval between flushing to configured stat sinks.
diff --git a/source/exe/BUILD b/source/exe/BUILD
index f8e1912379bd..7fd9de2b1627 100644
--- a/source/exe/BUILD
+++ b/source/exe/BUILD
@@ -47,6 +47,7 @@ envoy_cc_library(
         "//source/server/config/network:ratelimit_lib",
         "//source/server/config/network:redis_proxy_lib",
         "//source/server/config/network:tcp_proxy_lib",
+        "//source/server/config/stats:statsd_lib",
         "//source/server/http:health_check_lib",
     ],
 )
diff --git a/source/server/BUILD b/source/server/BUILD
index 2c3d97c7001a..1894306274f3 100644
--- a/source/server/BUILD
+++ b/source/server/BUILD
@@ -236,7 +236,6 @@ envoy_cc_library(
         "//source/common/router:rds_lib",
         "//source/common/runtime:runtime_lib",
         "//source/common/singleton:manager_impl_lib",
-        "//source/common/stats:statsd_lib",
         "//source/common/upstream:cluster_manager_lib",
         "//source/server/http:admin_lib",
     ],
diff --git a/source/server/config/stats/BUILD b/source/server/config/stats/BUILD
new file mode 100644
index 000000000000..a056b0b0df13
--- /dev/null
+++ b/source/server/config/stats/BUILD
@@ -0,0 +1,24 @@
+licenses(["notice"])  # Apache 2
+
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_library",
+    "envoy_package",
+)
+
+envoy_package()
+
+envoy_cc_library(
+    name = "statsd_lib",
+    srcs = ["statsd.cc"],
+    hdrs = ["statsd.h"],
+    external_deps = [
+        "envoy_bootstrap",
+    ],
+    deps = [
+        "//include/envoy/registry",
+        "//source/common/network:address_lib",
+        "//source/common/stats:statsd_lib",
+        "//source/server:configuration_lib",
+    ],
+)
diff --git a/source/server/config/stats/statsd.cc b/source/server/config/stats/statsd.cc
new file mode 100644
index 000000000000..712c8e70ef17
--- /dev/null
+++ b/source/server/config/stats/statsd.cc
@@ -0,0 +1,53 @@
+#include "server/config/stats/statsd.h"
+
+#include <string>
+
+#include "envoy/registry/registry.h"
+
+#include "common/stats/statsd.h"
+
+#include "api/bootstrap.pb.h"
+
+namespace Envoy {
+namespace Server {
+namespace Configuration {
+
+Stats::SinkPtr StatsdSinkFactory::createStatsSink(const Protobuf::Message& config,
+                                                  Server::Instance& server) {
+
+  const auto& statsd_sink = dynamic_cast<const envoy::api::v2::StatsdSink&>(config);
+  switch (statsd_sink.statsd_specifier_case()) {
+  case envoy::api::v2::StatsdSink::kAddress: {
+    Network::Address::InstanceConstSharedPtr address =
+        Network::Utility::fromProtoAddress(statsd_sink.address());
+    ENVOY_LOG(info, "statsd UDP ip address: {}", address->asString());
+    return Stats::SinkPtr(
+        new Stats::Statsd::UdpStatsdSink(server.threadLocal(), std::move(address)));
+    break;
+  }
+  case envoy::api::v2::StatsdSink::kTcpClusterName:
+    ENVOY_LOG(info, "statsd TCP cluster: {}", statsd_sink.tcp_cluster_name());
+    return Stats::SinkPtr(new Stats::Statsd::TcpStatsdSink(
+        server.localInfo(), statsd_sink.tcp_cluster_name(), server.threadLocal(),
+        server.clusterManager(), server.stats()));
+    break;
+  default:
+    throw EnvoyException(
+        fmt::format("No tcp_cluster_name or address provided for {} Stats::Sink config", name()));
+  }
+}
+
+ProtobufTypes::MessagePtr StatsdSinkFactory::createEmptyConfigProto() {
+  return std::unique_ptr<envoy::api::v2::StatsdSink>(new envoy::api::v2::StatsdSink());
+}
+
+std::string StatsdSinkFactory::name() { return "envoy.statsd"; }
+
+/**
+ * Static registration for the statsd sink factory. @see RegisterFactory.
+ */
+static Registry::RegisterFactory<StatsdSinkFactory, StatsSinkFactory> register_;
+
+} // namespace Configuration
+} // namespace Server
+} // namespace Envoy
diff --git a/source/server/config/stats/statsd.h b/source/server/config/stats/statsd.h
new file mode 100644
index 000000000000..8569b283dd67
--- /dev/null
+++ b/source/server/config/stats/statsd.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <string>
+
+#include "envoy/server/instance.h"
+
+#include "server/configuration_impl.h"
+
+namespace Envoy {
+namespace Server {
+namespace Configuration {
+
+/**
+ * Config registration for the tcp statsd sink. @see StatsSinkFactory.
+ */
+class StatsdSinkFactory : Logger::Loggable<Logger::Id::config>, public StatsSinkFactory {
+public:
+  // StatsSinkFactory
+  Stats::SinkPtr createStatsSink(const Protobuf::Message& config, Instance& server) override;
+
+  ProtobufTypes::MessagePtr createEmptyConfigProto() override;
+
+  std::string name() override;
+};
+
+} // namespace Configuration
+} // namespace Server
+} // namespace Envoy
diff --git a/source/server/configuration_impl.cc b/source/server/configuration_impl.cc
index 20cee769231b..81870bfeb1ff 100644
--- a/source/server/configuration_impl.cc
+++ b/source/server/configuration_impl.cc
@@ -55,25 +55,6 @@ void MainImpl::initialize(const envoy::api::v2::Bootstrap& bootstrap, Instance&
                               server.localInfo(), server.stats(), server.listenerManager()));
   }
 
-  for (const auto& stats_sink : bootstrap.stats_sinks()) {
-    // TODO(mrice32): Add support for pluggable stats sinks.
-    ASSERT(stats_sink.name() == "envoy.statsd");
-    envoy::api::v2::StatsdSink statsd_sink;
-    MessageUtil::jsonConvert(stats_sink.config(), statsd_sink);
-
-    switch (statsd_sink.statsd_specifier_case()) {
-    case envoy::api::v2::StatsdSink::kAddress: {
-      statsd_udp_ip_address_ = Network::Utility::fromProtoAddress(statsd_sink.address());
-      break;
-    }
-    case envoy::api::v2::StatsdSink::kTcpClusterName:
-      statsd_tcp_cluster_name_.value(statsd_sink.tcp_cluster_name());
-      break;
-    default:
-      NOT_REACHED;
-    }
-  }
-
   stats_flush_interval_ =
       std::chrono::milliseconds(PROTOBUF_GET_MS_OR_DEFAULT(bootstrap, stats_flush_interval, 5000));
 
@@ -95,6 +76,8 @@ void MainImpl::initialize(const envoy::api::v2::Bootstrap& bootstrap, Instance&
   } else {
     ratelimit_client_factory_.reset(new RateLimit::NullFactoryImpl());
   }
+
+  initializeStatsSinks(bootstrap, server);
 }
 
 void MainImpl::initializeTracers(const envoy::api::v2::Tracing& configuration, Instance& server) {
@@ -127,6 +110,29 @@ void MainImpl::initializeTracers(const envoy::api::v2::Tracing& configuration, I
   }
 }
 
+void MainImpl::initializeStatsSinks(const envoy::api::v2::Bootstrap& bootstrap, Instance& server) {
+  ENVOY_LOG(info, "loading stats sink configuration");
+
+  for (const envoy::api::v2::StatsSink& sink_object : bootstrap.stats_sinks()) {
+    if (sink_object.name().empty()) {
+      throw EnvoyException(
+          "sink object does not have 'name' attribute to look up the implementation");
+    }
+
+    ProtobufTypes::String name = sink_object.name();
+    StatsSinkFactory* factory = Registry::FactoryRegistry<StatsSinkFactory>::getFactory(name);
+    if (factory != nullptr) {
+      ProtobufTypes::MessagePtr message = factory->createEmptyConfigProto();
+      if (sink_object.has_config()) {
+        MessageUtil::jsonConvert(sink_object.config(), *message);
+      }
+      stats_sinks_.emplace_back(factory->createStatsSink(*message, server));
+    } else {
+      throw EnvoyException(fmt::format("No Stats::Sink found for name: {}", name));
+    }
+  }
+}
+
 InitialImpl::InitialImpl(const envoy::api::v2::Bootstrap& bootstrap) {
   const auto& admin = bootstrap.admin();
   admin_.access_log_path_ = admin.access_log_path();
diff --git a/source/server/configuration_impl.h b/source/server/configuration_impl.h
index a7b4817a5026..ee06faf824d5 100644
--- a/source/server/configuration_impl.h
+++ b/source/server/configuration_impl.h
@@ -55,6 +55,37 @@ class HttpTracerFactory {
   virtual std::string name() PURE;
 };
 
+/**
+ * Implemented for each Stats::Sink and registered via Registry::registerFactory() or
+ * the convenience class RegisterFactory.
+ */
+class StatsSinkFactory {
+public:
+  virtual ~StatsSinkFactory() {}
+
+  /**
+   * Create a particular Stats::Sink implementation. If the implementation is unable to produce a
+   * Stats::Sink with the provided parameters, it should throw an EnvoyException. The returned
+   * pointer should always be valid.
+   * @param config supplies the custom proto configuration for the Stats::Sink
+   * @param server supplies the server instance
+   */
+  virtual Stats::SinkPtr createStatsSink(const Protobuf::Message& config, Instance& server) PURE;
+
+  /**
+   * @return ProtobufTypes::MessagePtr create empty config proto message for v2. The filter
+   *         config, which arrives in an opaque google.protobuf.Struct message, will be converted to
+   *         JSON and then parsed into this empty proto.
+   */
+  virtual ProtobufTypes::MessagePtr createEmptyConfigProto() PURE;
+
+  /**
+   * Returns the identifying name for a particular implementation of Stats::Sink produced by the
+   * factory.
+   */
+  virtual std::string name() PURE;
+};
+
 /**
  * Utilities for creating a filter chain for a network connection.
  */
@@ -88,10 +119,7 @@ class MainImpl : Logger::Loggable<Logger::Id::config>, public Main {
   Upstream::ClusterManager& clusterManager() override { return *cluster_manager_; }
   Tracing::HttpTracer& httpTracer() override { return *http_tracer_; }
   RateLimit::ClientFactory& rateLimitClientFactory() override { return *ratelimit_client_factory_; }
-  Optional<std::string> statsdTcpClusterName() override { return statsd_tcp_cluster_name_; }
-  Network::Address::InstanceConstSharedPtr statsdUdpIpAddress() override {
-    return statsd_udp_ip_address_;
-  }
+  std::list<Stats::SinkPtr>& statsSinks() override { return stats_sinks_; }
   std::chrono::milliseconds statsFlushInterval() override { return stats_flush_interval_; }
   std::chrono::milliseconds wdMissTimeout() const override { return watchdog_miss_timeout_; }
   std::chrono::milliseconds wdMegaMissTimeout() const override {
@@ -108,11 +136,12 @@ class MainImpl : Logger::Loggable<Logger::Id::config>, public Main {
    */
   void initializeTracers(const envoy::api::v2::Tracing& configuration, Instance& server);
 
+  void initializeStatsSinks(const envoy::api::v2::Bootstrap& bootstrap, Instance& server);
+
   std::unique_ptr<Upstream::ClusterManager> cluster_manager_;
   std::unique_ptr<LdsApi> lds_api_;
   Tracing::HttpTracerPtr http_tracer_;
-  Optional<std::string> statsd_tcp_cluster_name_;
-  Network::Address::InstanceConstSharedPtr statsd_udp_ip_address_;
+  std::list<Stats::SinkPtr> stats_sinks_;
   RateLimit::ClientFactoryPtr ratelimit_client_factory_;
   std::chrono::milliseconds stats_flush_interval_;
   std::chrono::milliseconds watchdog_miss_timeout_;
diff --git a/source/server/server.cc b/source/server/server.cc
index 981565055029..a4e8820cfa53 100644
--- a/source/server/server.cc
+++ b/source/server/server.cc
@@ -24,7 +24,6 @@
 #include "common/router/rds_impl.h"
 #include "common/runtime/runtime_impl.h"
 #include "common/singleton/manager_impl.h"
-#include "common/stats/statsd.h"
 #include "common/upstream/cluster_manager_impl.h"
 
 #include "server/configuration_impl.h"
@@ -132,7 +131,7 @@ void InstanceImpl::flushStats() {
   server_stats_.days_until_first_cert_expiring_.set(
       sslContextManager().daysUntilFirstCertExpires());
 
-  InstanceUtil::flushCountersAndGaugesToSinks(stat_sinks_, stats_store_);
+  InstanceUtil::flushCountersAndGaugesToSinks(config_->statsSinks(), stats_store_);
   stat_flush_timer_->enableTimer(config_->statsFlushInterval());
 }
 
@@ -228,7 +227,9 @@ void InstanceImpl::initialize(Options& options,
     ENVOY_LOG(warn, "caught and eating SIGHUP. See documentation for how to hot restart.");
   });
 
-  initializeStatSinks();
+  for (Stats::SinkPtr& sink : main_config->statsSinks()) {
+    stats_store_.addSink(*sink);
+  }
 
   // Some of the stat sinks may need dispatcher support so don't flush until the main loop starts.
   // Just setup the timer.
@@ -268,23 +269,6 @@ Runtime::LoaderPtr InstanceUtil::createRuntime(Instance& server,
   }
 }
 
-void InstanceImpl::initializeStatSinks() {
-  if (config_->statsdUdpIpAddress()) {
-    ENVOY_LOG(info, "statsd UDP ip address: {}", config_->statsdUdpIpAddress()->asString());
-    stat_sinks_.emplace_back(
-        new Stats::Statsd::UdpStatsdSink(thread_local_, config_->statsdUdpIpAddress()));
-    stats_store_.addSink(*stat_sinks_.back());
-  }
-
-  if (config_->statsdTcpClusterName().valid()) {
-    ENVOY_LOG(info, "statsd TCP cluster: {}", config_->statsdTcpClusterName().value());
-    stat_sinks_.emplace_back(
-        new Stats::Statsd::TcpStatsdSink(*local_info_, config_->statsdTcpClusterName().value(),
-                                         thread_local_, config_->clusterManager(), stats_store_));
-    stats_store_.addSink(*stat_sinks_.back());
-  }
-}
-
 void InstanceImpl::loadServerFlags(const Optional<std::string>& flags_path) {
   if (!flags_path.valid()) {
     return;
diff --git a/source/server/server.h b/source/server/server.h
index 0054bd63693b..e01591a059d5 100644
--- a/source/server/server.h
+++ b/source/server/server.h
@@ -138,7 +138,6 @@ class InstanceImpl : Logger::Loggable<Logger::Id::main>, public Instance {
   void flushStats();
   void initialize(Options& options, Network::Address::InstanceConstSharedPtr local_address,
                   ComponentFactory& component_factory);
-  void initializeStatSinks();
   void loadServerFlags(const Optional<std::string>& flags_path);
   uint64_t numConnections();
   void startWorkers();
@@ -148,7 +147,6 @@ class InstanceImpl : Logger::Loggable<Logger::Id::main>, public Instance {
   const time_t start_time_;
   time_t original_start_time_;
   Stats::StoreRoot& stats_store_;
-  std::list<Stats::SinkPtr> stat_sinks_;
   ServerStats server_stats_;
   ThreadLocal::Instance& thread_local_;
   Api::ApiPtr api_;
diff --git a/test/common/access_log/access_log_manager_impl_test.cc b/test/common/access_log/access_log_manager_impl_test.cc
index a296247d75b2..063703707431 100644
--- a/test/common/access_log/access_log_manager_impl_test.cc
+++ b/test/common/access_log/access_log_manager_impl_test.cc
@@ -11,10 +11,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace AccessLog {
 
 TEST(AccessLogManagerImpl, reopenAllFiles) {
diff --git a/test/common/common/utility_test.cc b/test/common/common/utility_test.cc
index 5b253af7c020..07c41a3f5d0f 100644
--- a/test/common/common/utility_test.cc
+++ b/test/common/common/utility_test.cc
@@ -8,9 +8,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::ContainerEq;
 
+namespace Envoy {
+
 TEST(StringUtil, atoul) {
   uint64_t out;
   EXPECT_FALSE(StringUtil::atoul("123b", out));
diff --git a/test/common/dynamo/dynamo_filter_test.cc b/test/common/dynamo/dynamo_filter_test.cc
index 3ff5289b5094..5e949fc87d48 100644
--- a/test/common/dynamo/dynamo_filter_test.cc
+++ b/test/common/dynamo/dynamo_filter_test.cc
@@ -14,12 +14,12 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::_;
 
+namespace Envoy {
 namespace Dynamo {
 
 class DynamoFilterTest : public testing::Test {
diff --git a/test/common/dynamo/dynamo_utility_test.cc b/test/common/dynamo/dynamo_utility_test.cc
index 089e35423ff0..f5c87b83a204 100644
--- a/test/common/dynamo/dynamo_utility_test.cc
+++ b/test/common/dynamo/dynamo_utility_test.cc
@@ -6,9 +6,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::_;
 
+namespace Envoy {
 namespace Dynamo {
 
 TEST(DynamoUtility, PartitionIdStatString) {
diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc
index 2c9ee6db8685..531909a4eee1 100644
--- a/test/common/event/dispatcher_impl_test.cc
+++ b/test/common/event/dispatcher_impl_test.cc
@@ -7,9 +7,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 
+namespace Envoy {
 namespace Event {
 
 class TestDeferredDeletable : public DeferredDeletable {
diff --git a/test/common/filesystem/filesystem_impl_test.cc b/test/common/filesystem/filesystem_impl_test.cc
index de25c6b8a21b..f8aa8b0bbda3 100644
--- a/test/common/filesystem/filesystem_impl_test.cc
+++ b/test/common/filesystem/filesystem_impl_test.cc
@@ -13,7 +13,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::NiceMock;
@@ -23,6 +22,8 @@ using testing::Sequence;
 using testing::Throw;
 using testing::_;
 
+namespace Envoy {
+
 TEST(FileSystemImpl, BadFile) {
   Event::MockDispatcher dispatcher;
   Thread::MutexBasicLockable lock;
diff --git a/test/common/filter/auth/client_ssl_test.cc b/test/common/filter/auth/client_ssl_test.cc
index b673986a94b1..72728add83e7 100644
--- a/test/common/filter/auth/client_ssl_test.cc
+++ b/test/common/filter/auth/client_ssl_test.cc
@@ -19,7 +19,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::Return;
@@ -28,6 +27,7 @@ using testing::ReturnRef;
 using testing::WithArg;
 using testing::_;
 
+namespace Envoy {
 namespace Filter {
 namespace Auth {
 namespace ClientSsl {
diff --git a/test/common/filter/ratelimit_test.cc b/test/common/filter/ratelimit_test.cc
index 1e7c3e102160..5c305845f0ae 100644
--- a/test/common/filter/ratelimit_test.cc
+++ b/test/common/filter/ratelimit_test.cc
@@ -15,7 +15,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::NiceMock;
@@ -23,6 +22,7 @@ using testing::Return;
 using testing::WithArgs;
 using testing::_;
 
+namespace Envoy {
 namespace RateLimit {
 namespace TcpFilter {
 
diff --git a/test/common/filter/tcp_proxy_test.cc b/test/common/filter/tcp_proxy_test.cc
index 6b9427e04e6c..490dd81791c8 100644
--- a/test/common/filter/tcp_proxy_test.cc
+++ b/test/common/filter/tcp_proxy_test.cc
@@ -18,13 +18,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Filter {
 
 TEST(TcpProxyConfigTest, NoRouteConfig) {
diff --git a/test/common/grpc/http1_bridge_filter_test.cc b/test/common/grpc/http1_bridge_filter_test.cc
index ac8c1aa01902..4e589cca0147 100644
--- a/test/common/grpc/http1_bridge_filter_test.cc
+++ b/test/common/grpc/http1_bridge_filter_test.cc
@@ -10,13 +10,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnPointee;
 using testing::ReturnRef;
 using testing::_;
 
+namespace Envoy {
 namespace Grpc {
 
 class GrpcHttp1BridgeFilterTest : public testing::Test {
diff --git a/test/common/grpc/rpc_channel_impl_test.cc b/test/common/grpc/rpc_channel_impl_test.cc
index 00f7c08ef6b0..496a6a58a76e 100644
--- a/test/common/grpc/rpc_channel_impl_test.cc
+++ b/test/common/grpc/rpc_channel_impl_test.cc
@@ -15,11 +15,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Grpc {
 
 class GrpcRequestImplTest : public testing::Test {
diff --git a/test/common/http/access_log/access_log_formatter_test.cc b/test/common/http/access_log/access_log_formatter_test.cc
index 2598896fc672..fee052926a30 100644
--- a/test/common/http/access_log/access_log_formatter_test.cc
+++ b/test/common/http/access_log/access_log_formatter_test.cc
@@ -15,12 +15,12 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 namespace AccessLog {
 
diff --git a/test/common/http/access_log/access_log_impl_test.cc b/test/common/http/access_log/access_log_impl_test.cc
index 6a6332cdd55c..dff821985bb0 100644
--- a/test/common/http/access_log/access_log_impl_test.cc
+++ b/test/common/http/access_log/access_log_impl_test.cc
@@ -28,12 +28,12 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 namespace AccessLog {
 namespace {
diff --git a/test/common/http/async_client_impl_test.cc b/test/common/http/async_client_impl_test.cc
index e9af44130db1..1643c7ee7074 100644
--- a/test/common/http/async_client_impl_test.cc
+++ b/test/common/http/async_client_impl_test.cc
@@ -21,7 +21,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::NiceMock;
 using testing::Ref;
@@ -30,6 +29,7 @@ using testing::ReturnRef;
 using testing::ReturnRefOfCopy;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class AsyncClientImplTest : public testing::Test {
diff --git a/test/common/http/codec_client_test.cc b/test/common/http/codec_client_test.cc
index 0d0121c05dff..65203e6a125a 100644
--- a/test/common/http/codec_client_test.cc
+++ b/test/common/http/codec_client_test.cc
@@ -18,7 +18,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::NiceMock;
 using testing::Pointee;
@@ -28,6 +27,7 @@ using testing::SaveArg;
 using testing::Throw;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class CodecClientTest : public testing::Test {
diff --git a/test/common/http/codes_test.cc b/test/common/http/codes_test.cc
index bb04e7d06376..d22bf2e505b5 100644
--- a/test/common/http/codes_test.cc
+++ b/test/common/http/codes_test.cc
@@ -15,9 +15,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class CodeUtilityTest : public testing::Test {
diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc
index aeeda6303f22..68a06792c5cc 100644
--- a/test/common/http/conn_manager_impl_test.cc
+++ b/test/common/http/conn_manager_impl_test.cc
@@ -36,7 +36,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::AnyNumber;
 using testing::AtLeast;
 using testing::InSequence;
@@ -50,6 +49,7 @@ using testing::Sequence;
 using testing::Test;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class HttpConnectionManagerImplTest : public Test, public ConnectionManagerConfig {
diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc
index b609b6c64066..868516a2f764 100644
--- a/test/common/http/conn_manager_utility_test.cc
+++ b/test/common/http/conn_manager_utility_test.cc
@@ -18,13 +18,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class ConnectionManagerUtilityTest : public testing::Test {
diff --git a/test/common/http/date_provider_impl_test.cc b/test/common/http/date_provider_impl_test.cc
index 29df9ff7e614..ea037ee0f8d9 100644
--- a/test/common/http/date_provider_impl_test.cc
+++ b/test/common/http/date_provider_impl_test.cc
@@ -10,9 +10,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 
+namespace Envoy {
 namespace Http {
 
 TEST(DateProviderImplTest, All) {
diff --git a/test/common/http/filter/buffer_filter_test.cc b/test/common/http/filter/buffer_filter_test.cc
index 405e3d05d289..135f427c4eaf 100644
--- a/test/common/http/filter/buffer_filter_test.cc
+++ b/test/common/http/filter/buffer_filter_test.cc
@@ -14,7 +14,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::DoAll;
 using testing::InSequence;
 using testing::NiceMock;
@@ -22,6 +21,7 @@ using testing::Return;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class BufferFilterTest : public testing::Test {
diff --git a/test/common/http/filter/fault_filter_test.cc b/test/common/http/filter/fault_filter_test.cc
index 7b2dc745cd9e..7198605eafda 100644
--- a/test/common/http/filter/fault_filter_test.cc
+++ b/test/common/http/filter/fault_filter_test.cc
@@ -21,7 +21,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::DoAll;
 using testing::Invoke;
 using testing::NiceMock;
@@ -30,6 +29,7 @@ using testing::ReturnRef;
 using testing::WithArgs;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 class FaultFilterTest : public testing::Test {
diff --git a/test/common/http/filter/ratelimit_test.cc b/test/common/http/filter/ratelimit_test.cc
index b9e76dae3a09..f5227649eb97 100644
--- a/test/common/http/filter/ratelimit_test.cc
+++ b/test/common/http/filter/ratelimit_test.cc
@@ -19,7 +19,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::NiceMock;
@@ -29,6 +28,7 @@ using testing::SetArgReferee;
 using testing::WithArgs;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 namespace RateLimit {
 
diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc
index 5d074564b6bd..69f71cfda1c1 100644
--- a/test/common/http/http1/codec_impl_test.cc
+++ b/test/common/http/http1/codec_impl_test.cc
@@ -16,7 +16,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::NiceMock;
@@ -24,6 +23,7 @@ using testing::Return;
 using testing::ReturnRef;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 namespace Http1 {
 
diff --git a/test/common/http/http1/conn_pool_test.cc b/test/common/http/http1/conn_pool_test.cc
index 9044d6b90488..b1ac8fc24455 100644
--- a/test/common/http/http1/conn_pool_test.cc
+++ b/test/common/http/http1/conn_pool_test.cc
@@ -20,7 +20,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::DoAll;
 using testing::InSequence;
 using testing::Invoke;
@@ -30,6 +29,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 namespace Http1 {
 
diff --git a/test/common/http/http2/conn_pool_test.cc b/test/common/http/http2/conn_pool_test.cc
index 1b304bb670e2..8f19bcad297b 100644
--- a/test/common/http/http2/conn_pool_test.cc
+++ b/test/common/http/http2/conn_pool_test.cc
@@ -17,7 +17,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::DoAll;
 using testing::InSequence;
 using testing::Invoke;
@@ -27,6 +26,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 namespace Http2 {
 
diff --git a/test/common/json/config_schemas_test.cc b/test/common/json/config_schemas_test.cc
index 367ff0a3f223..d01c63778f08 100644
--- a/test/common/json/config_schemas_test.cc
+++ b/test/common/json/config_schemas_test.cc
@@ -11,9 +11,9 @@
 #include "gtest/gtest.h"
 #include "spdlog/spdlog.h"
 
-namespace Envoy {
 using testing::_;
 
+namespace Envoy {
 namespace Json {
 
 std::vector<std::string> generateTestInputs() {
diff --git a/test/common/mongo/codec_impl_test.cc b/test/common/mongo/codec_impl_test.cc
index 0d6e4a94b2ab..fd38c085ed35 100644
--- a/test/common/mongo/codec_impl_test.cc
+++ b/test/common/mongo/codec_impl_test.cc
@@ -10,11 +10,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Eq;
 using testing::NiceMock;
 using testing::Pointee;
 
+namespace Envoy {
 namespace Mongo {
 
 class TestDecoderCallbacks : public DecoderCallbacks {
diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc
index 7b9d652a3e19..7186df375696 100644
--- a/test/common/network/connection_impl_test.cc
+++ b/test/common/network/connection_impl_test.cc
@@ -24,7 +24,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::AnyNumber;
 using testing::DoAll;
 using testing::InSequence;
@@ -35,6 +34,7 @@ using testing::StrictMock;
 using testing::Test;
 using testing::_;
 
+namespace Envoy {
 namespace Network {
 
 TEST(ConnectionImplUtility, updateBufferStats) {
diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc
index bf3670e03666..7d2bd8504d19 100644
--- a/test/common/network/filter_manager_impl_test.cc
+++ b/test/common/network/filter_manager_impl_test.cc
@@ -20,7 +20,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::NiceMock;
@@ -28,6 +27,7 @@ using testing::Return;
 using testing::WithArgs;
 using testing::_;
 
+namespace Envoy {
 namespace Network {
 
 class NetworkFilterManagerTest : public testing::Test, public BufferSource {
diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc
index b96f579f0a80..a6512e9a84a0 100644
--- a/test/common/network/listener_impl_test.cc
+++ b/test/common/network/listener_impl_test.cc
@@ -11,13 +11,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::ByRef;
 using testing::Eq;
 using testing::Invoke;
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Network {
 
 static void errorCallbackTest(Address::IpVersion version) {
diff --git a/test/common/network/proxy_protocol_test.cc b/test/common/network/proxy_protocol_test.cc
index ec0aa3cc5c87..1047cb8ff4ca 100644
--- a/test/common/network/proxy_protocol_test.cc
+++ b/test/common/network/proxy_protocol_test.cc
@@ -19,11 +19,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::NiceMock;
 using testing::_;
 
+namespace Envoy {
 namespace Network {
 
 class ProxyProtocolTest : public testing::TestWithParam<Address::IpVersion> {
diff --git a/test/common/ratelimit/ratelimit_impl_test.cc b/test/common/ratelimit/ratelimit_impl_test.cc
index 285146fd0fd5..ee3218d90b85 100644
--- a/test/common/ratelimit/ratelimit_impl_test.cc
+++ b/test/common/ratelimit/ratelimit_impl_test.cc
@@ -14,7 +14,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::AtLeast;
 using testing::Invoke;
 using testing::Ref;
@@ -22,6 +21,7 @@ using testing::Return;
 using testing::WithArg;
 using testing::_;
 
+namespace Envoy {
 namespace RateLimit {
 
 class MockRequestCallbacks : public RequestCallbacks {
diff --git a/test/common/redis/command_splitter_impl_test.cc b/test/common/redis/command_splitter_impl_test.cc
index 2c20a6967b9c..c38f03278be2 100644
--- a/test/common/redis/command_splitter_impl_test.cc
+++ b/test/common/redis/command_splitter_impl_test.cc
@@ -14,7 +14,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::ByRef;
 using testing::DoAll;
 using testing::Eq;
@@ -24,6 +23,7 @@ using testing::Return;
 using testing::WithArg;
 using testing::_;
 
+namespace Envoy {
 namespace Redis {
 namespace CommandSplitter {
 
diff --git a/test/common/redis/conn_pool_impl_test.cc b/test/common/redis/conn_pool_impl_test.cc
index ec946759bc62..bc899a102355 100644
--- a/test/common/redis/conn_pool_impl_test.cc
+++ b/test/common/redis/conn_pool_impl_test.cc
@@ -14,7 +14,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Eq;
 using testing::InSequence;
 using testing::Invoke;
@@ -24,6 +23,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Redis {
 namespace ConnPool {
 
diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc
index 119c1ae9b5dd..a1c417fce2bf 100644
--- a/test/common/router/config_impl_test.cc
+++ b/test/common/router/config_impl_test.cc
@@ -18,7 +18,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::ContainerEq;
 using testing::NiceMock;
 using testing::Return;
@@ -26,6 +25,7 @@ using testing::ReturnRef;
 using testing::StrNe;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 namespace {
 
diff --git a/test/common/router/rds_impl_test.cc b/test/common/router/rds_impl_test.cc
index 66153c9074f8..889ea0f07774 100644
--- a/test/common/router/rds_impl_test.cc
+++ b/test/common/router/rds_impl_test.cc
@@ -20,7 +20,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::Return;
@@ -28,6 +27,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 namespace {
 
diff --git a/test/common/router/retry_state_impl_test.cc b/test/common/router/retry_state_impl_test.cc
index 5e21da3af5e1..bb35555d6ef9 100644
--- a/test/common/router/retry_state_impl_test.cc
+++ b/test/common/router/retry_state_impl_test.cc
@@ -13,11 +13,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 
 class RouterRetryStateImplTest : public testing::Test {
diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc
index 5f3d5f5da507..454f795244bd 100644
--- a/test/common/router/router_ratelimit_test.cc
+++ b/test/common/router/router_ratelimit_test.cc
@@ -18,11 +18,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::ReturnRef;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 namespace {
 
diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc
index ef180489ecfd..50517563664a 100644
--- a/test/common/router/router_test.cc
+++ b/test/common/router/router_test.cc
@@ -20,7 +20,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::AtLeast;
 using testing::Invoke;
 using testing::NiceMock;
@@ -29,6 +28,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 
 class TestFilter : public Filter {
diff --git a/test/common/router/shadow_writer_impl_test.cc b/test/common/router/shadow_writer_impl_test.cc
index 942eac5bac25..e5b1f3bd827b 100644
--- a/test/common/router/shadow_writer_impl_test.cc
+++ b/test/common/router/shadow_writer_impl_test.cc
@@ -10,10 +10,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 
 TEST(ShadowWriterImplTest, All) {
diff --git a/test/common/runtime/runtime_impl_test.cc b/test/common/runtime/runtime_impl_test.cc
index 6802d3ab6d81..f7315a34c67e 100644
--- a/test/common/runtime/runtime_impl_test.cc
+++ b/test/common/runtime/runtime_impl_test.cc
@@ -13,11 +13,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnNew;
 
+namespace Envoy {
 namespace Runtime {
 
 TEST(UUID, checkLengthOfUUID) {
diff --git a/test/common/ssl/connection_impl_test.cc b/test/common/ssl/connection_impl_test.cc
index 09098ecaab9a..310f89c920ca 100644
--- a/test/common/ssl/connection_impl_test.cc
+++ b/test/common/ssl/connection_impl_test.cc
@@ -27,11 +27,11 @@
 #include "gtest/gtest.h"
 #include "openssl/ssl.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::StrictMock;
 using testing::_;
 
+namespace Envoy {
 namespace Ssl {
 
 namespace {
diff --git a/test/common/stats/thread_local_store_test.cc b/test/common/stats/thread_local_store_test.cc
index 6e43fc6e8847..28a473b2cd72 100644
--- a/test/common/stats/thread_local_store_test.cc
+++ b/test/common/stats/thread_local_store_test.cc
@@ -13,13 +13,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Invoke;
 using testing::NiceMock;
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Stats {
 
 /**
diff --git a/test/common/stats/udp_statsd_test.cc b/test/common/stats/udp_statsd_test.cc
index 2a8a88bac299..db13ee24cd0b 100644
--- a/test/common/stats/udp_statsd_test.cc
+++ b/test/common/stats/udp_statsd_test.cc
@@ -12,9 +12,9 @@
 #include "gtest/gtest.h"
 #include "spdlog/spdlog.h"
 
-namespace Envoy {
 using testing::NiceMock;
 
+namespace Envoy {
 namespace Stats {
 namespace Statsd {
 
diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc
index 0fa4db70c675..19c41f05b596 100644
--- a/test/common/upstream/load_balancer_impl_test.cc
+++ b/test/common/upstream/load_balancer_impl_test.cc
@@ -13,10 +13,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 
+namespace Envoy {
 namespace Upstream {
 
 static HostSharedPtr newTestHost(Upstream::ClusterInfoConstSharedPtr cluster,
diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc
index 4391ad700330..3fcee22e6102 100644
--- a/test/common/upstream/load_balancer_simulation_test.cc
+++ b/test/common/upstream/load_balancer_simulation_test.cc
@@ -14,10 +14,10 @@
 #include "gtest/gtest.h"
 #include "spdlog/spdlog.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 
+namespace Envoy {
 namespace Upstream {
 
 static HostSharedPtr newTestHost(Upstream::ClusterInfoConstSharedPtr cluster,
diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc
index 00b9c2121088..2f5024daf5f6 100644
--- a/test/common/upstream/logical_dns_cluster_test.cc
+++ b/test/common/upstream/logical_dns_cluster_test.cc
@@ -19,11 +19,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::NiceMock;
 using testing::_;
 
+namespace Envoy {
 namespace Upstream {
 
 class LogicalDnsClusterTest : public testing::Test {
diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc
index e837e4482487..7e1a7dc2621e 100644
--- a/test/common/upstream/outlier_detection_impl_test.cc
+++ b/test/common/upstream/outlier_detection_impl_test.cc
@@ -20,13 +20,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Upstream {
 namespace Outlier {
 
diff --git a/test/common/upstream/resource_manager_impl_test.cc b/test/common/upstream/resource_manager_impl_test.cc
index a4fc743690d3..792f442a4bb3 100644
--- a/test/common/upstream/resource_manager_impl_test.cc
+++ b/test/common/upstream/resource_manager_impl_test.cc
@@ -5,10 +5,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 
+namespace Envoy {
 namespace Upstream {
 
 TEST(ResourceManagerImplTest, RuntimeResourceManager) {
diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc
index 1b03a20e0e48..77af034eb822 100644
--- a/test/common/upstream/ring_hash_lb_test.cc
+++ b/test/common/upstream/ring_hash_lb_test.cc
@@ -11,11 +11,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Upstream {
 
 static HostSharedPtr newTestHost(Upstream::ClusterInfoConstSharedPtr cluster,
diff --git a/test/common/upstream/sds_test.cc b/test/common/upstream/sds_test.cc
index 00ac0faddf3e..110fc0223e27 100644
--- a/test/common/upstream/sds_test.cc
+++ b/test/common/upstream/sds_test.cc
@@ -24,7 +24,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::DoAll;
 using testing::InSequence;
 using testing::Invoke;
@@ -34,6 +33,7 @@ using testing::SaveArg;
 using testing::WithArg;
 using testing::_;
 
+namespace Envoy {
 namespace Upstream {
 
 class SdsTest : public testing::Test {
diff --git a/test/config_test/BUILD b/test/config_test/BUILD
index 39058a4a70af..af3e819682ff 100644
--- a/test/config_test/BUILD
+++ b/test/config_test/BUILD
@@ -22,6 +22,7 @@ envoy_cc_test(
     ],
     deps = [
         ":config_test_lib",
+        "//source/server/config/stats:statsd_lib",
         "//test/test_common:environment_lib",
         "//test/test_common:utility_lib",
     ],
diff --git a/test/integration/BUILD b/test/integration/BUILD
index 6571fdbaf3bd..00281f6ae4fc 100644
--- a/test/integration/BUILD
+++ b/test/integration/BUILD
@@ -176,6 +176,7 @@ envoy_cc_test_library(
         "//source/server/config/network:ratelimit_lib",
         "//source/server/config/network:redis_proxy_lib",
         "//source/server/config/network:tcp_proxy_lib",
+        "//source/server/config/stats:statsd_lib",
         "//source/server/http:health_check_lib",
         "//test/mocks/buffer:buffer_mocks",
         "//test/mocks/upstream:upstream_mocks",
@@ -199,6 +200,7 @@ envoy_cc_test(
     deps = [
         ":integration_lib",
         "//source/common/http:header_map_lib",
+        "//source/server/config/stats:statsd_lib",
         "//test/test_common:utility_lib",
     ],
 )
@@ -228,7 +230,6 @@ envoy_cc_test(
         ":integration_lib",
         "//source/common/buffer:buffer_lib",
         "//source/common/http:codec_client_lib",
-        "//source/common/stats:stats_lib",
     ],
 )
 
diff --git a/test/mocks/access_log/mocks.cc b/test/mocks/access_log/mocks.cc
index 0901d1eb726c..2d8d7aa429b6 100644
--- a/test/mocks/access_log/mocks.cc
+++ b/test/mocks/access_log/mocks.cc
@@ -3,10 +3,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace AccessLog {
 
 MockAccessLogManager::MockAccessLogManager() {
diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc
index 6f1eeb99925d..6e28b2b708f8 100644
--- a/test/mocks/api/mocks.cc
+++ b/test/mocks/api/mocks.cc
@@ -3,10 +3,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Api {
 
 MockApi::MockApi() { ON_CALL(*this, createFile(_, _, _, _)).WillByDefault(Return(file_)); }
diff --git a/test/mocks/event/mocks.cc b/test/mocks/event/mocks.cc
index 72642f456a18..aa4d78472a1a 100644
--- a/test/mocks/event/mocks.cc
+++ b/test/mocks/event/mocks.cc
@@ -3,7 +3,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::NiceMock;
 using testing::Return;
@@ -11,6 +10,7 @@ using testing::ReturnNew;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Event {
 
 MockDispatcher::MockDispatcher() {
diff --git a/test/mocks/http/mocks.cc b/test/mocks/http/mocks.cc
index a1ec0215c340..6a571cfbb52b 100644
--- a/test/mocks/http/mocks.cc
+++ b/test/mocks/http/mocks.cc
@@ -6,13 +6,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::Return;
 using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Http {
 
 MockConnectionManagerConfig::MockConnectionManagerConfig() {
diff --git a/test/mocks/init/mocks.cc b/test/mocks/init/mocks.cc
index a62ab110442e..c8ddb6b96ca9 100644
--- a/test/mocks/init/mocks.cc
+++ b/test/mocks/init/mocks.cc
@@ -5,10 +5,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::_;
 
+namespace Envoy {
 namespace Init {
 
 MockTarget::MockTarget() {
diff --git a/test/mocks/local_info/mocks.cc b/test/mocks/local_info/mocks.cc
index e0782542578e..b98d86e06da3 100644
--- a/test/mocks/local_info/mocks.cc
+++ b/test/mocks/local_info/mocks.cc
@@ -5,11 +5,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Return;
 using testing::ReturnPointee;
 using testing::ReturnRef;
 
+namespace Envoy {
 namespace LocalInfo {
 
 MockLocalInfo::MockLocalInfo() : address_(new Network::Address::Ipv4Instance("127.0.0.1")) {
diff --git a/test/mocks/network/mocks.cc b/test/mocks/network/mocks.cc
index 4bfad2ecb387..9fab8d27cde3 100644
--- a/test/mocks/network/mocks.cc
+++ b/test/mocks/network/mocks.cc
@@ -12,7 +12,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::Return;
 using testing::ReturnPointee;
@@ -20,6 +19,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Network {
 
 MockConnectionCallbacks::MockConnectionCallbacks() {}
diff --git a/test/mocks/redis/mocks.cc b/test/mocks/redis/mocks.cc
index 806629c8b508..cc5537a7b037 100644
--- a/test/mocks/redis/mocks.cc
+++ b/test/mocks/redis/mocks.cc
@@ -9,10 +9,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::_;
 
+namespace Envoy {
 namespace Redis {
 
 bool operator==(const RespValue& lhs, const RespValue& rhs) {
diff --git a/test/mocks/router/mocks.cc b/test/mocks/router/mocks.cc
index 6e0929f0bf67..0dc7ff25215c 100644
--- a/test/mocks/router/mocks.cc
+++ b/test/mocks/router/mocks.cc
@@ -5,13 +5,13 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Router {
 
 MockRedirectEntry::MockRedirectEntry() {}
diff --git a/test/mocks/runtime/mocks.cc b/test/mocks/runtime/mocks.cc
index be05a1e19871..956b5474e597 100644
--- a/test/mocks/runtime/mocks.cc
+++ b/test/mocks/runtime/mocks.cc
@@ -3,11 +3,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Return;
 using testing::ReturnArg;
 using testing::_;
 
+namespace Envoy {
 namespace Runtime {
 
 MockRandomGenerator::MockRandomGenerator() { ON_CALL(*this, uuid()).WillByDefault(Return(uuid_)); }
diff --git a/test/mocks/server/mocks.h b/test/mocks/server/mocks.h
index 8c35b04c110b..79a19b52aae7 100644
--- a/test/mocks/server/mocks.h
+++ b/test/mocks/server/mocks.h
@@ -299,8 +299,7 @@ class MockMain : public Main {
   MOCK_METHOD0(clusterManager, Upstream::ClusterManager&());
   MOCK_METHOD0(httpTracer, Tracing::HttpTracer&());
   MOCK_METHOD0(rateLimitClientFactory, RateLimit::ClientFactory&());
-  MOCK_METHOD0(statsdTcpClusterName, Optional<std::string>());
-  MOCK_METHOD0(statsdUdpIpAddress, Network::Address::InstanceConstSharedPtr());
+  MOCK_METHOD0(statsSinks, std::list<Stats::SinkPtr>&());
   MOCK_METHOD0(statsFlushInterval, std::chrono::milliseconds());
   MOCK_CONST_METHOD0(wdMissTimeout, std::chrono::milliseconds());
   MOCK_CONST_METHOD0(wdMegaMissTimeout, std::chrono::milliseconds());
diff --git a/test/mocks/stats/mocks.cc b/test/mocks/stats/mocks.cc
index a3dfe2372fb3..9dd2d44aac64 100644
--- a/test/mocks/stats/mocks.cc
+++ b/test/mocks/stats/mocks.cc
@@ -3,9 +3,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::_;
 
+namespace Envoy {
 namespace Stats {
 
 MockCounter::MockCounter() {}
diff --git a/test/mocks/thread_local/mocks.cc b/test/mocks/thread_local/mocks.cc
index 170d51289e1c..6c40f98875f0 100644
--- a/test/mocks/thread_local/mocks.cc
+++ b/test/mocks/thread_local/mocks.cc
@@ -3,10 +3,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::_;
 
+namespace Envoy {
 namespace ThreadLocal {
 
 MockInstance::MockInstance() {
diff --git a/test/mocks/tracing/mocks.cc b/test/mocks/tracing/mocks.cc
index a88d22366047..1e2ec1884ba0 100644
--- a/test/mocks/tracing/mocks.cc
+++ b/test/mocks/tracing/mocks.cc
@@ -3,10 +3,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Return;
 using testing::ReturnRef;
 
+namespace Envoy {
 namespace Tracing {
 
 MockSpan::MockSpan() {}
diff --git a/test/mocks/upstream/cluster_info.h b/test/mocks/upstream/cluster_info.h
index 3b4666a8b73b..116cf894c7e8 100644
--- a/test/mocks/upstream/cluster_info.h
+++ b/test/mocks/upstream/cluster_info.h
@@ -14,9 +14,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 
+namespace Envoy {
 namespace Upstream {
 
 class MockClusterInfo : public ClusterInfo {
diff --git a/test/mocks/upstream/mocks.cc b/test/mocks/upstream/mocks.cc
index 0866a85d2043..3cba6823cbf0 100644
--- a/test/mocks/upstream/mocks.cc
+++ b/test/mocks/upstream/mocks.cc
@@ -11,7 +11,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::Invoke;
 using testing::Return;
 using testing::ReturnPointee;
@@ -19,6 +18,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
 namespace Upstream {
 namespace Outlier {
 
diff --git a/test/mocks/upstream/mocks.h b/test/mocks/upstream/mocks.h
index be05490359e7..d8584f0c6e01 100644
--- a/test/mocks/upstream/mocks.h
+++ b/test/mocks/upstream/mocks.h
@@ -21,9 +21,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 
+namespace Envoy {
 namespace Upstream {
 
 class MockCluster : public Cluster {
diff --git a/test/server/BUILD b/test/server/BUILD
index bcbb5e74631c..a2ec2da26f8c 100644
--- a/test/server/BUILD
+++ b/test/server/BUILD
@@ -23,6 +23,7 @@ envoy_cc_test(
         "//source/common/event:dispatcher_lib",
         "//source/common/upstream:cluster_manager_lib",
         "//source/server:configuration_lib",
+        "//source/server/config/stats:statsd_lib",
         "//test/mocks:common_lib",
         "//test/mocks/network:network_mocks",
         "//test/mocks/server:server_mocks",
@@ -119,6 +120,7 @@ envoy_cc_test(
     deps = [
         "//source/common/common:version_lib",
         "//source/server:server_lib",
+        "//source/server/config/stats:statsd_lib",
         "//test/integration:integration_lib",
         "//test/mocks/server:server_mocks",
         "//test/mocks/stats:stats_mocks",
diff --git a/test/server/config/http/config_test.cc b/test/server/config/http/config_test.cc
index c91f404e7efa..e515ce5cc661 100644
--- a/test/server/config/http/config_test.cc
+++ b/test/server/config/http/config_test.cc
@@ -20,11 +20,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::Return;
 using testing::_;
 
+namespace Envoy {
 namespace Server {
 namespace Configuration {
 
diff --git a/test/server/config/stats/BUILD b/test/server/config/stats/BUILD
new file mode 100644
index 000000000000..60973c409ab8
--- /dev/null
+++ b/test/server/config/stats/BUILD
@@ -0,0 +1,25 @@
+licenses(["notice"])  # Apache 2
+
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_test",
+    "envoy_package",
+)
+
+envoy_package()
+
+envoy_cc_test(
+    name = "config_test",
+    srcs = ["config_test.cc"],
+    external_deps = [
+        "envoy_bootstrap",
+    ],
+    deps = [
+        "//include/envoy/registry",
+        "//source/common/protobuf:utility_lib",
+        "//source/common/stats:statsd_lib",
+        "//source/server/config/stats:statsd_lib",
+        "//test/mocks/server:server_mocks",
+        "//test/test_common:utility_lib",
+    ],
+)
diff --git a/test/server/config/stats/config_test.cc b/test/server/config/stats/config_test.cc
new file mode 100644
index 000000000000..513abedd8476
--- /dev/null
+++ b/test/server/config/stats/config_test.cc
@@ -0,0 +1,83 @@
+#include <string>
+
+#include "envoy/registry/registry.h"
+
+#include "common/protobuf/utility.h"
+#include "common/stats/statsd.h"
+
+#include "server/config/stats/statsd.h"
+
+#include "test/mocks/server/mocks.h"
+#include "test/test_common/utility.h"
+
+#include "api/bootstrap.pb.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+using testing::NiceMock;
+using testing::Return;
+using testing::ReturnRef;
+using testing::_;
+
+namespace Envoy {
+namespace Server {
+namespace Configuration {
+
+TEST(StatsConfigTest, ValidTcpStatsd) {
+  const std::string name = "envoy.statsd";
+
+  envoy::api::v2::StatsdSink sink_config;
+  sink_config.set_tcp_cluster_name("fake_cluster");
+
+  StatsSinkFactory* factory = Registry::FactoryRegistry<StatsSinkFactory>::getFactory(name);
+  ASSERT_NE(factory, nullptr);
+
+  ProtobufTypes::MessagePtr message = factory->createEmptyConfigProto();
+  MessageUtil::jsonConvert(sink_config, *message);
+
+  NiceMock<MockInstance> server;
+  Stats::SinkPtr sink = factory->createStatsSink(*message, server);
+  EXPECT_NE(sink, nullptr);
+  EXPECT_NE(dynamic_cast<Stats::Statsd::TcpStatsdSink*>(sink.get()), nullptr);
+}
+
+TEST(StatsConfigTest, ValidUdpIpStatsd) {
+  const std::string name = "envoy.statsd";
+
+  envoy::api::v2::StatsdSink sink_config;
+  envoy::api::v2::Address& address = *sink_config.mutable_address();
+  envoy::api::v2::SocketAddress& socket_address = *address.mutable_socket_address();
+  socket_address.set_protocol(envoy::api::v2::SocketAddress::UDP);
+  socket_address.set_address("127.0.0.1");
+  socket_address.set_port_value(8125);
+
+  StatsSinkFactory* factory = Registry::FactoryRegistry<StatsSinkFactory>::getFactory(name);
+  ASSERT_NE(factory, nullptr);
+
+  ProtobufTypes::MessagePtr message = factory->createEmptyConfigProto();
+  MessageUtil::jsonConvert(sink_config, *message);
+
+  NiceMock<MockInstance> server;
+  Stats::SinkPtr sink = factory->createStatsSink(*message, server);
+  EXPECT_NE(sink, nullptr);
+  EXPECT_NE(dynamic_cast<Stats::Statsd::UdpStatsdSink*>(sink.get()), nullptr);
+}
+
+TEST(StatsConfigTest, EmptyConfig) {
+  const std::string name = "envoy.statsd";
+  envoy::api::v2::StatsdSink sink_config;
+
+  StatsSinkFactory* factory = Registry::FactoryRegistry<StatsSinkFactory>::getFactory(name);
+  ASSERT_NE(factory, nullptr);
+
+  ProtobufTypes::MessagePtr message = factory->createEmptyConfigProto();
+  MessageUtil::jsonConvert(sink_config, *message);
+  NiceMock<MockInstance> server;
+  EXPECT_THROW_WITH_MESSAGE(
+      factory->createStatsSink(*message, server), EnvoyException,
+      "No tcp_cluster_name or address provided for envoy.statsd Stats::Sink config");
+}
+
+} // namespace Configuration
+} // namespace Server
+} // namespace Envoy
diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc
index 971a9ea9ce5f..a32793fe1a2e 100644
--- a/test/server/configuration_impl_test.cc
+++ b/test/server/configuration_impl_test.cc
@@ -14,11 +14,11 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::Return;
 using testing::ReturnRef;
 
+namespace Envoy {
 namespace Server {
 namespace Configuration {
 
@@ -252,6 +252,82 @@ TEST_F(ConfigurationImplTest, ConfigurationFailsWhenInvalidTracerSpecified) {
                             EnvoyException, "No HttpTracerFactory found for type: invalid");
 }
 
+TEST_F(ConfigurationImplTest, ProtoSpecifiedStatsSink) {
+  std::string json = R"EOF(
+  {
+    "listeners": [],
+
+    "cluster_manager": {
+      "clusters": []
+    },
+
+    "admin": {"access_log_path": "/dev/null", "address": "tcp://1.2.3.4:5678"}
+  }
+  )EOF";
+
+  envoy::api::v2::Bootstrap bootstrap = TestUtility::parseBootstrapFromJson(json);
+
+  auto& sink = *bootstrap.mutable_stats_sinks()->Add();
+  sink.set_name("envoy.statsd");
+  auto& field_map = *sink.mutable_config()->mutable_fields();
+  field_map["tcp_cluster_name"].set_string_value("fake_cluster");
+
+  MainImpl config;
+  config.initialize(bootstrap, server_, cluster_manager_factory_);
+
+  EXPECT_EQ(1, config.statsSinks().size());
+}
+
+TEST_F(ConfigurationImplTest, StatsSinkWithInvalidName) {
+  std::string json = R"EOF(
+  {
+    "listeners": [],
+
+    "cluster_manager": {
+      "clusters": []
+    },
+
+    "admin": {"access_log_path": "/dev/null", "address": "tcp://1.2.3.4:5678"}
+  }
+  )EOF";
+
+  envoy::api::v2::Bootstrap bootstrap = TestUtility::parseBootstrapFromJson(json);
+
+  envoy::api::v2::StatsSink& sink = *bootstrap.mutable_stats_sinks()->Add();
+  sink.set_name("envoy.invalid");
+  auto& field_map = *sink.mutable_config()->mutable_fields();
+  field_map["tcp_cluster_name"].set_string_value("fake_cluster");
+
+  MainImpl config;
+  EXPECT_THROW_WITH_MESSAGE(config.initialize(bootstrap, server_, cluster_manager_factory_),
+                            EnvoyException, "No Stats::Sink found for name: envoy.invalid");
+}
+
+TEST_F(ConfigurationImplTest, StatsSinkWithNoName) {
+  std::string json = R"EOF(
+  {
+    "listeners": [],
+
+    "cluster_manager": {
+      "clusters": []
+    },
+
+    "admin": {"access_log_path": "/dev/null", "address": "tcp://1.2.3.4:5678"}
+  }
+  )EOF";
+
+  envoy::api::v2::Bootstrap bootstrap = TestUtility::parseBootstrapFromJson(json);
+
+  auto& sink = *bootstrap.mutable_stats_sinks()->Add();
+  auto& field_map = *sink.mutable_config()->mutable_fields();
+  field_map["tcp_cluster_name"].set_string_value("fake_cluster");
+
+  MainImpl config;
+  EXPECT_THROW_WITH_MESSAGE(
+      config.initialize(bootstrap, server_, cluster_manager_factory_), EnvoyException,
+      "sink object does not have 'name' attribute to look up the implementation");
+}
+
 } // namespace Configuration
 } // namespace Server
 } // namespace Envoy
diff --git a/test/server/guarddog_impl_test.cc b/test/server/guarddog_impl_test.cc
index baef92f35f3c..2259a4b8db1c 100644
--- a/test/server/guarddog_impl_test.cc
+++ b/test/server/guarddog_impl_test.cc
@@ -16,10 +16,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::InSequence;
 using testing::NiceMock;
 
+namespace Envoy {
 namespace Server {
 
 /**
diff --git a/test/server/http/admin_test.cc b/test/server/http/admin_test.cc
index ed2ddebebc6f..873667000a9a 100644
--- a/test/server/http/admin_test.cc
+++ b/test/server/http/admin_test.cc
@@ -14,10 +14,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::NiceMock;
 using testing::_;
 
+namespace Envoy {
 namespace Server {
 
 class AdminFilterTest : public testing::TestWithParam<Network::Address::IpVersion> {
diff --git a/test/server/http/health_check_test.cc b/test/server/http/health_check_test.cc
index f9e35b0855c6..8eecc601351f 100644
--- a/test/server/http/health_check_test.cc
+++ b/test/server/http/health_check_test.cc
@@ -12,7 +12,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace Envoy {
 using testing::DoAll;
 using testing::Invoke;
 using testing::NiceMock;
@@ -21,6 +20,8 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::_;
 
+namespace Envoy {
+
 class HealthCheckFilterTest : public testing::Test {
 public:
   HealthCheckFilterTest(bool pass_through, bool caching)