diff --git a/qa/messy-test-watcher-with-groovy/build.gradle b/qa/messy-test-watcher-with-groovy/build.gradle
index 26d927a16cd..5d7a245277a 100644
--- a/qa/messy-test-watcher-with-groovy/build.gradle
+++ b/qa/messy-test-watcher-with-groovy/build.gradle
@@ -10,7 +10,7 @@ dependencies {
   testCompile project(path: ':x-plugins:license:plugin', configuration: 'runtime')
   testCompile project(path: ':x-plugins:shield', configuration: 'runtime')
   testCompile project(path: ':x-plugins:watcher', configuration: 'testArtifacts')
-  testCompile project(path: ':plugins:lang-groovy', configuration: 'runtime')
+  testCompile project(path: ':modules:lang-groovy', configuration: 'runtime')
 }
 
 // TODO: remove this, its because gradle does not bring in plugin-metadata for lang-groovy
diff --git a/qa/smoke-test-watcher-with-groovy/build.gradle b/qa/smoke-test-watcher-with-groovy/build.gradle
index bfbdef34180..c6ee37a7556 100644
--- a/qa/smoke-test-watcher-with-groovy/build.gradle
+++ b/qa/smoke-test-watcher-with-groovy/build.gradle
@@ -2,14 +2,15 @@ apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
   testCompile project(path: ':x-plugins:watcher', configuration: 'runtime')
-  testCompile project(path: ':plugins:lang-groovy', configuration: 'runtime')
+  testCompile project(path: ':modules:lang-groovy', configuration: 'runtime')
 }
 
 integTest {
   cluster {
     plugin 'license', project(':x-plugins:license:plugin')
     plugin 'watcher', project(':x-plugins:watcher')
-    plugin 'groovy', project(':plugins:lang-groovy')
+    // TODO: fix this once modules are not allowed to be installed with bin/plugin...
+    plugin 'groovy', project(':modules:lang-groovy')
     systemProperty 'es.script.inline', 'on'
   }
 }