diff --git a/src/main/java/com/google/gerrit/pgm/CreateSchema.java b/src/main/java/com/google/gerrit/pgm/CreateSchema.java
index ec44603dc0..8a0958c2d5 100644
--- a/src/main/java/com/google/gerrit/pgm/CreateSchema.java
+++ b/src/main/java/com/google/gerrit/pgm/CreateSchema.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.pgm;
 
 import com.google.gerrit.client.rpc.Common;
+import com.google.gerrit.git.WorkQueue;
 import com.google.gerrit.server.GerritServer;
 import com.google.gwtjsonrpc.server.XsrfException;
 import com.google.gwtorm.client.OrmException;
@@ -25,6 +26,15 @@ import com.google.gwtorm.client.OrmException;
 public class CreateSchema {
   public static void main(final String[] argv) throws OrmException,
       XsrfException {
+    try {
+      mainImpl(argv);
+    } finally {
+      WorkQueue.terminate();
+    }
+  }
+
+  private static void mainImpl(final String[] argv) throws OrmException,
+      XsrfException {
     GerritServer.getInstance();
     Common.getSchemaFactory().open().close();
     System.out.println("Gerrit2 schema initialized");
diff --git a/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java b/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java
index 0c8697ea3a..f035a1c816 100644
--- a/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java
+++ b/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java
@@ -28,6 +28,7 @@ import com.google.gerrit.client.reviewdb.SystemConfig;
 import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.git.InvalidRepositoryException;
 import com.google.gerrit.git.PatchSetImporter;
+import com.google.gerrit.git.WorkQueue;
 import com.google.gerrit.server.ChangeUtil;
 import com.google.gerrit.server.GerritServer;
 import com.google.gwtjsonrpc.server.XsrfException;
@@ -79,7 +80,16 @@ public class ImportGerrit1 {
   private static ApprovalCategory submitCategory;
 
   public static void main(final String[] argv) throws OrmException,
-      XsrfException, SQLException, IOException, InvalidRepositoryException {
+      XsrfException, IOException, SQLException, InvalidRepositoryException {
+    try {
+      mainImpl(argv);
+    } finally {
+      WorkQueue.terminate();
+    }
+  }
+
+  private static void mainImpl(final String[] argv) throws OrmException,
+      XsrfException, IOException, SQLException, InvalidRepositoryException {
     final ProgressMonitor pm = new TextProgressMonitor();
     gs = GerritServer.getInstance();
     db = Common.getSchemaFactory().open();
diff --git a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
index c4fa9c5baf..b303293d39 100644
--- a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
+++ b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
@@ -20,6 +20,7 @@ import com.google.gerrit.client.reviewdb.ReviewDb;
 import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.git.InvalidRepositoryException;
 import com.google.gerrit.git.PatchSetImporter;
+import com.google.gerrit.git.WorkQueue;
 import com.google.gerrit.server.GerritServer;
 import com.google.gwtjsonrpc.server.XsrfException;
 import com.google.gwtorm.client.OrmException;
@@ -54,6 +55,15 @@ import java.util.ArrayList;
 public class ReimportPatchSets {
   public static void main(final String[] argv) throws OrmException,
       XsrfException, IOException {
+    try {
+      mainImpl(argv);
+    } finally {
+      WorkQueue.terminate();
+    }
+  }
+
+  private static void mainImpl(final String[] argv) throws OrmException,
+      XsrfException, IOException {
     final GerritServer gs = GerritServer.getInstance();
     final ArrayList<PatchSet.Id> todo = new ArrayList<PatchSet.Id>();
     final BufferedReader br =