diff --git a/pom.xml b/pom.xml
index b99531350..547e7b8ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
-        <elasticsearch>2.2.0</elasticsearch>
+        <elasticsearch>2.3.3</elasticsearch>
         <springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
 
     </properties>
diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar b/src/test/resources/test-home-dir/modules/lang-groovy/groovy-2.4.6-indy.jar
similarity index 52%
rename from src/test/resources/test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar
rename to src/test/resources/test-home-dir/modules/lang-groovy/groovy-2.4.6-indy.jar
index 3154c33b8..ce3531e0b 100644
Binary files a/src/test/resources/test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar and b/src/test/resources/test-home-dir/modules/lang-groovy/groovy-2.4.6-indy.jar differ
diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar
deleted file mode 100644
index 08d9cc22f..000000000
Binary files a/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar and /dev/null differ
diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.3.3.jar b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.3.3.jar
new file mode 100644
index 000000000..ad7716aec
Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.3.3.jar differ
diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties
index 6dfe2c18e..92b613b2e 100644
--- a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties
+++ b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties
@@ -34,7 +34,7 @@
 description=Groovy scripting integration for Elasticsearch
 #
 # 'version': plugin's version
-version=2.2.0
+version=2.3.3
 #
 # 'name': the plugin name
 name=lang-groovy
@@ -68,7 +68,7 @@ java.version=1.7
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=2.2.0
+elasticsearch.version=2.3.3
 #
 ### deprecated elements for jvm plugins :
 #
diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy
index 521c93bf6..7a12ea039 100644
--- a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy
+++ b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy
@@ -24,7 +24,6 @@ grant {
   permission java.lang.RuntimePermission "getClassLoader";
   // needed by groovy engine
   permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
-  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
   // needed by GroovyScriptEngineService to close its classloader (why?)
   permission java.lang.RuntimePermission "closeClassLoader";
   // Allow executing groovy scripts with codesource of /untrusted
@@ -32,7 +31,7 @@ grant {
 
   // Standard set of classes
   permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
-  // groovy runtime
+  // groovy runtime (TODO: clean these up if possible)
   permission org.elasticsearch.script.ClassPermission "groovy.grape.GrabAnnotationTransformation";
   permission org.elasticsearch.script.ClassPermission "groovy.json.JsonOutput";
   permission org.elasticsearch.script.ClassPermission "groovy.lang.Binding";
@@ -49,9 +48,11 @@ grant {
   permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation";
   permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.vmplugin.v7.IndyInterface";
   permission org.elasticsearch.script.ClassPermission "sun.reflect.ConstructorAccessorImpl";
+  permission org.elasticsearch.script.ClassPermission "sun.reflect.MethodAccessorImpl";
 
   permission org.elasticsearch.script.ClassPermission "groovy.lang.Closure";
   permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.GeneratedClosure";
   permission org.elasticsearch.script.ClassPermission "groovy.lang.MetaClass";
   permission org.elasticsearch.script.ClassPermission "groovy.lang.Range";
+  permission org.elasticsearch.script.ClassPermission "groovy.lang.Reference";
 };
diff --git a/template.mf b/template.mf
index af2ebf325..72a34f409 100644
--- a/template.mf
+++ b/template.mf
@@ -10,8 +10,8 @@ Import-Template:
  javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
  org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
  com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
- org.elasticsearch.*;version="${elasticsearch:[=.=.=,2.2.0)}",
- org.apache.lucene.*;version="5.4.1",
+ org.elasticsearch.*;version="${elasticsearch:[=.=.=,2.3.3)}",
+ org.apache.lucene.*;version="5.5.0",
  org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
  org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
  org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",