diff --git a/tests/getpart.pm b/tests/getpart.pm
index ccfbd7d62..9ade56a19 100644
--- a/tests/getpart.pm
+++ b/tests/getpart.pm
@@ -64,7 +64,7 @@ sub getpart {
             $inside++;
         }
         elsif((1 ==$inside) && ($_ =~ /^ *\<$part[ \>]/)) {
-            if($_ =~ /$part .*base64=/) {
+            if($_ =~ /$part [^>]*base64=/) {
                 # attempt to detect base64 encoded parts
                 $base64=1;
             }
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 8d207d1cd..48f63369c 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -133,6 +133,9 @@ if ($^O eq 'MSWin32' || $targetos) {
     $binext = '.exe';
     $libext = '.lib';
   }
+  elsif ($targetos =~ /mingw32/) {
+    $binext = '.exe';
+  }
   elsif ($targetos =~ /netware/) {
     $configurebuild = 0;
     $binext = '.nlm';