diff --git a/src/test/regress/resultmap b/src/test/regress/resultmap
index c9a3d66abba61990bf6ea278c08c16225665ef3f..ab4675cef46a33a0898323b12cc543a0d3f4cdcb 100644
--- a/src/test/regress/resultmap
+++ b/src/test/regress/resultmap
@@ -1,11 +1,10 @@
 int2/hppa=int2-too-large
 int4/hppa=int4-too-large
-int2/.*-.*-netbsd.*=int2-too-large
-int4/.*-.*-netbsd.*=int4-too-large
+int2/netbsd=int2-too-large
+int4/netbsd=int4-too-large
 int2/i.86-pc-linux-gnulibc=int2-not-representable
 int4/i.86-pc-linux-gnulibc=int4-not-representable
-geometry/hppa1\.1=geometry-positive-zeros
-geometry/hppa2\.0=geometry-positive-zeros
-geometry/.*-.*-netbsd.*=geometry-positive-zeros
+geometry/hppa=geometry-positive-zeros
+geometry/netbsd=geometry-positive-zeros
 geometry/i.86-.*-gnulibc=geometry-i86-gnulibc
 horology/hppa=horology-no-DST-before-1970