diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle
index 7033c44..a937a76 100644
--- a/spring-cloud-app-broker-acceptance-tests/build.gradle
+++ b/spring-cloud-app-broker-acceptance-tests/build.gradle
@@ -16,7 +16,11 @@
 
 description = "Spring Cloud App Broker Acceptance Tests"
 
-apply plugin: "com.jfrog.artifactory"
+tasks.whenTaskAdded {task ->
+	if(task.name.contains("artifactoryPublish")) {
+		task.enabled = false
+	}
+}
 
 // don't publish the jar for the acceptance tests project
 configurations.archives.artifacts.clear()
@@ -52,10 +56,6 @@ test {
 	systemProperties << System.properties.findAll { it.key.startsWith("spring.") }
 }
 
-artifactoryPublish {
-	enabled = false
-}
-
 // Disable classfile warnings because of cloudfoundry-client warnings
 [compileJava, compileTestJava]*.options*.compilerArgs = [
 	"-Xlint:serial",
diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle
index 8973c77..c864261 100644
--- a/spring-cloud-app-broker-integration-tests/build.gradle
+++ b/spring-cloud-app-broker-integration-tests/build.gradle
@@ -27,7 +27,11 @@ buildscript {
 
 description = "Spring Cloud App Broker Integration Tests"
 
-apply plugin: "com.jfrog.artifactory"
+tasks.whenTaskAdded {task ->
+	if(task.name.contains("artifactoryPublish")) {
+		task.enabled = false
+	}
+}
 
 // don't publish the jar for this module
 configurations.archives.artifacts.clear()
@@ -60,7 +64,3 @@ test {
 	// force a new fork for every test to eliminate issues with wiremock state
 	forkEvery = 1
 }
-
-artifactoryPublish {
-	enabled = false
-}