diff --git a/cmd/boulder-ra/main.go b/cmd/boulder-ra/main.go
index e94174406..fcf46f659 100644
--- a/cmd/boulder-ra/main.go
+++ b/cmd/boulder-ra/main.go
@@ -23,7 +23,7 @@ func main() {
 
 		rai := ra.NewRegistrationAuthorityImpl(auditlogger)
 
-		for true {
+		for {
 			ch := cmd.AmqpChannel(c.AMQP.Server)
 			closeChan := ch.NotifyClose(make(chan *amqp.Error, 1))
 
diff --git a/cmd/boulder-sa/main.go b/cmd/boulder-sa/main.go
index 15486c235..e5dbb87bf 100644
--- a/cmd/boulder-sa/main.go
+++ b/cmd/boulder-sa/main.go
@@ -27,7 +27,7 @@ func main() {
 		sai, err := sa.NewSQLStorageAuthority(auditlogger, c.SA.DBDriver, c.SA.DBName)
 		cmd.FailOnError(err, "Failed to create SA impl")
 
-		for true {
+		for {
 			ch := cmd.AmqpChannel(c.AMQP.Server)
 			closeChan := ch.NotifyClose(make(chan *amqp.Error, 1))
 
diff --git a/cmd/boulder-va/main.go b/cmd/boulder-va/main.go
index cae2ffdf5..57578297e 100644
--- a/cmd/boulder-va/main.go
+++ b/cmd/boulder-va/main.go
@@ -23,7 +23,7 @@ func main() {
 
 		vai := va.NewValidationAuthorityImpl(auditlogger, c.CA.TestMode)
 
-		for true {
+		for {
 			ch := cmd.AmqpChannel(c.AMQP.Server)
 			closeChan := ch.NotifyClose(make(chan *amqp.Error, 1))
 
diff --git a/cmd/boulder-wfe/main.go b/cmd/boulder-wfe/main.go
index 8fc9ef6c3..8aaf8f78c 100644
--- a/cmd/boulder-wfe/main.go
+++ b/cmd/boulder-wfe/main.go
@@ -47,7 +47,7 @@ func main() {
 			// sit around and reconnect to AMQP if the channel
 			// drops for some reason and repopulate the wfe object
 			// with new RA and SA rpc clients.
-			for true {
+			for {
 				for err := range closeChan {
 					auditlogger.Warning(fmt.Sprintf("AMQP Channel closed, will reconnect in 5 seconds: [%s]", err))
 					time.Sleep(time.Second*5)