diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java
index 126b3061e..137fe7326 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java
@@ -30,7 +30,7 @@ public class AccountCleaner extends AccountDatabaseCrawlerListener {
   private static final Histogram      deletableAccountHistogram = metricRegistry.histogram(name(AccountCleaner.class, "deletableAccountsPerChunk"));
 
   @VisibleForTesting
-  public static final int MAX_ACCOUNT_UPDATES_PER_CHUNK = 40;
+  static final int MAX_ACCOUNT_UPDATES_PER_CHUNK = 40;
 
   private final AccountsManager accountsManager;
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java
similarity index 98%
rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java
rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java
index 22cbc36c8..1ddc0e457 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountCleanerTest.java
@@ -1,8 +1,8 @@
 /*
- * Copyright 2013-2020 Signal Messenger, LLC
+ * Copyright 2013-2022 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-package org.whispersystems.textsecuregcm.tests.storage;
+package org.whispersystems.textsecuregcm.storage;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;