diff --git a/command/agent/config_test.go b/command/agent/config_test.go
index 6b82b74113..bab0a645d2 100644
--- a/command/agent/config_test.go
+++ b/command/agent/config_test.go
@@ -589,16 +589,16 @@ func TestDecodeConfig(t *testing.T) {
 	}
 
 	// Domain socket permissions
-	input = `{"unix_sockets": {"uid": "500", "gid": "500", "mode": "0700"}}`
+	input = `{"unix_sockets": {"user": "500", "group": "500", "mode": "0700"}}`
 	config, err = DecodeConfig(bytes.NewReader([]byte(input)))
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
 
 	if !reflect.DeepEqual(config.UnixSockets, map[string]string{
-		"uid":  "500",
-		"gid":  "500",
-		"mode": "0700",
+		"user":  "500",
+		"group": "500",
+		"mode":  "0700",
 	}) {
 		t.Fatalf("bad: %v", config.UnixSockets)
 	}
@@ -1014,9 +1014,9 @@ func TestMergeConfig(t *testing.T) {
 			"Access-Control-Allow-Origin": "*",
 		},
 		UnixSockets: map[string]string{
-			"uid":  "500",
-			"gid":  "500",
-			"mode": "0700",
+			"user":  "500",
+			"group": "500",
+			"mode":  "0700",
 		},
 	}
 
diff --git a/command/agent/util_test.go b/command/agent/util_test.go
index b140f477d2..f6d1b35aaa 100644
--- a/command/agent/util_test.go
+++ b/command/agent/util_test.go
@@ -51,12 +51,12 @@ func TestSetFilePermissions(t *testing.T) {
 	defer os.Remove(path)
 
 	// Bad UID fails
-	if err := setFilePermissions(path, map[string]string{"uid": "%"}); err == nil {
+	if err := setFilePermissions(path, map[string]string{"user": "%"}); err == nil {
 		t.Fatalf("should fail")
 	}
 
 	// Bad GID fails
-	if err := setFilePermissions(path, map[string]string{"gid": "%"}); err == nil {
+	if err := setFilePermissions(path, map[string]string{"group": "%"}); err == nil {
 		t.Fatalf("should fail")
 	}