diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 454dcd27907e169b904d25d54842f0934d284fb9..7b5705534d7b56d387bcc6c84ed261537d416675 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -396,8 +396,15 @@ for (;;)
 	if ($key eq "EX_LIBS")
 		{ $ex_libs .= " $val" if $val ne "";}
 
-	if ($key =~ /^[A-Z0-9_]*TEST$/ && (!$fipscanisteronly || $dir =~ /^fips/ ))
-		{ $test.=&var_add($dir,$val, 0); }
+	# There was a condition here before:
+	#       !$fipscanisteronly || $dir =~ /^fips/
+	# It currently fills no function and needs to be rewritten anyway, so
+	# removed for now.
+	if ($dir eq "test" && $key eq "EXE")
+		{
+		foreach my $t (split /\s+/, $val) {
+			$test.=&var_add($dir,$t, 0) if $t; }
+		}
 
 	if ($key eq "EXE_OBJ")
 		{ $e_exe.=&var_add($dir,$val, 0); }