diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java
index 14134e2..b9dc245 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java
@@ -36,6 +36,30 @@
   private final long cleanupIntervalMillis;
   private ScheduledFuture<?> scheduledCleanupTask;
 
+  static class CleanupTask implements Runnable {
+    private static final Logger log = LoggerFactory.getLogger(CleanupTask.class);
+    private final FileBasedWebsessionCache fileBasedWebSessionCache;
+    private final String pluginName;
+
+    @Inject
+    CleanupTask(FileBasedWebsessionCache fileBasedWebSessionCache, @PluginName String pluginName) {
+      this.fileBasedWebSessionCache = fileBasedWebSessionCache;
+      this.pluginName = pluginName;
+    }
+
+    @Override
+    public void run() {
+      log.info("Cleaning up expired file based websessions...");
+      fileBasedWebSessionCache.cleanUp();
+      log.info("Cleaning up expired file based websessions...Done");
+    }
+
+    @Override
+    public String toString() {
+      return String.format("[%s] Clean up expired file based websessions", pluginName);
+    }
+  }
+
   @Inject
   FileBasedWebSessionCacheCleaner(
       WorkQueue queue, Provider<CleanupTask> cleanupTaskProvider, Configuration config) {
@@ -64,27 +88,3 @@
     }
   }
 }
-
-class CleanupTask implements Runnable {
-  private static final Logger log = LoggerFactory.getLogger(CleanupTask.class);
-  private final FileBasedWebsessionCache fileBasedWebSessionCache;
-  private final String pluginName;
-
-  @Inject
-  CleanupTask(FileBasedWebsessionCache fileBasedWebSessionCache, @PluginName String pluginName) {
-    this.fileBasedWebSessionCache = fileBasedWebSessionCache;
-    this.pluginName = pluginName;
-  }
-
-  @Override
-  public void run() {
-    log.info("Cleaning up expired file based websessions...");
-    fileBasedWebSessionCache.cleanUp();
-    log.info("Cleaning up expired file based websessions...Done");
-  }
-
-  @Override
-  public String toString() {
-    return String.format("[%s] Clean up expired file based websessions", pluginName);
-  }
-}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java
index 3a2828e..0a8fc92 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java
@@ -25,6 +25,7 @@
 import static org.mockito.Mockito.when;
 
 import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.ericsson.gerrit.plugins.highavailability.websession.file.FileBasedWebSessionCacheCleaner.CleanupTask;
 import com.google.gerrit.server.git.WorkQueue;
 import com.google.inject.Provider;
 import java.util.concurrent.ScheduledFuture;