diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index a9beb4ac4..7a11fdb1d 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -67,7 +67,7 @@ shibui.nameid-filter-ui-schema-location=classpath:nameid-filter.schema.json
 # shibui.metadataProviders.taskRunRate=30000
 
 # Email configuration (local mailhog)
-spring.mail.host=mailhog
+spring.mail.host=localhost
 spring.mail.port=1025
 spring.mail.username=username
 spring.mail.password=password
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
index a01645a09..2ee2a5638 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
@@ -40,7 +40,7 @@ class TestConfiguration {
     @Bean
     JavaMailSender javaMailSender() {
         return new JavaMailSenderImpl().with {
-            it.host = 'localhost'
+            it.host = 'mailhog'
             it.port = 1025
             it
         }