diff --git a/pom.xml b/pom.xml
index d6144a386c3..8f073c45ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-nop</artifactId>
             <version>1.7.7</version>
         </dependency>
 
@@ -175,6 +175,57 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <shadeTestJar>false</shadeTestJar>
+                    <!--
+                        We can't minimize jars, because quartz creates jobs from classpath url loading
+                        and this results in class not found errors at runtime.
+                     -->
+                    <minimizeJar>false</minimizeJar>
+                    <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                    <artifactSet>
+                        <includes>
+                            <include>org.quartz-scheduler:quartz</include>
+                            <include>org.slf4j:slf4j-api</include>
+                            <include>org.slf4j:slf4j-nop</include>
+                            <include>javax.mail:mail</include>
+                            <include>javax.activation:activation</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.quartz</pattern>
+                            <shadedPattern>org.elasticsearch.cronrunner</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/license/**</exclude>
+                                <exclude>META-INF/*</exclude>
+                                <exclude>META-INF/maven/**</exclude>
+                                <exclude>LICENSE</exclude>
+                                <exclude>NOTICE</exclude>
+                                <exclude>/*.txt</exclude>
+                                <exclude>build.properties</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
index 144c90b7281..9e3ccb3348c 100644
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@@ -14,18 +14,5 @@
                 <exclude>org.elasticsearch:elasticsearch</exclude>
             </excludes>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            <includes>
-                <include>org.quartz-scheduler:quartz</include>
-                <include>org.quartz-scheduler:quartz-jobs</include>
-                <include>org.slf4j:slf4j-api</include>
-                <include>org.slf4j:slf4j-log4j12</include>
-                <include>javax.mail:mail</include>
-                <include>javax.activation:activation</include>
-            </includes>
-        </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/src/main/java/org/quartz/CronExpression.java b/src/test/java/org/quartz/CronExpression.java
similarity index 100%
rename from src/main/java/org/quartz/CronExpression.java
rename to src/test/java/org/quartz/CronExpression.java