diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 0468b4c78..7bc2f2f62 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -16,13 +16,11 @@ def poijobs = [
             // as part of the Ant build
             addShell: 'wget -O lib/findbugs-noUpdateChecks-2.0.3.zip http://downloads.sourceforge.net/project/findbugs/findbugs/2.0.3/findbugs-noUpdateChecks-2.0.3.zip?download='
     ],
-    [ name: 'POI-DSL-1.8', jdk: '1.8', trigger: 'H */12 * * *',
-        // ubuntu-4 repeatedely failed during Findbugs results collection
-        slaveAdd: '&&!ubuntu-4'
+    [ name: 'POI-DSL-1.8', jdk: '1.8', trigger: 'H */12 * * *'
     ],
     [ name: 'POI-DSL-OpenJDK', jdk: 'OpenJDK', trigger: 'H */12 * * *',
         // H13-H20 (Ubuntu 16.04) do not have OpenJDK 6 installed, see https://issues.apache.org/jira/browse/INFRA-12880
-        slaveAdd: '&&!H12&&!H13&&!H14&&!H15&&!H16&&!H17&&!H18&&!H19&&!H20&&!H24&&!ubuntu-eu2',
+        slaveAdd: '&&!H12&&!H13&&!H14&&!H15&&!H16&&!H17&&!H18&&!H19&&!H20&&!ubuntu-eu2',
         // the JDK is missing on some slaves so builds are unstable
         skipcigame: true
     ],
@@ -72,7 +70,7 @@ def defaultJdk = '1.6'
 def defaultTrigger = 'H/15 * * * *'     // check SCM every 60/15 = 4 minutes
 def defaultEmail = 'dev@poi.apache.org'
 def defaultAnt = 'Ant (latest)'
-def defaultSlaves = 'ubuntu&&!cloud-slave'
+def defaultSlaves = 'ubuntu&&!cloud-slave&&!H24&&!ubuntu-4'
 
 def jdkMapping = [
     '1.6': 'JDK 1.6 (latest)',