diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index f2d0c9bee2c86a5c52be02592a95852d57ff753b..8a7d0a0ac9c0f56f48f38a8defa034ca78ed0746 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -735,8 +735,8 @@ sub __exeext {
 sub __test_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
-    my $f = pop . __exeext();
-    $f = catfile($directories{BLDTEST},@_,$f);
+    my $f = pop;
+    $f = catfile($directories{BLDTEST},@_,$f . __exeext());
     $f = catfile($directories{SRCTEST},@_,$f) unless -x $f;
     return $f;
 }
@@ -753,8 +753,8 @@ sub __perltest_file {
 sub __apps_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
-    my $f = pop . __exeext();
-    $f = catfile($directories{BLDAPPS},@_,$f);
+    my $f = pop;
+    $f = catfile($directories{BLDAPPS},@_,$f . __exeext());
     $f = catfile($directories{SRCAPPS},@_,$f) unless -x $f;
     return $f;
 }