diff --git a/src/org/labkey/test/pages/core/admin/ShowAdminPage.java b/src/org/labkey/test/pages/core/admin/ShowAdminPage.java
index 5d55084a90..6cd95fe564 100644
--- a/src/org/labkey/test/pages/core/admin/ShowAdminPage.java
+++ b/src/org/labkey/test/pages/core/admin/ShowAdminPage.java
@@ -256,6 +256,11 @@ public void clickPostgresTableSizes()
         clickSettingsLink("postgres table sizes");
     }
 
+    public void clickTestEmailConfiguration()
+    {
+        clickSettingsLink("test email configuration");
+    }
+
     public List<WebElement> getAllAdminConsoleLinks()
     {
         goToSettingsSection();
diff --git a/src/org/labkey/test/tests/AdminConsoleTest.java b/src/org/labkey/test/tests/AdminConsoleTest.java
index b1f9df7e30..399d458b40 100644
--- a/src/org/labkey/test/tests/AdminConsoleTest.java
+++ b/src/org/labkey/test/tests/AdminConsoleTest.java
@@ -447,4 +447,12 @@ private void verifyOptionalFeatures(String linkText, List<String> featureIds, Op
                             initialState, optionalFeaturesPage.getFeatureStatus(testId));
         }
     }
+
+    @Test
+    public void testEmailTimeoutSettings()
+    {
+        log("Verifying that default email timeout properties are set");
+        goToAdminConsole().clickTestEmailConfiguration();
+        assertTextPresent("mail.smtp.writetimeout", "mail.smtp.timeout", "mail.smtp.connectiontimeout");
+    }
 }