diff --git a/manifests/params.pp b/manifests/params.pp
index 308dc35..f531a1a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -24,10 +24,14 @@ class java::params {
             $jdk_package = 'java-1.6.0-openjdk-devel'
             $jre_package = 'java-1.6.0-openjdk'
           }
-          else {
+          elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
             $jdk_package = 'java-1.7.0-openjdk-devel'
             $jre_package = 'java-1.7.0-openjdk'
           }
+          else {
+            $jdk_package = 'java-1.8.0-openjdk-devel'
+            $jre_package = 'java-1.8.0-openjdk'
+          }
         }
         'Fedora': {
           if (versioncmp($::operatingsystemrelease, '21') < 0) {
diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb
index d58d442..4680724 100644
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -12,6 +12,11 @@ describe 'java', :type => :class do
     it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
   end
 
+  context 'select openjdk for Centos 7.1.1503' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503'} }
+    it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+  end
+
   context 'select openjdk for Centos 6.2' do
     let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} }
     it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }