diff --git a/migrate-and-start-server.sh b/migrate-and-start-server.sh
index f769d27..cd97ec3 100755
--- a/migrate-and-start-server.sh
+++ b/migrate-and-start-server.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -exu
-java -jar /usr/share/TextSecureServer.jar abusedb migrate /etc/signal-server.yaml
-java -jar /usr/share/TextSecureServer.jar accountdb migrate /etc/signal-server.yaml
-java -jar /usr/share/TextSecureServer.jar messagedb migrate /etc/signal-server.yaml
+for db in abusedb keysdb accountdb messagedb; do
+  echo "Migrating $db"
+  java -jar /usr/share/TextSecureServer.jar "$db" migrate /etc/signal-server.yaml
+done
 java -jar /usr/share/TextSecureServer.jar server /etc/signal-server.yaml
diff --git a/testhelper.go b/testhelper.go
index d3ee597..f01a5e2 100644
--- a/testhelper.go
+++ b/testhelper.go
@@ -32,7 +32,7 @@ func main() {
 		}
 	})
 
-	http.HandleFunc("/v1/directory/reconcile", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/v2/directory/reconcile", func(w http.ResponseWriter, r *http.Request) {
 		_, err := ioutil.ReadAll(r.Body)
 		defer r.Body.Close()
 		crash(err)