                                    :pidfile (str base-dir "/pidfile")
                                    :chdir   base-dir}
                                   (str base-dir "/bin/voltdb")
-                                  cmd
-                                  :--deployment (str base-dir "/deployment.xml")
+                                  (str "start")
+                                  :--dir (str base-dir)
+                                  :--count (count (:nodes test))
                                   :--host host))))
 
 (defn start!
   "Starts voltdb, creating a fresh DB"
   [test node]
-  (start-daemon! test :create (jepsen/primary test))
-  (await-initialization node))
+  (init-daemon! test :init (jepsen/primary test))
+  (await-initialization node)
+  (start-daemon! test :start (jepsen/primary test))
+  (await-start node))
 
 (defn recover!
   "Recovers an entire cluster, or with a node, a single node."

  (c/su
    (cu/install-tarball! node url base-dir force?)
    (c/exec :mkdir (str base-dir "/log"))
    (cu/ensure-user! username)
    (c/exec :chown :-R (str username ":" username) base-dir)


(defn await-initialization
  "Blocks until the logfile reports 'Server completed initialization'."
  [node]
  (info "Waiting for" node "to initialize at voltroot:" voltroot)
  (timeout 120000
           (throw (RuntimeException.
                    (str node " failed to initialize in time; STDOUT:\n\n"
