diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go
index b9e7125ec..3c9f5e5c2 100644
--- a/cmd/boulder-ca/main.go
+++ b/cmd/boulder-ca/main.go
@@ -144,7 +144,7 @@ func loadBoulderIssuers(profileConfig issuance.ProfileConfig, issuerConfigs []is
 }
 
 func main() {
-	caAddr := flag.String("ca-addr", "", "CA gRPC listen address override")
+	grpcAddr := flag.String("addr", "", "gRPC listen address override")
 	debugAddr := flag.String("debug-addr", "", "Debug server address override")
 	configFile := flag.String("config", "", "File path to the configuration file for this service")
 	flag.Parse()
@@ -160,8 +160,8 @@ func main() {
 	err = features.Set(c.CA.Features)
 	cmd.FailOnError(err, "Failed to set feature flags")
 
-	if *caAddr != "" {
-		c.CA.GRPCCA.Address = *caAddr
+	if *grpcAddr != "" {
+		c.CA.GRPCCA.Address = *grpcAddr
 	}
 	if *debugAddr != "" {
 		c.CA.DebugAddr = *debugAddr
diff --git a/test/startservers.py b/test/startservers.py
index 3f6c0cd20..629cc42af 100644
--- a/test/startservers.py
+++ b/test/startservers.py
@@ -59,11 +59,11 @@ SERVICES = (
         ('boulder-remoteva-a', 'boulder-remoteva-b')),
     Service('boulder-ca-a',
         8001, 'ca1.service.consul:9093',
-        ('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-a.json'), '--ca-addr', 'ca1.service.consul:9093', '--debug-addr', ':8001'),
+        ('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-a.json'), '--addr', 'ca1.service.consul:9093', '--debug-addr', ':8001'),
         ('boulder-sa-1', 'boulder-sa-2')),
     Service('boulder-ca-b',
         8101, 'ca2.service.consul:9093',
-        ('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-b.json'), '--ca-addr', 'ca2.service.consul:9093', '--debug-addr', ':8101'),
+        ('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-b.json'), '--addr', 'ca2.service.consul:9093', '--debug-addr', ':8101'),
         ('boulder-sa-1', 'boulder-sa-2')),
     Service('akamai-test-srv',
         6789, None,