diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 692268d..9ce6b3f 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -9,7 +9,7 @@
 #
 #    https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html
 
-java_version: "1.8.0"
+java_major_version: "8"
 postgres_version: "9.6"
 git_version: "2.14.4"
 atl_shared_mountpoint: "/media/atl"
diff --git a/roles/product_common/defaults/main.yml b/roles/product_common/defaults/main.yml
index ce62ba4..4e9f728 100644
--- a/roles/product_common/defaults/main.yml
+++ b/roles/product_common/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-java_version: "1.8.0"
 java_major_version: "8"
 postgres_version: "9.6"
 
diff --git a/roles/product_common/molecule/system_jdk/tests/test_default.py b/roles/product_common/molecule/system_jdk/tests/test_default.py
index 77d3c52..e615c9f 100644
--- a/roles/product_common/molecule/system_jdk/tests/test_default.py
+++ b/roles/product_common/molecule/system_jdk/tests/test_default.py
@@ -14,7 +14,9 @@ def test_user_created(host):
 
 @pytest.mark.parametrize('exe', [
     '/usr/bin/git',
-    '/usr/bin/javac'
+    '/usr/bin/javac',
+    '/usr/lib/jvm/java/bin/java',
+    '/usr/lib/jvm/java/jre/bin/java'
 ])
 def test_package_exes(host, exe):
     assert host.file(exe).exists
diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index c02f864..4d33f79 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -3,7 +3,7 @@
 - name: Install JDK if necessary on Amazon Linux
   yum:
     name:
-      - java-{{ java_version }}-openjdk-devel
+      - java-1.{{ java_major_version }}.0-openjdk-devel
   when: atl_use_system_jdk
 
 - name: Install other base packages on Amazon Linux