diff --git a/site-modules/profile/manifests/jenkins/agent.pp b/site-modules/profile/manifests/jenkins/agent.pp
index bdfe84e6..ae5df87d 100644
--- a/site-modules/profile/manifests/jenkins/agent.pp
+++ b/site-modules/profile/manifests/jenkins/agent.pp
@@ -1,46 +1,45 @@
 class profile::jenkins::agent {
   include profile::jenkins::base
-  include ::java
 
   $jenkins_agent_jar_url = lookup('jenkins::agent::jar_url')
   $jenkins_url = lookup('jenkins::backend::url')
   $jenkins_agent_name = lookup('jenkins::agent::name')
   $jenkins_jnlp_token = lookup('jenkins::agent::jnlp::token')
 
   $workdir = '/var/lib/jenkins/agent-workdir'
   file {$workdir:
     mode  => '0700',
     owner => 'jenkins',
     group => 'jenkins',
   }
 
   $jenkins_agent_jar = '/usr/share/jenkins/agent.jar'
   file {$jenkins_agent_jar:
     source => $jenkins_agent_jar_url,
     mode   => '0644',
     owner  => 'root',
     group  => 'root',
   }
 
   $environment_file = '/etc/default/jenkins-agent'
   file {$environment_file:
     # Contains credentials
     mode    => '0600',
     owner   => 'root',
     group   => 'root',
     content => template('profile/jenkins/agent/jenkins-agent.defaults.erb'),
     notify  => Service['jenkins-agent'],
   }
 
   ::systemd::unit_file {'jenkins-agent.service':
     ensure  => present,
     content => template('profile/jenkins/agent/jenkins-agent.service.erb'),
   } -> service {'jenkins-agent':
     ensure  => running,
     enable  => true,
     require => [
       File[$environment_file],
       File[$workdir],
     ],
   }
 }
diff --git a/site-modules/profile/manifests/jenkins/base.pp b/site-modules/profile/manifests/jenkins/base.pp
index 39f3c42e..c0a7912f 100644
--- a/site-modules/profile/manifests/jenkins/base.pp
+++ b/site-modules/profile/manifests/jenkins/base.pp
@@ -1,31 +1,33 @@
 class profile::jenkins::base {
+  include ::java
+
   group {'jenkins':
     ensure => present,
     system => true,
   }
   -> user {'jenkins':
     ensure => present,
     system => true,
     gid    => 'jenkins',
     home   => '/var/lib/jenkins',
   }
   -> file {'/var/lib/jenkins':
     ensure => 'directory',
     mode   => '0755',
     owner  => 'jenkins',
     group  => 'jenkins',
   }
   -> file {'/var/lib/jenkins/.gitconfig':
     ensure => present,
     mode   => '0644',
     owner  => 'jenkins',
     group  => 'jenkins',
     content => template('profile/jenkins/gitconfig.erb')
   }
   file {'/usr/share/jenkins':
     ensure => 'directory',
     mode   => '0755',
     owner  => 'root',
     group  => 'root',
   }
 }