diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index b79c4709fd..112e13aa7f 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -93,7 +93,9 @@ import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.Transport;
+import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
@@ -202,6 +204,9 @@ public abstract class AbstractDaemonTest {
   @Inject
   protected ChangeResource.Factory changeResourceFactory;
 
+  @Inject
+  private EventRecorder.Factory eventRecorderFactory;
+
   protected TestRepository<InMemoryRepository> testRepo;
   protected GerritServer server;
   protected TestAccount admin;
@@ -212,6 +217,7 @@ public abstract class AbstractDaemonTest {
   protected SshSession userSshSession;
   protected ReviewDb db;
   protected Project.NameKey project;
+  protected EventRecorder eventRecorder;
 
   @Inject
   protected TestNotesMigration notesMigration;
@@ -246,6 +252,16 @@ public abstract class AbstractDaemonTest {
   @Rule
   public TemporaryFolder tempSiteDir = new TemporaryFolder();
 
+  @Before
+  public void startEventRecorder() {
+    eventRecorder = eventRecorderFactory.create(user);
+  }
+
+  @After
+  public void closeEventRecorder() {
+    eventRecorder.close();
+  }
+
   @AfterClass
   public static void stopCommonServer() throws Exception {
     if (commonServer != null) {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index 8aab521857..dfe9c687f4 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -27,7 +27,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.gerrit.acceptance.AbstractDaemonTest;
-import com.google.gerrit.acceptance.EventRecorder;
 import com.google.gerrit.acceptance.NoHttpd;
 import com.google.gerrit.acceptance.PushOneCommit;
 import com.google.gerrit.acceptance.TestProjectInput;
@@ -85,11 +84,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
   @Inject
   private Submit submitHandler;
 
-  @Inject
-  private EventRecorder.Factory eventRecorderFactory;
-
-  protected EventRecorder eventRecorder;
-
   private String systemTimeZone;
 
   @Before
@@ -104,14 +98,8 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
     System.setProperty("user.timezone", systemTimeZone);
   }
 
-  @Before
-  public void setUp() throws Exception {
-    eventRecorder = eventRecorderFactory.create(user);
-  }
-
   @After
   public void cleanup() {
-    eventRecorder.close();
     db.close();
   }