https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7462
https://bugs.gentoo.org/show_bug.cgi?id=627678
--- Mail-SpamAssassin-3.4.1/t/basic_meta.t	2015-04-28 15:56:59.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/basic_meta.t	2017-08-20 21:29:44.000000000 -0400
@@ -14,10 +14,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("meta");
 use Test;
 use Mail::SpamAssassin;
 
 use vars qw( %rules %scores $perl_path);
--- Mail-SpamAssassin-3.4.1/t/body_mod.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/body_mod.t	2017-08-20 21:30:09.000000000 -0400
@@ -14,10 +14,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("body_mod");
 use Test; BEGIN { plan tests => 3 };
 
 use Mail::SpamAssassin;
 
--- Mail-SpamAssassin-3.4.1/t/config_errs.t	2015-04-28 15:56:59.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/config_errs.t	2017-08-20 21:30:28.000000000 -0400
@@ -39,10 +39,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("config_errs");
 use Test;
 use Mail::SpamAssassin;
 
 # initialize SpamAssassin
--- Mail-SpamAssassin-3.4.1/t/debug.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/debug.t	2017-08-20 21:31:02.000000000 -0400
@@ -14,10 +14,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("debug");
 use Test;
 use Mail::SpamAssassin;
 
 use constant TEST_ENABLED => conf_bool('run_long_tests');
--- Mail-SpamAssassin-3.4.1/t/get_headers.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/get_headers.t	2017-08-20 21:31:48.000000000 -0400
@@ -15,10 +15,11 @@
   $prefix = '..';
 }
 
 use strict;
 use Test;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("get_headers");
 use Mail::SpamAssassin;
 
 plan tests => 16;
 
--- Mail-SpamAssassin-3.4.1/t/idn_dots.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/idn_dots.t	2017-08-20 21:32:03.000000000 -0400
@@ -16,10 +16,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("normalize_utf8_dots.t");
 use Test;
 use Mail::SpamAssassin;
 use vars qw(%patterns %anti_patterns);
 
--- Mail-SpamAssassin-3.4.1/t/missing_hb_separator.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/missing_hb_separator.t	2017-08-20 21:32:17.000000000 -0400
@@ -15,10 +15,11 @@
   $prefix = '..';
 }
 
 use strict;
 use Test;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("missing_hb_separator");
 use Mail::SpamAssassin;
 
 plan tests => 13;
 
--- Mail-SpamAssassin-3.4.1/t/priorities.t	2015-04-28 15:56:59.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/priorities.t	2017-08-20 21:34:21.000000000 -0400
@@ -15,10 +15,11 @@
 my $prefix = '.';
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
+use lib '.'; use lib 't';
 use SATest; sa_t_init("priorities");
 use strict;
 use Test; BEGIN { plan tests => NUM_TESTS };
 
 use Mail::SpamAssassin;
--- Mail-SpamAssassin-3.4.1/t/regexp_valid.t	2015-04-28 15:56:59.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/regexp_valid.t	2017-08-20 21:34:31.000000000 -0400
@@ -14,10 +14,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("regexp_valid");
 use Test;
 
 # settings
 plan tests => 24;
--- Mail-SpamAssassin-3.4.1/t/relative_scores.t	2015-04-28 15:56:59.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/relative_scores.t	2017-08-20 21:34:43.000000000 -0400
@@ -9,10 +9,11 @@
   if (-e 'test_dir') {            # running from test directory, not ..
     unshift(@INC, '../blib/lib', '.');
   }
 }
 
+use lib '.'; use lib 't';
 use SATest; sa_t_init("relative_scores");
 use Test;
 use strict;
 use vars qw/ $error /;
 
--- Mail-SpamAssassin-3.4.1/t/reuse.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/reuse.t	2017-08-20 21:34:52.000000000 -0400
@@ -14,10 +14,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("reuse");
 use Test;
 
 use vars qw(%patterns %anti_patterns $perl_path &patterns_run_cb);
 
--- Mail-SpamAssassin-3.4.1/t/uri_html.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/uri_html.t	2017-08-20 21:35:20.000000000 -0400
@@ -16,10 +16,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("uri_html");
 use Test;
 use Mail::SpamAssassin;
 use vars qw(%patterns %anti_patterns);
 
--- Mail-SpamAssassin-3.4.1/t/uri.t	2015-04-28 15:56:59.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/uri.t	2017-08-20 21:35:30.000000000 -0400
@@ -15,10 +15,11 @@
   $prefix = '..';
 }
 
 use strict;
 use Test;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("uri");
 
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::HTML;
 use Mail::SpamAssassin::Util;
--- Mail-SpamAssassin-3.4.1/t/uri_text.t	2015-04-28 15:56:58.000000000 -0400
+++ Mail-SpamAssassin-3.4.1/t/uri_text.t	2017-08-20 21:35:07.000000000 -0400
@@ -16,10 +16,11 @@
 if (-e 'test_dir') {            # running from test directory, not ..
   $prefix = '..';
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("uri_text");
 use Test;
 use Mail::SpamAssassin;
 use vars qw(%patterns %anti_patterns);