diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 6af5e963f..e4218c55f 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -87,7 +87,6 @@ sub __cwd;
 sub __apps_file;
 sub __results_file;
 sub __test_log;
-sub __cwd;
 sub __fixup_cmd;
 sub __build_cmd;
 
@@ -607,7 +606,7 @@ sub __test_log {
 }
 
 sub __cwd {
-    my $dir = shift;
+    my $dir = catdir(shift);
     my %opts = @_;
     my $abscurdir = rel2abs(curdir());
     my $absdir = rel2abs($dir);