diff --git a/gradle/tomcat.gradle b/gradle/tomcat.gradle
index 4f71ad3a2b..3814c2a641 100644
--- a/gradle/tomcat.gradle
+++ b/gradle/tomcat.gradle
@@ -21,14 +21,16 @@ dependencies {
 task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
     onlyIf { !sourceSets.integrationTest.allSource.empty }
     buildscriptClasspath = tomcatRun.buildscriptClasspath
-    classesDirectory = project.sourceSets.main.output.classesDir
     contextPath = tomcatRun.contextPath
     daemon = true
     tomcatClasspath = tomcatRun.tomcatClasspath
     webAppClasspath = tomcatRun.webAppClasspath
     webAppSourceDirectory = tomcatRun.webAppSourceDirectory
     doFirst {
-
+        def mainOutputDir = project.sourceSets.main.output.classesDir
+        if(mainOutputDir) {
+            classesDirectory = mainOutputDir
+        }
         // delay reserving ports to ensure they are still available
         def ports = reservePorts(3)
         httpPort = ports[0]