diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle
index 79c7f65786..924234df5e 100644
--- a/hibernate-infinispan/hibernate-infinispan.gradle
+++ b/hibernate-infinispan/hibernate-infinispan.gradle
@@ -8,6 +8,20 @@ configurations {
     all*.exclude group: 'org.jboss.logging', module: 'jboss-logging-spi'
 }
 
+if ( useInfinispan8ForTesting() ) {
+    configurations.testRuntime.resolutionStrategy.force 'org.infinispan:infinispan-core:8.0.0.Beta2'
+}
+
+private boolean useInfinispan8ForTesting() {
+    if ( project.hasProperty( 'useInfinispan8ForTesting' ) ) {
+        if ( useInfinispan8ForTesting.equals( 'true' ) ) {
+            println 'Overrriding Infinispan version to test vs Infinispan 8.0.0.Beta2'
+            return true;
+        }
+    }
+    return false;
+}
+
 dependencies {
     compile project( ':hibernate-core' )
     compile( libraries.infinispan )