diff --git a/backend/build.gradle b/backend/build.gradle
index 6dd21a097..3af60585e 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -44,12 +44,35 @@ configurations {
     integrationTestRuntime {
         extendsFrom testRuntime
     }
-    enversTestCompile {
-        extendsFrom testCompile
+}
+
+def generatedSrcDir = new File(buildDir, 'generated/src/main/java')
 
+sourceSets {
+    main {
+        groovy {
+            srcDirs = ['src/main/groovy', 'src/main/java', generatedSrcDir]
+        }
+        java {
+            srcDirs = []
+        }
     }
-    enversTestRuntime {
-        extendsFrom testRuntime
+    integrationTest {
+        groovy {
+            srcDirs = ['src/integration/groovy']
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + test.output
+        }
+        resources {
+            srcDir 'src/integration/resources'
+        }
+    }
+
+    enversTest {
+        groovy {
+            srcDir 'src/enversTest/groovy'
+        }
+        resources.srcDir 'src/enversTest/resources'
     }
 }
 
@@ -181,36 +204,14 @@ dependencies {
 
     // Envers for persistent entities versioning
     compile 'org.hibernate:hibernate-envers'
-}
 
-def generatedSrcDir = new File(buildDir, 'generated/src/main/java')
+    enversTestCompile sourceSets.main.output
+    enversTestCompile sourceSets.test.output
+    enversTestCompile configurations.compile
+    enversTestCompile configurations.testCompile
 
-sourceSets {
-    main {
-        groovy {
-            srcDirs = ['src/main/groovy', 'src/main/java', generatedSrcDir]
-        }
-        java {
-            srcDirs = []
-        }
-    }
-    integrationTest {
-        groovy {
-            srcDirs = ['src/integration/groovy']
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
-        }
-        resources {
-            srcDir 'src/integration/resources'
-        }
-    }
-    enversTest {
-        groovy {
-            srcDirs = ['src/enversTest/groovy']
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
-        }
-    }
+    enversTestRuntime configurations.runtime
+    enversTestRuntime configurations.testRuntime
 }
 
 task integrationTest(type: Test) {
@@ -232,9 +233,10 @@ task enversTest(type: Test) {
     systemProperties = System.properties
     systemProperties['user.dir'] = workingDir
 }
-test.finalizedBy enversTest
-
 
+check {
+    dependsOn enversTest
+}
 
 task generateSources {
     inputs.dir('src/main/templates')
diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy
index f8f97b0fc..579620b44 100644
--- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy
+++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy
@@ -4,6 +4,22 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfigurat
 import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService
+import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributes
+import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
+import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor
+import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor
+import edu.internet2.tier.shibboleth.admin.ui.domain.SingleLogoutService
+import edu.internet2.tier.shibboleth.admin.ui.domain.UIInfo
+import edu.internet2.tier.shibboleth.admin.ui.domain.X509Certificate
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService
@@ -17,8 +33,6 @@ import spock.lang.Specification
 
 import javax.persistence.EntityManager
 
-import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.*
-
 /**
  * Testing entity descriptor envers versioning
  */
diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy
index 58cd83704..d88a604f3 100644
--- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy
+++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy
@@ -1,6 +1,10 @@
 package edu.internet2.tier.shibboleth.admin.ui.service.envers
 
-
+import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.EntitiesVersioningConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
 import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService