diff --git a/src/org/labkey/test/tests/DataClassTest.java b/src/org/labkey/test/tests/DataClassTest.java
index dd39eb96a4..245ac767de 100644
--- a/src/org/labkey/test/tests/DataClassTest.java
+++ b/src/org/labkey/test/tests/DataClassTest.java
@@ -164,6 +164,20 @@ public void testReservedFieldNames()
                 "'name' is a reserved field name in 'Reserved Field Names Test'.",
                 "Please correct errors in Reserved Field Names Test before saving."),
                 createPage.clickSaveExpectingErrors());
+        domainFormPanel.removeAllFields(false);
+
+        domainFormPanel.manuallyDefineFields("protocol");
+        assertEquals("Data class reserved field name error", Arrays.asList(
+                        "'protocol' is a reserved field name in 'Reserved Field Names Test'.",
+                        "Please correct errors in Reserved Field Names Test before saving."),
+                createPage.clickSaveExpectingErrors());
+        domainFormPanel.removeAllFields(false);
+
+        domainFormPanel.manuallyDefineFields("Name Expression");
+        assertEquals("Data class reserved field name error", Arrays.asList(
+                        "'Name Expression' is a reserved field name in 'Reserved Field Names Test'.",
+                        "Please correct errors in Reserved Field Names Test before saving."),
+                createPage.clickSaveExpectingErrors());
 
         createPage.clickCancel();
     }