diff --git a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
index eb03a030..ecaf3479 100644
--- a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
+++ b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
@@ -17,10 +17,14 @@ import spock.lang.Specification
  * Created by graemerocher on 04/11/16.
  */
 @ApplyDetachedCriteriaTransform
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class TablePerSubClassAndEmbeddedSpec extends Specification {
 
-    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(Company, Vendor)
+    @Shared Map config = [
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
+            'dataSource.dbCreate': 'create-drop',
+            'dataSource.dialect': 'org.hibernate.dialect.H2Dialect'
+    ]
+    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(config, Company, Vendor)
     @Shared PlatformTransactionManager transactionManager = hibernateDatastore.getTransactionManager()
 
     @Rollback
@@ -61,7 +65,7 @@ Vendor.where {
 }
 
 
-//@Entity
+@Entity
 class Company {
     Address address
     String name
diff --git a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy
index 256c20f2..551a04ff 100644
--- a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy
+++ b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy
@@ -1,11 +1,8 @@
 package grails.gorm.tests.inheritance
 
-import spock.lang.Ignore
-
 import grails.gorm.annotation.Entity
 import grails.gorm.tests.GormDatastoreSpec
 
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class SubclassToOneProxySpec extends GormDatastoreSpec {
 
     void "the hasOne is a proxy and unwraps"() {
@@ -26,7 +23,7 @@ class SubclassToOneProxySpec extends GormDatastoreSpec {
     }
 }
 
-//@Entity
+@Entity
 class SuperclassProxy {
 }
 
diff --git a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy
index b3adfdb0..ab708ef8 100644
--- a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy
+++ b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy
@@ -10,7 +10,6 @@ import spock.lang.Issue
  * Created by graemerocher on 29/05/2017.
  */
 @Issue('https://github.com/grails/grails-data-mapping/issues/937')
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class TablePerConcreteClassAndDateCreatedSpec extends GormSpec {
     void "should set the dateCreated automatically"() {
         given:
@@ -42,7 +41,7 @@ class TablePerConcreteClassAndDateCreatedSpec extends GormSpec {
     }
 }
 
-//@Entity
+@Entity
 abstract class Vehicle {
     String name
     Date dateCreated
diff --git a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy
index a2441301..02e1ce02 100644
--- a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy
+++ b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassImportedSpec.groovy
@@ -1,12 +1,9 @@
 package grails.gorm.tests.inheritance
 
-import spock.lang.Ignore
-
 import org.grails.orm.hibernate.GormSpec
 import spock.lang.Issue
 
 @Issue('https://github.com/grails/gorm-hibernate5/issues/151')
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class TablePerConcreteClassImportedSpec extends GormSpec {
     void "test that subclasses are added to the imports on the metamodel"() {
         expect:
diff --git a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy
index 195a9b91..f45d46a1 100644
--- a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy
+++ b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy
@@ -13,10 +13,14 @@ import spock.lang.Specification
 /**
  * Created by graemerocher on 04/05/2017.
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class CascadeValidationSpec extends Specification {
 
-    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(Business, Person, Employee)
+    @Shared Map config = [
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
+            'dataSource.dbCreate': 'create-drop',
+            'dataSource.dialect': 'org.hibernate.dialect.H2Dialect'
+    ]
+    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(config, Business, Person, Employee)
 
     @Rollback
     @Issue('https://github.com/grails/grails-data-mapping/issues/926')
@@ -46,7 +50,7 @@ class Business {
     ]
 
 }
-//@Entity
+@Entity
 abstract class Person {
 
 }
diff --git a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy
index 8bed8ff7..0e778a4e 100644
--- a/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy
+++ b/grace-datastore-gorm-hibernate/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy
@@ -1,7 +1,5 @@
 package grails.gorm.tests.validation
 
-import spock.lang.Ignore
-
 import grails.gorm.annotation.Entity
 import grails.gorm.transactions.Rollback
 import org.grails.datastore.mapping.reflect.EntityReflector
@@ -12,10 +10,14 @@ import spock.lang.Shared
 import spock.lang.Specification
 
 @Rollback
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class UniqueInheritanceSpec extends Specification {
 
-    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(Item, ConcreteProduct, Product, Book)
+    @Shared Map config = [
+            'dataSource.url':"jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000",
+            'dataSource.dbCreate': 'create-drop',
+            'dataSource.dialect': 'org.hibernate.dialect.H2Dialect'
+    ]
+    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(config, Item, ConcreteProduct, Product, Book)
 
     void "unique constraint works directly"() {
         setup:
@@ -78,7 +80,7 @@ class ConcreteProduct extends Product {
 
 }
 
-//@Entity
+@Entity
 abstract class Product {
     String name