diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle b/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle
index 7dfab246e3e..7ceedf70e28 100644
--- a/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle
+++ b/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle
@@ -4,18 +4,9 @@
  * https://github.com/elastic/x-plugins/issues/724
  */
 
-apply plugin: 'elasticsearch.standalone-test'
+apply plugin: 'elasticsearch.messy-test'
 
 dependencies {
   testCompile project(path: ':x-plugins:elasticsearch:x-pack', configuration: 'testArtifacts')
   testCompile project(path: ':modules:lang-groovy', configuration: 'runtime')
 }
-
-gradle.projectsEvaluated {
-  Project groovy = project(':modules:lang-groovy')
-  sourceSets.test.resources {
-    srcDir groovy.pluginProperties.generatedResourcesDir
-    srcDir new File(groovy.projectDir, 'src/main/plugin-metadata')
-  }
-  test.dependsOn groovy.pluginProperties
-}