diff --git a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java
index 8562262dd..3837cc7ee 100644
--- a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java
+++ b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java
@@ -391,9 +391,14 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
 
   @Test
   public void testSuccess_cachingDisabled() throws Exception {
-    RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(false);
-    persistContactsAndHosts();
-    doSuccessfulTest();
+    boolean origIsCachingEnabled = RegistryConfig.isEppResourceCachingEnabled();
+    try {
+      RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(false);
+      persistContactsAndHosts();
+      doSuccessfulTest();
+    } finally {
+      RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(origIsCachingEnabled);
+    }
   }
 
   @Test
diff --git a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
index cd1214031..2db57b54f 100644
--- a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
+++ b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
@@ -194,10 +194,15 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
 
   @Test
   public void testSuccess_cachingDisabled() throws Exception {
-    RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(false);
-    persistReferencedEntities();
-    persistDomain();
-    doSuccessfulTest();
+    boolean origIsCachingEnabled = RegistryConfig.isEppResourceCachingEnabled();
+    try {
+      RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(false);
+      persistReferencedEntities();
+      persistDomain();
+      doSuccessfulTest();
+    } finally {
+      RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(origIsCachingEnabled);
+    }
   }
 
   @Test
diff --git a/javatests/google/registry/model/registrar/RegistrarTest.java b/javatests/google/registry/model/registrar/RegistrarTest.java
index f9fe18cb7..c05e4f0b5 100644
--- a/javatests/google/registry/model/registrar/RegistrarTest.java
+++ b/javatests/google/registry/model/registrar/RegistrarTest.java
@@ -14,6 +14,7 @@
 
 package google.registry.model.registrar;
 
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
 import static google.registry.model.ofy.ObjectifyService.ofy;
@@ -454,6 +455,11 @@ public class RegistrarTest extends EntityTestCase {
 
   @Test
   public void testSuccess_setAllowedTldsUncached_newTldNotInCache() {
+    int origSingletonCacheRefreshSeconds =
+        RegistryConfig.CONFIG_SETTINGS.get().caching.singletonCacheRefreshSeconds;
+    // Sanity check for Gradle-based open-source build.
+    checkState(
+        origSingletonCacheRefreshSeconds == 0, "singletonCacheRefreshSeconds expected to be 0.");
     try {
       // Cache duration in tests is 0. To make sure the data isn't in the cache we have to set it
       // to a higher value and reset the cache.
@@ -490,8 +496,8 @@ public class RegistrarTest extends EntityTestCase {
       // TLDs
       assertThat(Registries.getTlds()).doesNotContain("newtld");
     } finally {
-      // Set the cache duration back to 0 to satisfy other tests.
-      RegistryConfig.CONFIG_SETTINGS.get().caching.singletonCacheRefreshSeconds = 0;
+      RegistryConfig.CONFIG_SETTINGS.get().caching.singletonCacheRefreshSeconds =
+          origSingletonCacheRefreshSeconds;
       Registries.resetCache();
     }
   }
diff --git a/javatests/google/registry/tools/RequestFactoryModuleTest.java b/javatests/google/registry/tools/RequestFactoryModuleTest.java
index 1313348d6..8ff24d9a4 100644
--- a/javatests/google/registry/tools/RequestFactoryModuleTest.java
+++ b/javatests/google/registry/tools/RequestFactoryModuleTest.java
@@ -49,27 +49,37 @@ public class RequestFactoryModuleTest {
   @Test
   public void test_provideHttpRequestFactory_localhost() throws Exception {
     // Make sure that localhost creates a request factory with an initializer.
+    boolean origIsLocal = RegistryConfig.CONFIG_SETTINGS.get().appEngine.isLocal;
     RegistryConfig.CONFIG_SETTINGS.get().appEngine.isLocal = true;
-    HttpRequestFactory factory = RequestFactoryModule.provideHttpRequestFactory(googleCredential);
-    HttpRequestInitializer initializer = factory.getInitializer();
-    assertThat(initializer).isNotNull();
-    HttpRequest request = factory.buildGetRequest(new GenericUrl("http://localhost"));
-    initializer.initialize(request);
-    verifyZeroInteractions(googleCredential);
+    try {
+      HttpRequestFactory factory = RequestFactoryModule.provideHttpRequestFactory(googleCredential);
+      HttpRequestInitializer initializer = factory.getInitializer();
+      assertThat(initializer).isNotNull();
+      HttpRequest request = factory.buildGetRequest(new GenericUrl("http://localhost"));
+      initializer.initialize(request);
+      verifyZeroInteractions(googleCredential);
+    } finally {
+      RegistryConfig.CONFIG_SETTINGS.get().appEngine.isLocal = origIsLocal;
+    }
   }
 
   @Test
   public void test_provideHttpRequestFactory_remote() throws Exception {
     // Make sure that example.com creates a request factory with the UNITTEST client id but no
+    boolean origIsLocal = RegistryConfig.CONFIG_SETTINGS.get().appEngine.isLocal;
     RegistryConfig.CONFIG_SETTINGS.get().appEngine.isLocal = false;
-    HttpRequestFactory factory = RequestFactoryModule.provideHttpRequestFactory(googleCredential);
-    HttpRequestInitializer initializer = factory.getInitializer();
-    assertThat(initializer).isNotNull();
-    // HttpRequestFactory#buildGetRequest() calls initialize() once.
-    HttpRequest request = factory.buildGetRequest(new GenericUrl("http://localhost"));
-    verify(googleCredential).initialize(request);
-    assertThat(request.getConnectTimeout()).isEqualTo(REQUEST_TIMEOUT_MS);
-    assertThat(request.getReadTimeout()).isEqualTo(REQUEST_TIMEOUT_MS);
-    verifyNoMoreInteractions(googleCredential);
+    try {
+      HttpRequestFactory factory = RequestFactoryModule.provideHttpRequestFactory(googleCredential);
+      HttpRequestInitializer initializer = factory.getInitializer();
+      assertThat(initializer).isNotNull();
+      // HttpRequestFactory#buildGetRequest() calls initialize() once.
+      HttpRequest request = factory.buildGetRequest(new GenericUrl("http://localhost"));
+      verify(googleCredential).initialize(request);
+      assertThat(request.getConnectTimeout()).isEqualTo(REQUEST_TIMEOUT_MS);
+      assertThat(request.getReadTimeout()).isEqualTo(REQUEST_TIMEOUT_MS);
+      verifyNoMoreInteractions(googleCredential);
+    } finally {
+      RegistryConfig.CONFIG_SETTINGS.get().appEngine.isLocal = origIsLocal;
+    }
   }
 }