diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
index 6dab911ac2..7f932c3a73 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java
@@ -20,12 +20,16 @@ import com.google.gerrit.server.plugins.TestServerPlugin;
 import com.google.inject.Inject;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 public class LightweightPluginDaemonTest extends AbstractDaemonTest {
   @Inject private PluginGuiceEnvironment env;
 
   @Inject private PluginUser.Factory pluginUserFactory;
 
+  @Rule public TemporaryFolder tempDataDir = new TemporaryFolder();
+
   private TestServerPlugin plugin;
 
   @Before
@@ -41,7 +45,7 @@ public class LightweightPluginDaemonTest extends AbstractDaemonTest {
             testPlugin.sysModule(),
             testPlugin.httpModule(),
             testPlugin.sshModule(),
-            tempSiteDir.newFolder().toPath());
+            tempDataDir.getRoot().toPath());
 
     plugin.start(env);
     env.onStartPlugin(plugin);