diff --git a/config/config_test.go b/config/config_test.go
index 6bbf504c..ba571ea3 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -254,7 +254,7 @@ var _ = Describe("Config", func() {
 		})
 
 		When("bootstrapDns is defined", func() {
-			It("should be backwards compatible", func() {
+			It("should be backwards compatible to 'single IP syntax'", func() {
 				cfg := Config{}
 				data := "bootstrapDns: 0.0.0.0"
 
@@ -262,7 +262,7 @@ var _ = Describe("Config", func() {
 				Expect(err).ShouldNot(HaveOccurred())
 				Expect(cfg.BootstrapDNS[0].Upstream.Host).Should(Equal("0.0.0.0"))
 			})
-			It("should be backwards compatible", func() {
+			It("should be backwards compatible to 'single item definition'", func() {
 				cfg := Config{}
 				data := `
 bootstrapDns:
@@ -275,6 +275,24 @@ bootstrapDns:
 				Expect(cfg.BootstrapDNS[0].Upstream.Host).Should(Equal("dns.example.com"))
 				Expect(cfg.BootstrapDNS[0].IPs).Should(HaveLen(1))
 			})
+			It("should process list of bootstrap items", func() {
+				cfg := Config{}
+				data := `
+bootstrapDns:
+  - upstream: tcp-tls:dns.example.com
+    ips:
+      - 0.0.0.0
+  - upstream: 1.2.3.4
+`
+				err := unmarshalConfig([]byte(data), &cfg)
+				Expect(err).ShouldNot(HaveOccurred())
+				Expect(cfg.BootstrapDNS).Should(HaveLen(2))
+				Expect(cfg.BootstrapDNS[0].Upstream.Host).Should(Equal("dns.example.com"))
+				Expect(cfg.BootstrapDNS[0].Upstream.Net).Should(Equal(NetProtocolTcpTls))
+				Expect(cfg.BootstrapDNS[0].IPs).Should(HaveLen(1))
+				Expect(cfg.BootstrapDNS[1].Upstream.Host).Should(Equal("1.2.3.4"))
+				Expect(cfg.BootstrapDNS[1].Upstream.Net).Should(Equal(NetProtocolTcpUdp))
+			})
 		})
 
 		When("config is not YAML", func() {