diff --git a/testing/btest/Baseline/scripts.base.misc.version/.stderr b/testing/btest/Baseline/scripts.base.misc.version/.stderr
index 11cfa0470e..2e06936995 100644
--- a/testing/btest/Baseline/scripts.base.misc.version/.stderr
+++ b/testing/btest/Baseline/scripts.base.misc.version/.stderr
@@ -1,4 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 error in <...>/version.zeek, line 61: Version string 1 cannot be parsed
-error in <...>/version.zeek, line 61: Version string 1.12-beta-drunk cannot be parsed
+error in <...>/version.zeek, line 61: Version string 1.12-beta-drunk-too-much cannot be parsed
 error in <...>/version.zeek, line 61: Version string JustARandomString cannot be parsed
diff --git a/testing/btest/Baseline/scripts.base.misc.version/.stdout b/testing/btest/Baseline/scripts.base.misc.version/.stdout
index 8b5394fb40..f8ff572fe9 100644
--- a/testing/btest/Baseline/scripts.base.misc.version/.stdout
+++ b/testing/btest/Baseline/scripts.base.misc.version/.stdout
@@ -2,25 +2,41 @@
 [version_number=10500, major=1, minor=5, patch=0, commit=0, beta=F, debug=F, version_string=1.5]
 [version_number=20000, major=2, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=2.0]
 [version_number=20600, major=2, minor=6, patch=0, commit=0, beta=F, debug=F, version_string=2.6]
+[version_number=20600, major=2, minor=6, patch=0, commit=0, beta=F, debug=F, version_string=2.6-custom1]
 [version_number=20500, major=2, minor=5, patch=0, commit=0, beta=T, debug=F, version_string=2.5-beta]
+[version_number=20500, major=2, minor=5, patch=0, commit=0, beta=T, debug=F, version_string=2.5-beta-custom2]
 [version_number=20501, major=2, minor=5, patch=1, commit=0, beta=F, debug=T, version_string=2.5.1-debug]
-[version_number=20500, major=2, minor=5, patch=0, commit=12, beta=T, debug=F, version_string=2.5-beta-12]
-[version_number=20500, major=2, minor=5, patch=0, commit=12, beta=F, debug=T, version_string=2.5-12-debug]
-[version_number=20502, major=2, minor=5, patch=2, commit=12, beta=T, debug=T, version_string=2.5.2-beta-12-debug]
-[version_number=20502, major=2, minor=5, patch=2, commit=12, beta=T, debug=T, version_string=2.5.2-beta5-12-debug]
-[version_number=11220, major=1, minor=12, patch=20, commit=2562, beta=T, debug=T, version_string=1.12.20-beta-2562-debug]
-[version_number=20600, major=2, minor=6, patch=0, commit=936, beta=F, debug=F, version_string=2.6-936]
+[version_number=20501, major=2, minor=5, patch=1, commit=0, beta=F, debug=T, version_string=2.5.1-custom3-debug]
+[version_number=20500, major=2, minor=5, patch=0, commit=0, beta=T, debug=F, version_string=2.5-beta-12]
+[version_number=20500, major=2, minor=5, patch=0, commit=12, beta=T, debug=F, version_string=2.5-beta-12-custom4]
+[version_number=20500, major=2, minor=5, patch=0, commit=0, beta=F, debug=T, version_string=2.5-12-debug]
+[version_number=20500, major=2, minor=5, patch=0, commit=12, beta=F, debug=T, version_string=2.5-12-custom5-debug]
+[version_number=20502, major=2, minor=5, patch=2, commit=0, beta=T, debug=T, version_string=2.5.2-beta-12-debug]
+[version_number=20502, major=2, minor=5, patch=2, commit=12, beta=T, debug=T, version_string=2.5.2-beta-12-custom6-debug]
+[version_number=20502, major=2, minor=5, patch=2, commit=0, beta=T, debug=T, version_string=2.5.2-beta5-12-debug]
+[version_number=20502, major=2, minor=5, patch=2, commit=12, beta=T, debug=T, version_string=2.5.2-beta5-12-custom7-debug]
+[version_number=11220, major=1, minor=12, patch=20, commit=0, beta=T, debug=T, version_string=1.12.20-beta-2562-debug]
+[version_number=11220, major=1, minor=12, patch=20, commit=2562, beta=T, debug=T, version_string=1.12.20-beta-2562-custom8-debug]
+[version_number=20600, major=2, minor=6, patch=0, commit=0, beta=F, debug=F, version_string=2.6-936]
 [version_number=120500, major=12, minor=5, patch=0, commit=0, beta=F, debug=F, version_string=12.5]
 [version_number=30000, major=3, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=3.0.0]
 [version_number=30001, major=3, minor=0, patch=1, commit=0, beta=F, debug=F, version_string=3.0.1]
 [version_number=30100, major=3, minor=1, patch=0, commit=0, beta=F, debug=F, version_string=3.1.0]
