diff --git a/build.gradle b/build.gradle
index 57c82571a7..6f1a893c4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -178,13 +178,8 @@ subprojects { subProject ->
         )
 
         test {
-            // pass along command line defined system props (-D) to the test
-            //      pretty sure I used to have this limited to just certain prefixes, but that is no longer here
-            //      and  I no longer remember that groovy-magic needed to accomplish that
-            // TODO: Temporarily removing -- was causing issues with
-            // entitymanager tests.
-            //systemProperties = System.properties
             systemProperties['hibernate.test.validatefailureexpected'] = true
+            systemProperties += System.properties.findAll { it.key.startsWith( "hibernate.") }
             maxHeapSize = "1024m"
         }