diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManager.java
index d955274b4..936a8ac8e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManager.java
@@ -32,12 +32,12 @@ public class RemoteConfigsManager implements Managed {
 
   @Override
   public void start() {
-    this.cachedConfigs.set(remoteConfigs.getAll());
+    refreshCache();
 
     new Thread(() -> {
       while (true) {
         try {
-          this.cachedConfigs.set(remoteConfigs.getAll());
+          refreshCache();
         } catch (Throwable t) {
           logger.warn("Error updating remote configs cache", t);
         }
@@ -47,6 +47,21 @@ public class RemoteConfigsManager implements Managed {
     }).start();
   }
 
+  private void refreshCache() {
+    this.cachedConfigs.set(remoteConfigs.getAll());
+
+    synchronized (this.cachedConfigs) {
+      this.cachedConfigs.notifyAll();
+    }
+  }
+
+  @VisibleForTesting
+  void waitForCacheRefresh() throws InterruptedException {
+    synchronized (this.cachedConfigs) {
+      this.cachedConfigs.wait();
+    }
+  }
+
   public List<RemoteConfig> getAll() {
     return cachedConfigs.get();
   }
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RemoteConfigsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManagerTest.java
similarity index 88%
rename from service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RemoteConfigsManagerTest.java
rename to service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManagerTest.java
index a2fb751a4..fde9f4d2a 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RemoteConfigsManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RemoteConfigsManagerTest.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecuregcm.tests.storage;
+package org.whispersystems.textsecuregcm.storage;
 
 import com.opentable.db.postgres.embedded.LiquibasePreparer;
 import com.opentable.db.postgres.junit.EmbeddedPostgresRules;
@@ -8,10 +8,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
-import org.whispersystems.textsecuregcm.storage.FaultTolerantDatabase;
-import org.whispersystems.textsecuregcm.storage.RemoteConfig;
-import org.whispersystems.textsecuregcm.storage.RemoteConfigs;
-import org.whispersystems.textsecuregcm.storage.RemoteConfigsManager;
 import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 
 import java.util.List;
@@ -41,7 +37,7 @@ public class RemoteConfigsManagerTest {
     remoteConfigs.set(new RemoteConfig("ios.stickers", 75, Set.of(), "FALSE", "TRUE", null));
     remoteConfigs.set(new RemoteConfig("value.sometimes", 25, Set.of(AuthHelper.VALID_UUID), "abc", "def", null));
 
-    Thread.sleep(501);
+    remoteConfigs.waitForCacheRefresh();
 
     List<RemoteConfig> results = remoteConfigs.getAll();