diff --git a/command/server/config_test.go b/command/server/config_test.go
index 3ea020f084615..49f1794f718c2 100644
--- a/command/server/config_test.go
+++ b/command/server/config_test.go
@@ -21,6 +21,12 @@ func TestLoadConfigFile(t *testing.T) {
 					"address": "127.0.0.1:443",
 				},
 			},
+			&Listener{
+				Type: "tcp",
+				Config: map[string]string{
+					"address": "127.0.0.1:444",
+				},
+			},
 		},
 
 		Backend: &Backend{
diff --git a/command/server/test-fixtures/config.hcl.json b/command/server/test-fixtures/config.hcl.json
index a47ba5c872359..02ab8eabeef67 100644
--- a/command/server/test-fixtures/config.hcl.json
+++ b/command/server/test-fixtures/config.hcl.json
@@ -1,20 +1,17 @@
 {
-    "listener": {
-        "tcp": {
-            "address": "127.0.0.1:443"
-        }
-    },
-
-    "backend": {
-        "consul": {
-            "foo": "bar"
-        }
-    },
-
-    "telemetry": {
-        "statsite_address": "baz"
-    },
-
-    "max_lease_ttl": "10h",
-    "default_lease_ttl": "10h"
+  "listener":{
+    "tcp":{
+      "address":"127.0.0.1:443"
+    }
+  },
+  "backend":{
+    "consul":{
+      "foo":"bar"
+    }
+  },
+  "telemetry":{
+    "statsite_address":"baz"
+  },
+  "max_lease_ttl":"10h",
+  "default_lease_ttl":"10h"
 }
diff --git a/command/server/test-fixtures/config2.hcl.json b/command/server/test-fixtures/config2.hcl.json
index 73644801721bd..142278e0019c3 100644
--- a/command/server/test-fixtures/config2.hcl.json
+++ b/command/server/test-fixtures/config2.hcl.json
@@ -1,25 +1,29 @@
 {
-    "listener": {
-        "tcp": [{
-            "address": "127.0.0.1:443"
-        }]
+  "listener":[
+    {
+      "tcp":{
+        "address":"127.0.0.1:443"
+      }
     },
-
-    "backend": {
-        "consul": {
-            "foo": "bar"
-        }
-    },
-
-	"ha_backend": {
-		"consul": {
-			"bar": "baz"
-		}
-	},
-
-    "telemetry": {
-        "statsd_address": "bar",
-        "statsite_address": "foo",
-        "disable_hostname": true
+    {
+      "tcp":{
+        "address":"127.0.0.1:444"
+      }
+    }
+  ],
+  "backend":{
+    "consul":{
+      "foo":"bar"
+    }
+  },
+  "ha_backend":{
+    "consul":{
+      "bar":"baz"
     }
+  },
+  "telemetry":{
+    "statsd_address":"bar",
+    "statsite_address":"foo",
+    "disable_hostname":true
+  }
 }