diff --git a/integrationtest/src/test/java/build.xml b/integrationtest/build.xml
similarity index 93%
rename from integrationtest/src/test/java/build.xml
rename to integrationtest/build.xml
index 263a3810c2..f1b139a940 100644
--- a/integrationtest/src/test/java/build.xml
+++ b/integrationtest/build.xml
@@ -24,8 +24,8 @@ under the License.
 Before running this, you should execute the "assemble" target in the main build.xml to have the packaged files created correctly.
     </description>
 
-    <property name="dist" value="../../build/dist"/>
-    <property name="build" value="../../build/distsourcebuild"/>
+    <property name="dist" value="../build/dist"/>
+    <property name="build" value="../build/distsourcebuild"/>
 
     <target name="init" depends="">
     </target>
@@ -64,7 +64,7 @@ Before running this, you should execute the "assemble" target in the main build.
         <!-- copy over required libs to avoid re-downloading them always -->
         <mkdir dir="${dirversion}/lib"/>
         <copy todir="${dirversion}/lib">
-            <fileset dir="../../lib"/>
+            <fileset dir="../lib"/>
         </copy>
 
         <!-- finally call Ant on the extracted source to check if we can build the packages -->
@@ -107,15 +107,15 @@ Before running this, you should execute the "assemble" target in the main build.
 
         <echo message="Found jar packages at ${jarpackage}, dist: ${dist}"/>
         <path id="libs">
-            <fileset dir="../../lib/main" includes="*.jar"/>
-            <fileset dir="../../lib/ooxml" includes="*.jar"/>
-            <fileset dir="../../lib/main-tests">
+            <fileset dir="../lib/main" includes="*.jar"/>
+            <fileset dir="../lib/ooxml" includes="*.jar"/>
+            <fileset dir="../lib/main-tests">
                 <include name="junit*.jar"/>
             </fileset>
         </path>
 
         <echo message="Compiling examples without linking to scratchpad.jar to ensure that only some specific ones require this jar"/>
-        <javac srcdir="../examples/src" destdir="${build}"
+        <javac srcdir="../examples/src/main/java" destdir="${build}"
                target="1.8" source="1.8" debug="true"
                encoding="ASCII" fork="yes" includeantruntime="false"
                excludes="org/apache/poi/examples/hslf/**,org/apache/poi/examples/hsmf/**,org/apache/poi/examples/hwmf/**,**/EmbeddedObjects.java,**/EmeddedObjects.java,**/LoadEmbedded.java,**/Word2Forrest.java"
@@ -139,7 +139,7 @@ Before running this, you should execute the "assemble" target in the main build.
         </pathconvert>
 
         <echo message="Compiling all examples with the additional scratchpad.jar"/>
-        <javac srcdir="../examples/src" destdir="${build}"
+        <javac srcdir="../examples/src/main/java" destdir="${build}"
                target="1.8" source="1.8" debug="true"
                encoding="ASCII" fork="yes" includeantruntime="false"
                classpath="${jarpackagescratchpad}" classpathref="libs">
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 9161e2bcf7..4a66735450 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -455,7 +455,7 @@ poijobs.each { poijob ->
                     }
                     ant {
                         targets(['run'] + (poijob.properties ?: []))
-                        buildFile('src/integrationtest/build.xml')
+                        buildFile('integrationtest/build.xml')
                         // Properties did not work, so I had to use targets instead
                         //properties(poijob.properties ?: '')
                         antInstallation(antRT)
@@ -472,19 +472,19 @@ poijobs.each { poijob ->
                     }
                 }
                 // in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results
-                archiveArtifacts('build/dist/*.tar.gz,build/findbugs.html,build/coverage/**,build/integration-test-results/**,lib/ooxml/**,build/*/build/libs/*.jar')
+                archiveArtifacts('build/dist/*.tar.gz,build/findbugs.html,build/coverage/**,integrationtest/build/test-results/**,*/build/libs/*.jar')
                 warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) {
                     resolveRelativePaths()
                 }
-                archiveJunit('build/ooxml-test-results/*.xml,build/scratchpad-test-results/*.xml,build/test-results/*.xml,build/excelant-test-results/*.xml,build/integration-test-results/*.xml,build/*/build/test-results/test/TEST-*.xml,build/*/build/test-results/TEST-*.xml') {
+                archiveJunit('*/build/test-results/*.xml') {
                     testDataPublishers {
                         publishTestStabilityData()
                     }
                 }
                 jacocoCodeCoverage {
-                    classPattern('build/classes,build/excelant-classes,build/ooxml-classes,build/scratchpad-classes,build/*/build/classes')
-                    execPattern('build/*.exec,build/*/build/jacoco/*.exec')
-                    sourcePattern('src/java,src/excelant/java,src/ooxml/java,src/scratchpad/src')
+                    classPattern('*/build/classes')
+                    execPattern('*/build/*.exec,*/build/jacoco/*.exec')
+                    sourcePattern('*/src/main/java')
                     exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class')
                 }