diff --git a/CHANGES b/CHANGES
index 4a8ff320e0..94d65b475c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6.0.0-dev.208 | 2023-03-15 14:10:07 +0100
+
+  * Fix the x509-invalid-extension test on OpenSSL 3.1 (Johanna Amann, Corelight)
+
 6.0.0-dev.206 | 2023-03-15 10:02:52 +0100
 
   * SSL/TLS: Parse CertificateRequest message (Johanna Amann, Corelight)
diff --git a/VERSION b/VERSION
index a3e1d675e9..05f8906db2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.206
+6.0.0-dev.208
diff --git a/testing/btest/scripts/base/protocols/ssl/x509-invalid-extension.test b/testing/btest/scripts/base/protocols/ssl/x509-invalid-extension.test
index 6abf95efbc..73e521ca77 100644
--- a/testing/btest/scripts/base/protocols/ssl/x509-invalid-extension.test
+++ b/testing/btest/scripts/base/protocols/ssl/x509-invalid-extension.test
@@ -8,6 +8,9 @@ event x509_extension(f: fa_file, ext: X509::Extension)
 	if ( ext$oid != "1.3.6.1.5.5.7.1.12" )
 		return;
 
-	print ext$short_name;
+	if ( ext?$short_name )
+		print ext$short_name;
+	else
+		print "UNDEF";
 	print ext$value;
 	}