diff --git a/cmd/server.go b/cmd/server.go
index 93ecb543b..d906cf189 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -39,7 +39,7 @@ It will load existing data from the configured
 directory and start listening for client connections
 on the configured port.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := Server.Run(); err != nil {
+			if err := Server.Start(); err != nil {
 				return errors.Wrap(err, "running server")
 			}
 			return errors.Wrap(Server.Wait(), "waiting on Server")
diff --git a/server/server.go b/server/server.go
index 6ff80fe7f..7f5782211 100644
--- a/server/server.go
+++ b/server/server.go
@@ -90,8 +90,8 @@ func NewCommand(stdin io.Reader, stdout, stderr io.Writer) *Command {
 	}
 }
 
-// Run executes the pilosa server.
-func (m *Command) Run(args ...string) (err error) { // TODO args WTF
+// Start starts the pilosa server - it returns once the server is running.
+func (m *Command) Start() (err error) {
 	defer close(m.Started)
 	prefix := "~" + string(filepath.Separator)
 	if strings.HasPrefix(m.Config.DataDir, prefix) {
diff --git a/test/pilosa.go b/test/pilosa.go
index 366facdd4..a390cd462 100644
--- a/test/pilosa.go
+++ b/test/pilosa.go
@@ -116,7 +116,7 @@ func runMainWithCluster(size int) ([]*Main, error) {
 func MustRunMain() *Main {
 	m := NewMain()
 	m.Config.Metric.Diagnostics = false // Disable diagnostics.
-	if err := m.Run(); err != nil {
+	if err := m.Start(); err != nil {
 		panic(err)
 	}
 	return m
@@ -147,7 +147,7 @@ func (m *Main) Reopen() error {
 	m.Server.Holder.NewAttrStore = m.Server.NewAttrStore
 
 	// Run new program.
-	if err := m.Run(); err != nil {
+	if err := m.Start(); err != nil {
 		return err
 	}
 	return nil