diff --git a/tools/cldr-apps/src/test/java/org/unicode/cldr/unittest/web/TestUserRegistry.java b/tools/cldr-apps/src/test/java/org/unicode/cldr/unittest/web/TestUserRegistry.java
index 2b9827b00de..d4d03acabde 100644
--- a/tools/cldr-apps/src/test/java/org/unicode/cldr/unittest/web/TestUserRegistry.java
+++ b/tools/cldr-apps/src/test/java/org/unicode/cldr/unittest/web/TestUserRegistry.java
@@ -74,6 +74,9 @@ public void TestCanSetUserLevel() throws SQLException {
      * @throws SQLException
      */
     public void TestOrgList() throws SQLException {
+        if (TestAll.skipIfNoDb()) {
+            return;
+        }
         TestSTFactory.getFactory(); // to setup the User Regitry.
         for (String name : UserRegistry.getOrgList()) {
             try {
diff --git a/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestSTFactory.java b/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestSTFactory.java
index 809c7e18942..b482b92b63f 100644
--- a/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestSTFactory.java
+++ b/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestSTFactory.java
@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import com.ibm.icu.dev.util.ElapsedTimer;
 import java.io.BufferedReader;
@@ -50,6 +51,7 @@ public class TestSTFactory {
 
     @BeforeAll
     public static void setup() {
+        if (TestAll.skipIfNoDb()) return;
         TestAll.setupTestDb();
     }