diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java
index 5dd16bfe4f..aa9ab14106 100644
--- a/src/org/labkey/test/util/TestDataGenerator.java
+++ b/src/org/labkey/test/util/TestDataGenerator.java
@@ -702,6 +702,8 @@ private static boolean isNameInvalidLocal(DomainKind domainKind, @Nullable Rando
     {
         if (domainName != null)
         {
+            if (domainName.name().isBlank())
+                return true;
             if (!Character.isLetterOrDigit(domainName.name().charAt(0)))
                 return true; // domain needs to start with alphanumeric char
             if (Pattern.matches("(.*\\s--[^ ].*)|(.*\\s-[^- ].*)", domainName.name()))
@@ -722,6 +724,8 @@ private static boolean isNameInvalidLocal(DomainKind domainKind, @Nullable Rando
         }
         if (fieldName != null)
         {
+            if (fieldName.name().isBlank())
+                return true;
             if (fieldName.name().length() > 200)
                 return true;
             if (COLON_NAME_PATTERN.matcher(fieldName.name())