diff --git a/cve_bin_tool/checkers/openjpeg.py b/cve_bin_tool/checkers/openjpeg.py
index 52ea6403b9..f5f4554af9 100644
--- a/cve_bin_tool/checkers/openjpeg.py
+++ b/cve_bin_tool/checkers/openjpeg.py
@@ -26,6 +26,6 @@ class OpenjpegChecker(Checker):
     ]
     VERSION_PATTERNS = [
         r"openjpeg-([0-9]+\.[0-9]+\.[0-9]+)",
-        r"openjpeg2-([0-9]+\.[0-9]+\.[0-9]+)",
+        r"([0-9]+\.[0-9]+\.[0-9]+)[A-Za-z/ \.\r\n]*(?:opj_setup_decoder|openjp2)",
     ]
     VENDOR_PRODUCT = [("uclouvain", "openjpeg")]
diff --git a/test/condensed-downloads/libopenjp2-7_2.5.0-2_arm64.deb.tar.gz b/test/condensed-downloads/libopenjp2-7_2.5.0-2_arm64.deb.tar.gz
new file mode 100644
index 0000000000..4eb062ed7e
Binary files /dev/null and b/test/condensed-downloads/libopenjp2-7_2.5.0-2_arm64.deb.tar.gz differ
diff --git a/test/condensed-downloads/openjpeg-2.4.0-r1.apk.tar.gz b/test/condensed-downloads/openjpeg-2.4.0-r1.apk.tar.gz
new file mode 100644
index 0000000000..3cadaea95f
Binary files /dev/null and b/test/condensed-downloads/openjpeg-2.4.0-r1.apk.tar.gz differ
diff --git a/test/test_data/openjpeg.py b/test/test_data/openjpeg.py
index 7ae8caa42f..7128ec2f77 100644
--- a/test/test_data/openjpeg.py
+++ b/test/test_data/openjpeg.py
@@ -3,7 +3,11 @@
 
 mapping_test_data = [
     {"product": "openjpeg", "version": "1.5.1", "version_strings": ["openjpeg-1.5.1"]},
-    {"product": "openjpeg", "version": "2.1.0", "version_strings": ["openjpeg2-2.1.0"]},
+    {
+        "product": "openjpeg",
+        "version": "2.1.0",
+        "version_strings": ["2.1.0\nopj_setup_decoder"],
+    },
 ]
 package_test_data = [
     {
@@ -24,4 +28,16 @@
         "product": "openjpeg",
         "version": "2.1.0",
     },
+    {
+        "url": "http://ftp.debian.org/debian/pool/main/o/openjpeg2/",
+        "package_name": "libopenjp2-7_2.5.0-2_arm64.deb",
+        "product": "openjpeg",
+        "version": "2.5.0",
+    },
+    {
+        "url": "https://dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/",
+        "package_name": "openjpeg-2.4.0-r1.apk",
+        "product": "openjpeg",
+        "version": "2.4.0",
+    },
 ]