diff --git a/configdata.pm.in b/configdata.pm.in
index 68439ae93c2bd3..81a21494bc0d08 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -82,7 +82,7 @@ unless (caller) {
     use Pod::Usage;
 
     use lib '{- sourcedir('util', 'perl') -}';
-    use OpenSSL::fallback '{- sourcefile('external', 'perl', 'MODULES.txt') -}';
+    use OpenSSL::fallback;
 
     my $here = dirname($0);
 
diff --git a/test/run_tests.pl b/test/run_tests.pl
index 90fba194b11bec..ae1c06c2ad1de6 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -272,9 +272,11 @@ sub find_matching_tests {
             return bless { %args }, $class;
         }
 
-        sub runtests {
+        sub runtests {          
             my $self = shift;
 
+            print $self
+
             # Pre TAP::Harness Test::Harness doesn't support [ filename, name ]
             # elements, so convert such elements to just be the filename
             my @args = map { ref($_) eq 'ARRAY' ? $_->[0] : $_ } @_;
diff --git a/util/wrap.pl.in b/util/wrap.pl.in
index 7d11cb7c271e37..2ba49c53efd00b 100644
--- a/util/wrap.pl.in
+++ b/util/wrap.pl.in
@@ -9,12 +9,7 @@ use File::Spec::Functions;
 BEGIN {
     # This method corresponds exactly to 'use OpenSSL::Util',
     # but allows us to use a platform specific file spec.
-    require {-
-         use Cwd qw(abs_path);
-
-         "'" . abs_path(catfile($config{sourcedir},
-                                'util', 'perl', 'OpenSSL', 'Util.pm')) . "'";
-         -};
+    require "$ENV{SRCTOP}/util/perl/OpenSSL/Util.pm";
     OpenSSL::Util->import();
 }