diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle
index 02a39e95b6c..8747552ba6e 100644
--- a/grails-test-suite-persistence/build.gradle
+++ b/grails-test-suite-persistence/build.gradle
@@ -46,11 +46,18 @@ test {
     maxParallelForks = 2
     forkEvery = 100
     jvmArgs = ['-Xmx1048M','-XX:MaxPermSize=256m']
-    excludes = ['**/GrailsDomainBinderTests.class']
+    excludes = ['**/GrailsDomainBinderTests.class', 
+                '**/ComponentValidationTests.class', 
+                '**/HibernateMappingUniqueConstraintTests.class']
 }
 
 task testGrailsDomainBinder(type: Test) {
     includes = ['**/GrailsDomainBinderTests.class']
 }
 
-test.dependsOn testGrailsDomainBinder
+task testIsolatedPersistentOne(type: Test) {
+    includes = ['**/ComponentValidationTests.class']
+    includes = ['**/HibernateMappingUniqueConstraintTests.class']
+}
+
+test.dependsOn testGrailsDomainBinder, testIsolatedPersistentOne
diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle
index b6fb9ee03dd..bd1f4eadaca 100644
--- a/grails-test-suite-uber/build.gradle
+++ b/grails-test-suite-uber/build.gradle
@@ -49,12 +49,12 @@ test {
      maxParallelForks = 4
      forkEvery = 100
      maxHeapSize = '1024m'
-     excludes = ["**/*TestCase.class","**/DataSourceGrailsPluginTests","**/MockUtilsTests.class","**/GrailsUnitTestCaseTests.class"]
+     excludes = ["**/*TestCase.class","**/DataSourceGrailsPluginTests","**/MockUtilsTests.class","**/GrailsUnitTestCaseTests.class","**/SetupTeardownInvokeTests.class","**/TestMixinSetupTeardownInvokeTests.class","**/UrlMappingsTestMixinTests.class"]
 }
 
 task isolatedTestsOne(type:Test) {
     includes = [
-                "**/DataSourceGrailsPluginTests.class","**/MockUtilsTests.class","**/GrailsUnitTestCaseTests.class"]
+                "**/DataSourceGrailsPluginTests.class","**/MockUtilsTests.class","**/GrailsUnitTestCaseTests.class","**/SetupTeardownInvokeTests.class","**/TestMixinSetupTeardownInvokeTests.class","**/UrlMappingsTestMixinTests.class"]
 }
 
 test.dependsOn isolatedTestsOne