diff --git a/src/tools/msvc/getregress.pl b/src/tools/msvc/getregress.pl
index 496dd26011..e7f1d24193 100644
--- a/src/tools/msvc/getregress.pl
+++ b/src/tools/msvc/getregress.pl
@@ -1,7 +1,7 @@
 #
 # Script that collects a list of regression tests from a Makefile
 #
-# $PostgreSQL: pgsql/src/tools/msvc/getregress.pl,v 1.1 2007/03/22 13:43:02 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/getregress.pl,v 1.2 2007/03/23 10:05:34 mha Exp $
 #
 use strict;
 use warnings;
@@ -18,5 +18,29 @@ if ($m =~ /^REGRESS\s*=\s*(.*)$/gm)
 {
     my $t = $1;
     $t =~ s/\s+/ /g;
+
+    if ($m =~ /contrib\/pgcrypto/)
+    {
+
+        # pgcrypto is special since the tests depend on the configuration of the build
+        our $config;
+        require '../../src/tools/msvc/config.pl';
+
+        my $cftests = $config->{openssl}?GetTests("OSSL_TESTS",$m):GetTests("INT_TESTS",$m);
+        my $pgptests = $config->{zlib}?GetTests("ZLIB_TST",$m):GetTests("ZLIB_OFF_TST",$m);
+        $t =~ s/\$\(CF_TESTS\)/$cftests/;
+        $t =~ s/\$\(CF_PGP_TESTS\)/$pgptests/;
+    }
     print "SET TESTS=$t";
 }
+
+sub GetTests
+{
+    my $testname = shift;
+    my $m = shift;
+    if ($m =~ /^$testname\s*=\s*(.*)$/gm)
+    {
+        return $1;
+    }
+    return "";
+}