diff --git a/test/server/BUILD b/test/server/BUILD
index 9ec29b9cd8c1b..f9fa7745c2ef0 100644
--- a/test/server/BUILD
+++ b/test/server/BUILD
@@ -145,7 +145,7 @@ envoy_cc_test(
         "//test/config/integration/certs",
     ],
     deps = [
-        "//source/common/config:utility_lib",
+        "//source/common/protobuf:utility_lib",
         "//source/server:lds_api_lib",
         "//test/mocks/server:server_mocks",
         "//test/test_common:environment_lib",
diff --git a/test/server/lds_api_test.cc b/test/server/lds_api_test.cc
index d2b9a8216f945..9defbf9864c1d 100644
--- a/test/server/lds_api_test.cc
+++ b/test/server/lds_api_test.cc
@@ -2,8 +2,8 @@
 
 #include "envoy/api/v2/lds.pb.h"
 
-#include "common/config/utility.h"
 #include "common/http/message_impl.h"
+#include "common/protobuf/utility.h"
 
 #include "server/lds_api.h"
 
@@ -33,17 +33,16 @@ class LdsApiTest : public testing::Test {
   }
 
   void setup() {
-    const std::string config_json = R"EOF(
-    {
-      "api_type": "REST",
-      "cluster": "foo_cluster",
-      "refresh_delay_ms": 1000
-    }
+    const std::string config_yaml = R"EOF(
+api_config_source:
+  api_type: REST
+  cluster_names:
+  - foo_cluster
+  refresh_delay: 1s
     )EOF";
 
-    Json::ObjectSharedPtr config = Json::Factory::loadFromString(config_json);
     envoy::api::v2::core::ConfigSource lds_config;
-    Config::Utility::translateLdsConfig(*config, lds_config);
+    MessageUtil::loadFromYaml(config_yaml, lds_config);
     lds_config.mutable_api_config_source()->set_api_type(
         envoy::api::v2::core::ApiConfigSource::REST);
     Upstream::ClusterManager::ClusterInfoMap cluster_map;
@@ -159,17 +158,16 @@ TEST_F(LdsApiTest, ValidateFail) {
 }
 
 TEST_F(LdsApiTest, UnknownCluster) {
-  const std::string config_json = R"EOF(
-  {
-    "api_type": "REST",
-    "cluster": "foo_cluster",
-    "refresh_delay_ms": 1000
-  }
+  const std::string config_yaml = R"EOF(
+api_config_source:
+  api_type: REST
+  cluster_names:
+  - foo_cluster
+  refresh_delay: 1s
   )EOF";
 
-  Json::ObjectSharedPtr config = Json::Factory::loadFromString(config_json);
   envoy::api::v2::core::ConfigSource lds_config;
-  Config::Utility::translateLdsConfig(*config, lds_config);
+  MessageUtil::loadFromYaml(config_yaml, lds_config);
   Upstream::ClusterManager::ClusterInfoMap cluster_map;
   EXPECT_CALL(cluster_manager_, clusters()).WillOnce(Return(cluster_map));
   EXPECT_THROW_WITH_MESSAGE(
@@ -273,17 +271,16 @@ TEST_F(LdsApiTest, ValidateDuplicateListeners) {
 
 TEST_F(LdsApiTest, BadLocalInfo) {
   interval_timer_ = new Event::MockTimer(&dispatcher_);
-  const std::string config_json = R"EOF(
-  {
-    "api_type": "REST",
-    "cluster": "foo_cluster",
-    "refresh_delay_ms": 1000
-  }
+  const std::string config_yaml = R"EOF(
+api_config_source:
+  api_type: REST
+  cluster_names:
+  - foo_cluster
+  refresh_delay: 1s
   )EOF";
 
-  Json::ObjectSharedPtr config = Json::Factory::loadFromString(config_json);
   envoy::api::v2::core::ConfigSource lds_config;
-  Config::Utility::translateLdsConfig(*config, lds_config);
+  MessageUtil::loadFromYaml(config_yaml, lds_config);
   Upstream::ClusterManager::ClusterInfoMap cluster_map;
   Upstream::MockClusterMockPrioritySet cluster;
   cluster_map.emplace("foo_cluster", cluster);