diff --git a/openssl/build.rs b/openssl/build.rs
index 81bae9d9bf5eead863ed1edd49298790e7dd23d6..fc6492292ccfbafa0798b0ea5f9f21464a8b7ed3 100644
--- a/openssl/build.rs
+++ b/openssl/build.rs
@@ -94,5 +94,13 @@ fn main() {
         if version >= 0x3_05_00_00_0 {
             println!("cargo:rustc-cfg=libressl350");
         }
+
+        if version >= 0x3_06_00_00_0 {
+            println!("cargo:rustc-cfg=libressl360");
+        }
+
+        if version >= 0x3_06_01_00_0 {
+            println!("cargo:rustc-cfg=libressl361");
+        }
     }
 }
diff --git a/openssl/src/pkcs7.rs b/openssl/src/pkcs7.rs
index e1b30f92896d6d9539a0adac25c096e36f06ce33..ae4571db85dedf6c0556839b40cb3857b8162779 100644
--- a/openssl/src/pkcs7.rs
+++ b/openssl/src/pkcs7.rs
@@ -361,7 +361,9 @@ mod tests {
         assert_eq!(content.expect("should be non-empty"), message.as_bytes());
     }
 
+    /// https://marc.info/?l=openbsd-cvs&m=166602943014106&w=2
     #[test]
+    #[cfg_attr(all(libressl360, not(libressl361)), ignore)]
     fn sign_verify_test_normal() {
         let cert = include_bytes!("../test/cert.pem");
         let cert = X509::from_pem(cert).unwrap();
@@ -397,7 +399,9 @@ mod tests {
         assert!(content.is_none());
     }
 
+    /// https://marc.info/?l=openbsd-cvs&m=166602943014106&w=2
     #[test]
+    #[cfg_attr(all(libressl360, not(libressl361)), ignore)]
     fn signers() {
         let cert = include_bytes!("../test/cert.pem");
         let cert = X509::from_pem(cert).unwrap();