diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
index d2f2147..a9e19a4 100644
--- a/grails-app/conf/BuildConfig.groovy
+++ b/grails-app/conf/BuildConfig.groovy
@@ -63,7 +63,6 @@ grails.project.dependency.resolution = {
         runtime "org.hibernate:hibernate-ehcache:$hibernateVersion", {
             exclude group: 'net.sf.ehcache', name: 'ehcache-core'
         }
-        runtime "net.sf.ehcache:ehcache-core:2.4.8"
     }
 
     plugins {
diff --git a/test/unit/org/codehaus/groovy/grails/orm/hibernate/AbstractGrailsHibernateTests.groovy b/test/unit/org/codehaus/groovy/grails/orm/hibernate/AbstractGrailsHibernateTests.groovy
index 77e135c..95dd7f2 100755
--- a/test/unit/org/codehaus/groovy/grails/orm/hibernate/AbstractGrailsHibernateTests.groovy
+++ b/test/unit/org/codehaus/groovy/grails/orm/hibernate/AbstractGrailsHibernateTests.groovy
@@ -147,9 +147,6 @@ dataSource {
     }
 }
 hibernate {
-    cache.use_second_level_cache=true
-    cache.use_query_cache=true
-    cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
 }
 ''', "DataSource")
     }
@@ -195,13 +192,6 @@ hibernate {
         catch(e) {
             // means it is not active, ignore
         }
-        try {
-            getClass().classLoader.loadClass("net.sf.ehcache.CacheManager")
-                                    .getInstance()?.shutdown()
-        }
-        catch(e) {
-            // means there is no cache, ignore
-        }
         gcl = null
         ga = null
         mockManager = null
diff --git a/test/unit/org/codehaus/groovy/grails/orm/hibernate/GormSpec.groovy b/test/unit/org/codehaus/groovy/grails/orm/hibernate/GormSpec.groovy
index 8d67065..97f8c37 100644
--- a/test/unit/org/codehaus/groovy/grails/orm/hibernate/GormSpec.groovy
+++ b/test/unit/org/codehaus/groovy/grails/orm/hibernate/GormSpec.groovy
@@ -92,13 +92,6 @@ abstract class GormSpec extends Specification {
         catch(e) {
             // means it is not active, ignore
         }
-        try {
-            getClass().classLoader.loadClass("net.sf.ehcache.CacheManager")
-                                    .getInstance()?.shutdown()
-        }
-        catch(e) {
-            // means there is no cache, ignore
-        }
         gcl = null
         grailsApplication = null
         mockManager = null
@@ -190,12 +183,9 @@ dataSource {
     url = "jdbc:h2:mem:grailsIntTestDB"
 }
 hibernate {
-    cache.use_second_level_cache=true
-    cache.use_query_cache=true
-    cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
 }
 ''', "DataSource")
     }
 
     abstract List getDomainClasses()
-}
\ No newline at end of file
+}
diff --git a/test/unit/org/codehaus/groovy/grails/orm/hibernate/MultipleDataSourceTests.groovy b/test/unit/org/codehaus/groovy/grails/orm/hibernate/MultipleDataSourceTests.groovy
index 1141d5c..01d6952 100644
--- a/test/unit/org/codehaus/groovy/grails/orm/hibernate/MultipleDataSourceTests.groovy
+++ b/test/unit/org/codehaus/groovy/grails/orm/hibernate/MultipleDataSourceTests.groovy
@@ -209,9 +209,6 @@ dataSource_ds4 {
 }
 
 hibernate {
-    cache.use_second_level_cache = true
-    cache.use_query_cache = true
-    cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
 }
 ''', 'DataSource')
     }
diff --git a/test/unit/org/codehaus/groovy/grails/orm/hibernate/validation/HibernateMappingUniqueConstraintTests.groovy b/test/unit/org/codehaus/groovy/grails/orm/hibernate/validation/HibernateMappingUniqueConstraintTests.groovy
index 3d59561..61e43e0 100644
--- a/test/unit/org/codehaus/groovy/grails/orm/hibernate/validation/HibernateMappingUniqueConstraintTests.groovy
+++ b/test/unit/org/codehaus/groovy/grails/orm/hibernate/validation/HibernateMappingUniqueConstraintTests.groovy
@@ -42,9 +42,6 @@ dataSource {
     }
 }
 hibernate {
-    cache.use_second_level_cache=true
-    cache.use_query_cache=true
-    cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
     config.location = ['classpath:/org/codehaus/groovy/grails/orm/hibernate/validation/hibernate.cfg.xml']
 }
 ''', "DataSource")