+[version_number=30100, major=3, minor=1, patch=0, commit=0, beta=F, debug=F, version_string=3.1.0-custom9]
 [version_number=30000, major=3, minor=0, patch=0, commit=0, beta=T, debug=F, version_string=3.0.0-rc]
+[version_number=30000, major=3, minor=0, patch=0, commit=0, beta=T, debug=F, version_string=3.0.0-rc-custom10]
 [version_number=30000, major=3, minor=0, patch=0, commit=37, beta=T, debug=F, version_string=3.0.0-rc.37]
+[version_number=30000, major=3, minor=0, patch=0, commit=37, beta=T, debug=F, version_string=3.0.0-rc.37-custom11]
 [version_number=30000, major=3, minor=0, patch=0, commit=13, beta=T, debug=F, version_string=3.0.0-rc2.13]
+[version_number=30000, major=3, minor=0, patch=0, commit=13, beta=T, debug=F, version_string=3.0.0-rc2.13-custom12]
 [version_number=30000, major=3, minor=0, patch=0, commit=37, beta=T, debug=T, version_string=3.0.0-rc.37-debug]
+[version_number=30000, major=3, minor=0, patch=0, commit=37, beta=T, debug=T, version_string=3.0.0-rc.37-custom13-debug]
 [version_number=30000, major=3, minor=0, patch=0, commit=13, beta=T, debug=T, version_string=3.0.0-rc2.13-debug]
+[version_number=30000, major=3, minor=0, patch=0, commit=13, beta=T, debug=T, version_string=3.0.0-rc2.13-custom14-debug]
 [version_number=30100, major=3, minor=1, patch=0, commit=42, beta=F, debug=F, version_string=3.1.0-dev.42]
+[version_number=30100, major=3, minor=1, patch=0, commit=42, beta=F, debug=F, version_string=3.1.0-dev.42-custom15]
 [version_number=30100, major=3, minor=1, patch=0, commit=42, beta=F, debug=T, version_string=3.1.0-dev.42-debug]
+[version_number=30100, major=3, minor=1, patch=0, commit=42, beta=F, debug=T, version_string=3.1.0-dev.42-custom16-debug]
 [version_number=0, major=0, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=1]
-[version_number=0, major=0, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=1.12-beta-drunk]
+[version_number=0, major=0, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=1.12-beta-drunk-too-much]
 [version_number=0, major=0, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=JustARandomString]
diff --git a/testing/btest/scripts/base/misc/version.zeek b/testing/btest/scripts/base/misc/version.zeek
index 00312f3961..a97d4374d6 100644
--- a/testing/btest/scripts/base/misc/version.zeek
+++ b/testing/btest/scripts/base/misc/version.zeek
@@ -6,29 +6,45 @@
 print Version::parse("1.5");
 print Version::parse("2.0");
 print Version::parse("2.6");
+print Version::parse("2.6-custom1");
 print Version::parse("2.5-beta");
+print Version::parse("2.5-beta-custom2");
 print Version::parse("2.5.1-debug");
+print Version::parse("2.5.1-custom3-debug");
 print Version::parse("2.5-beta-12");
+print Version::parse("2.5-beta-12-custom4");
 print Version::parse("2.5-12-debug");
+print Version::parse("2.5-12-custom5-debug");
 print Version::parse("2.5.2-beta-12-debug");
+print Version::parse("2.5.2-beta-12-custom6-debug");
 print Version::parse("2.5.2-beta5-12-debug");
+print Version::parse("2.5.2-beta5-12-custom7-debug");
 print Version::parse("1.12.20-beta-2562-debug");
+print Version::parse("1.12.20-beta-2562-custom8-debug");
 print Version::parse("2.6-936");
 print Version::parse("12.5");
 print Version::parse("3.0.0");
 print Version::parse("3.0.1");
 print Version::parse("3.1.0");
+print Version::parse("3.1.0-custom9");
 print Version::parse("3.0.0-rc");
+print Version::parse("3.0.0-rc-custom10");
 print Version::parse("3.0.0-rc.37");
+print Version::parse("3.0.0-rc.37-custom11");
 print Version::parse("3.0.0-rc2.13");
+print Version::parse("3.0.0-rc2.13-custom12");
 print Version::parse("3.0.0-rc.37-debug");
+print Version::parse("3.0.0-rc.37-custom13-debug");
 print Version::parse("3.0.0-rc2.13-debug");
+print Version::parse("3.0.0-rc2.13-custom14-debug");
 print Version::parse("3.1.0-dev.42");
+print Version::parse("3.1.0-dev.42-custom15");
 print Version::parse("3.1.0-dev.42-debug");
+print Version::parse("3.1.0-dev.42-custom16-debug");
 
 # bad versions
 print Version::parse("1");
-print Version::parse("1.12-beta-drunk");
+print Version::parse("1.12-beta-drunk-too-much");
 print Version::parse("JustARandomString");
 
 # check that current running version of Zeek parses without error