diff --git a/test/adding_jdks.bats b/test/adding_jdks.bats
index 7017414..ec7175d 100755
--- a/test/adding_jdks.bats
+++ b/test/adding_jdks.bats
@@ -9,42 +9,51 @@ teardown() {
   rm -f ~/.jenv/versions/*
 }
 
-@test "add openjdk 1.7.0.261" {
-  jenv add /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.261-2.6.22.2.el7_8.$_ARCH/jre/
+get-build-number() {
+  local _prefix=$1
+  local _name_prefix=$(basename $_prefix)
+  basename $_prefix* | sed -E "s|$_name_prefix([0-9]+)[-.].*|\1|g"
+}
+
+@test "add openjdk 1.7.0" {
+  _BUILD_NO=$(get-build-number /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.)
+  jenv add /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.*/jre/
 
   run jenv versions
   assert_line --regexp '^ *1.7$'
-  assert_line --regexp '^ *1.7.0.261$'
-  assert_line --regexp '^ *openjdk64-1.7.0.261$'
+  assert_line --regexp "^ *1.7.0.${_BUILD_NO}$"
+  assert_line --regexp "^ *openjdk64-1.7.0.${_BUILD_NO}$"
 }
 
-@test "add openjdk 1.8.0.372" {
-  jenv add /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.372.b07-1.el7_9.$_ARCH/jre/
+@test "add openjdk 1.8.0" {
+  _BUILD_NO=$(get-build-number /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.)
+  jenv add /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.*/jre/
 
   run jenv versions
   assert_line --regexp '^ *1.8$'
-  assert_line --regexp '^ *1.8.0.372$'
-  assert_line --regexp '^ *openjdk64-1.8.0.372$'
+  assert_line --regexp "^ *1.8.0.${_BUILD_NO}$"
+  assert_line --regexp "^ *openjdk64-1.8.0.${_BUILD_NO}$"
 }
 
-@test "add openjdk 11.0.19" {
-  jenv add /usr/lib/jvm/java-11-openjdk-11.0.19.0.7-1.el7_9.$_ARCH/
+@test "add openjdk 11" {
+  _PATCH_NO=$(get-build-number /usr/lib/jvm/java-11-openjdk-11.0.)
+  jenv add /usr/lib/jvm/java-11-openjdk-11.0.*/
 
   run jenv versions
   assert_line --regexp '^ *11$'
   assert_line --regexp '^ *11.0$'
-  assert_line --regexp '^ *11.0.19$'
-  assert_line --regexp '^ *openjdk64-11.0.19$'
+  assert_line --regexp "^ *11.0.${_PATCH_NO}$"
+  assert_line --regexp "^ *openjdk64-11.0.${_PATCH_NO}$"
 }
 
-@test "add zulu 11.0.20" {
+@test "add zulu 11" {
   jenv add /usr/lib/jvm/zulu11/
 
   run jenv versions
   assert_line --regexp '^ *11$'
   assert_line --regexp '^ *11.0$'
-  assert_line --regexp '^ *11.0.20$'
-  assert_line --regexp '^ *zulu64-11.0.20$'
+  assert_line --regexp '^ *11.0.[0-9]+$'
+  assert_line --regexp '^ *zulu64-11.0.[0-9]+$'
 }
 
 @test "add zulu 18.0.2.1" {