diff --git a/grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy b/grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
index 870fc9dbc3a..30916b59c7a 100644
--- a/grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
+++ b/grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
@@ -131,8 +131,8 @@ class DomainClassUnitTestMixin extends GrailsUnitTestMixin {
 
         }
         def enhancer = new GormEnhancer(simpleDatastore, transactionManager)
-        enhancer.enhance()
         simpleDatastore.mappingContext.initialize()
+        enhancer.enhance()
     }
     /**
      * Mocks a domain class providing the equivalent GORM behavior but against an in-memory concurrent hash map instead