diff --git a/cmd/admin-revoker/main.go b/cmd/admin-revoker/main.go
deleted file mode 100644
index 7d18bc74917..00000000000
--- a/cmd/admin-revoker/main.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package notmain
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/letsencrypt/boulder/cmd"
-	"github.com/letsencrypt/boulder/features"
-)
-
-type Config struct {
-	Revoker struct {
-		DB cmd.DBConfig
-		// Similarly, the Revoker needs a TLSConfig to set up its GRPC client
-		// certs, but doesn't get the TLS field from ServiceConfig, so declares
-		// its own.
-		TLS cmd.TLSConfig
-
-		RAService *cmd.GRPCClientConfig
-		SAService *cmd.GRPCClientConfig
-
-		Features features.Config
-	}
-
-	Syslog cmd.SyslogConfig
-}
-
-func main() {
-	if len(os.Args) == 1 {
-		fmt.Println("use `admin -h` to learn how to use the new admin tool")
-		os.Exit(1)
-	}
-
-	command := os.Args[1]
-	switch {
-	case command == "serial-revoke":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -serial deadbeef -reason X` instead")
-
-	case command == "batched-serial-revoke":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -serials-file path -reason X` instead")
-
-	case command == "reg-revoke":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -reg-id Y -reason X` instead")
-
-	case command == "malformed-revoke":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -serial deadbeef -reason X -malformed` instead")
-
-	case command == "list-reasons":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -h` instead")
-
-	case command == "private-key-revoke":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -private-key path -reason X` instead")
-
-	case command == "private-key-block":
-		fmt.Println("use `admin -config path/to/cfg.json block-key -private-key path -comment foo` instead")
-
-	case command == "incident-table-revoke":
-		fmt.Println("use `admin -config path/to/cfg.json revoke-cert -incident-table tablename -reason X` instead")
-
-	case command == "clear-email":
-		fmt.Println("use `admin -config path/to/cfg.json update-email -address foo@bar.org -clear` instead")
-
-	default:
-		fmt.Println("use `admin -h` to see a list of flags and subcommands for the new admin tool")
-	}
-}
-
-func init() {
-	cmd.RegisterCommand("admin-revoker", main, &cmd.ConfigValidator{Config: &Config{}})
-}
diff --git a/cmd/boulder/main.go b/cmd/boulder/main.go
index eb0ded802c9..fcaeb7c0f3e 100644
--- a/cmd/boulder/main.go
+++ b/cmd/boulder/main.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	_ "github.com/letsencrypt/boulder/cmd/admin-revoker"
 	_ "github.com/letsencrypt/boulder/cmd/akamai-purger"
 	_ "github.com/letsencrypt/boulder/cmd/bad-key-revoker"
 	_ "github.com/letsencrypt/boulder/cmd/boulder-ca"
diff --git a/ra/ra.go b/ra/ra.go
index af050c8b877..afdf1b3b018 100644
--- a/ra/ra.go
+++ b/ra/ra.go
@@ -1969,7 +1969,7 @@ func (ra *RegistrationAuthorityImpl) RevokeCertByKey(ctx context.Context, req *r
 
 // AdministrativelyRevokeCertificate terminates trust in the certificate
 // provided and does not require the registration ID of the requester since this
-// method is only called from the admin-revoker tool. It trusts that the admin
+// method is only called from the `admin` tool. It trusts that the admin
 // is doing the right thing, so if the requested reason is keyCompromise, it
 // blocks the key from future issuance even though compromise has not been
 // demonstrated here. It purges the certificate from the Akamai cache, and
diff --git a/test/config-next/admin-revoker.json b/test/config-next/admin-revoker.json
deleted file mode 100644
index 389fc0080e3..00000000000
--- a/test/config-next/admin-revoker.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"revoker": {
-		"db": {
-			"dbConnectFile": "test/secrets/revoker_dburl",
-			"maxOpenConns": 1
-		},
-		"tls": {
-			"caCertFile": "test/certs/ipki/minica.pem",
-			"certFile": "test/certs/ipki/admin-revoker.boulder/cert.pem",
-			"keyFile": "test/certs/ipki/admin-revoker.boulder/key.pem"
-		},
-		"raService": {
-			"dnsAuthority": "consul.service.consul",
-			"srvLookup": {
-				"service": "ra",
-				"domain": "service.consul"
-			},
-			"hostOverride": "ra.boulder",
-			"noWaitForReady": true,
-			"timeout": "15s"
-		},
-		"saService": {
-			"dnsAuthority": "consul.service.consul",
-			"srvLookup": {
-				"service": "sa",
-				"domain": "service.consul"
-			},
-			"timeout": "15s",
-			"noWaitForReady": true,
-			"hostOverride": "sa.boulder"
-		},
-		"features": {}
-	},
-	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": -1
-	}
-}
diff --git a/test/config/admin-revoker.json b/test/config/admin-revoker.json
deleted file mode 100644
index c450e00878d..00000000000
--- a/test/config/admin-revoker.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"revoker": {
-		"db": {
-			"dbConnectFile": "test/secrets/revoker_dburl",
-			"maxOpenConns": 1
-		},
-		"tls": {
-			"caCertFile": "test/certs/ipki/minica.pem",
-			"certFile": "test/certs/ipki/admin-revoker.boulder/cert.pem",
-			"keyFile": "test/certs/ipki/admin-revoker.boulder/key.pem"
-		},
-		"raService": {
-			"dnsAuthority": "consul.service.consul",
-			"srvLookup": {
-				"service": "ra",
-				"domain": "service.consul"
-			},
-			"hostOverride": "ra.boulder",
-			"noWaitForReady": true,
-			"timeout": "15s"
-		},
-		"saService": {
-			"dnsAuthority": "consul.service.consul",
-			"srvLookup": {
-				"service": "sa",
-				"domain": "service.consul"
-			},
-			"timeout": "15s",
-			"noWaitForReady": true,
-			"hostOverride": "sa.boulder"
-		},
-		"features": {}
-	},
-	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
-	}
-}