- Updated CI docker images and test suite to work with new perl deps location

62 files changed, 62 insertions, 62 deletions

diff --git a/xt/config/generate_test_data.pl b/xt/config/generate_test_data.pl
index 76669578d..71344d51a 100755
--- a/xt/config/generate_test_data.pl
+++ b/xt/config/generate_test_data.pl
@@ -31,7 +31,7 @@ BEGIN {
     *Bugzilla::User::APIKey::_check_api_key = sub { return $_[1]; };
 }
 
-use lib $conf_path;
+use lib $conf_path, "$conf_path/local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Attachment;
diff --git a/xt/rest/bugzilla.t b/xt/rest/bugzilla.t
index b7fd39664..9878c1ce8 100644
--- a/xt/rest/bugzilla.t
+++ b/xt/rest/bugzilla.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 11;
 use QA::REST;
diff --git a/xt/rest/classification.t b/xt/rest/classification.t
index bcf0d7edb..ed10abbc3 100644
--- a/xt/rest/classification.t
+++ b/xt/rest/classification.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 7;
 use QA::REST;
diff --git a/xt/selenium/bug_edit.t b/xt/selenium/bug_edit.t
index 5f1983ba9..10bab3fe0 100644
--- a/xt/selenium/bug_edit.t
+++ b/xt/selenium/bug_edit.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/choose_priority.t b/xt/selenium/choose_priority.t
index ef5bc6db7..f606415e2 100644
--- a/xt/selenium/choose_priority.t
+++ b/xt/selenium/choose_priority.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/classifications.t b/xt/selenium/classifications.t
index 1653d2e10..fa6f68b54 100644
--- a/xt/selenium/classifications.t
+++ b/xt/selenium/classifications.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/config.t b/xt/selenium/config.t
index b2ff6e408..6348b87f2 100644
--- a/xt/selenium/config.t
+++ b/xt/selenium/config.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/create_user_accounts.t b/xt/selenium/create_user_accounts.t
index 2e7e8782f..8bb888fe8 100644
--- a/xt/selenium/create_user_accounts.t
+++ b/xt/selenium/create_user_accounts.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/custom_fields.t b/xt/selenium/custom_fields.t
index e64eb6165..503612d02 100644
--- a/xt/selenium/custom_fields.t
+++ b/xt/selenium/custom_fields.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/custom_fields_admin.t b/xt/selenium/custom_fields_admin.t
index addbd17c8..a330800bf 100644
--- a/xt/selenium/custom_fields_admin.t
+++ b/xt/selenium/custom_fields_admin.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/dependencies.t b/xt/selenium/dependencies.t
index 315fff07a..29e41eb74 100644
--- a/xt/selenium/dependencies.t
+++ b/xt/selenium/dependencies.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/edit_products_properties.t b/xt/selenium/edit_products_properties.t
index efc5a6a25..a0f2f92fb 100644
--- a/xt/selenium/edit_products_properties.t
+++ b/xt/selenium/edit_products_properties.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/email_preferences.t b/xt/selenium/email_preferences.t
index 961f26096..d1e860a3c 100644
--- a/xt/selenium/email_preferences.t
+++ b/xt/selenium/email_preferences.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/enter_new_bug.t b/xt/selenium/enter_new_bug.t
index 86a55e56d..743b931aa 100644
--- a/xt/selenium/enter_new_bug.t
+++ b/xt/selenium/enter_new_bug.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/flags.t b/xt/selenium/flags.t
index c0b5ac7c0..1b1f59bcf 100644
--- a/xt/selenium/flags.t
+++ b/xt/selenium/flags.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/flags2.t b/xt/selenium/flags2.t
index 06290336e..a836f6908 100644
--- a/xt/selenium/flags2.t
+++ b/xt/selenium/flags2.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/groups.t b/xt/selenium/groups.t
index 011dea25e..e21e60b0e 100644
--- a/xt/selenium/groups.t
+++ b/xt/selenium/groups.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/keywords.t b/xt/selenium/keywords.t
index 74ba14f16..e3c0a25b7 100644
--- a/xt/selenium/keywords.t
+++ b/xt/selenium/keywords.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/login.t b/xt/selenium/login.t
index 6e4586981..4f6f589b6 100644
--- a/xt/selenium/login.t
+++ b/xt/selenium/login.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/milestones.t b/xt/selenium/milestones.t
index 6a9d7a015..b4d0f983c 100644
--- a/xt/selenium/milestones.t
+++ b/xt/selenium/milestones.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/password_complexity.t b/xt/selenium/password_complexity.t
index fe6159b2c..8c019639d 100644
--- a/xt/selenium/password_complexity.t
+++ b/xt/selenium/password_complexity.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/private_attachments.t b/xt/selenium/private_attachments.t
index 51f09c4bc..1e9f6ad28 100644
--- a/xt/selenium/private_attachments.t
+++ b/xt/selenium/private_attachments.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/qa_contact.t b/xt/selenium/qa_contact.t
index e036cfd14..7bfc5acd3 100644
--- a/xt/selenium/qa_contact.t
+++ b/xt/selenium/qa_contact.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/require_login.t b/xt/selenium/require_login.t
index 2e69f014f..c6f1c8ea1 100644
--- a/xt/selenium/require_login.t
+++ b/xt/selenium/require_login.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/sanity_check.t b/xt/selenium/sanity_check.t
index 918e458e0..9fc199bcf 100644
--- a/xt/selenium/sanity_check.t
+++ b/xt/selenium/sanity_check.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/saved_searches.t b/xt/selenium/saved_searches.t
index 85f83a236..047f3bcaf 100644
--- a/xt/selenium/saved_searches.t
+++ b/xt/selenium/saved_searches.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/search.t b/xt/selenium/search.t
index eefae1629..f5b51ee96 100644
--- a/xt/selenium/search.t
+++ b/xt/selenium/search.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use Test::More "no_plan";
diff --git a/xt/selenium/security.t b/xt/selenium/security.t
index 576d87a95..9c15e0464 100644
--- a/xt/selenium/security.t
+++ b/xt/selenium/security.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/shared_searches.t b/xt/selenium/shared_searches.t
index 909c2f34f..d8712f74b 100644
--- a/xt/selenium/shared_searches.t
+++ b/xt/selenium/shared_searches.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/show_all_products.t b/xt/selenium/show_all_products.t
index 9634fddc0..f2521a407 100644
--- a/xt/selenium/show_all_products.t
+++ b/xt/selenium/show_all_products.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/shutdown.t b/xt/selenium/shutdown.t
index 5cd2f1a93..3d9de099f 100644
--- a/xt/selenium/shutdown.t
+++ b/xt/selenium/shutdown.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/status_whiteboard.t b/xt/selenium/status_whiteboard.t
index c7c0e6b5d..e8b6b7b63 100644
--- a/xt/selenium/status_whiteboard.t
+++ b/xt/selenium/status_whiteboard.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/strict_isolation.t b/xt/selenium/strict_isolation.t
index 08ef87c74..575966738 100644
--- a/xt/selenium/strict_isolation.t
+++ b/xt/selenium/strict_isolation.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/sudo_sessions.t b/xt/selenium/sudo_sessions.t
index 31a516ac1..f599986ce 100644
--- a/xt/selenium/sudo_sessions.t
+++ b/xt/selenium/sudo_sessions.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/target_milestones.t b/xt/selenium/target_milestones.t
index a69a8cc7b..84254d4cd 100644
--- a/xt/selenium/target_milestones.t
+++ b/xt/selenium/target_milestones.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/time_summary.t b/xt/selenium/time_summary.t
index f8a16ca0b..58cf6e768 100644
--- a/xt/selenium/time_summary.t
+++ b/xt/selenium/time_summary.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/user_groups.t b/xt/selenium/user_groups.t
index 0e06e95b7..ef907f68c 100644
--- a/xt/selenium/user_groups.t
+++ b/xt/selenium/user_groups.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/user_matching.t b/xt/selenium/user_matching.t
index 28f27a850..54afe08b2 100644
--- a/xt/selenium/user_matching.t
+++ b/xt/selenium/user_matching.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/user_preferences.t b/xt/selenium/user_preferences.t
index 5dce12c0e..cf33e7dad 100644
--- a/xt/selenium/user_preferences.t
+++ b/xt/selenium/user_preferences.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/user_privs.t b/xt/selenium/user_privs.t
index e8ca54205..158d2649f 100644
--- a/xt/selenium/user_privs.t
+++ b/xt/selenium/user_privs.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/selenium/votes.t b/xt/selenium/votes.t
index 7a67e93ed..277a867ac 100644
--- a/xt/selenium/votes.t
+++ b/xt/selenium/votes.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More "no_plan";
 
diff --git a/xt/webservice/bug_add_attachment.t b/xt/webservice/bug_add_attachment.t
index 7a5aeeaa2..3d5148062 100644
--- a/xt/webservice/bug_add_attachment.t
+++ b/xt/webservice/bug_add_attachment.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use MIME::Base64 qw(encode_base64 decode_base64);
diff --git a/xt/webservice/bug_add_comment.t b/xt/webservice/bug_add_comment.t
index 70e5f4980..e3cf4c046 100644
--- a/xt/webservice/bug_add_comment.t
+++ b/xt/webservice/bug_add_comment.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use Test::More tests => 141;
diff --git a/xt/webservice/bug_attachments.t b/xt/webservice/bug_attachments.t
index 50e366635..2150a0ff8 100644
--- a/xt/webservice/bug_attachments.t
+++ b/xt/webservice/bug_attachments.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);
diff --git a/xt/webservice/bug_comments.t b/xt/webservice/bug_comments.t
index 6e573e56a..2312083d6 100644
--- a/xt/webservice/bug_comments.t
+++ b/xt/webservice/bug_comments.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use DateTime;
 use QA::Util;
diff --git a/xt/webservice/bug_create.t b/xt/webservice/bug_create.t
index 18751b50f..e8a0d60a4 100644
--- a/xt/webservice/bug_create.t
+++ b/xt/webservice/bug_create.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Storable qw(dclone);
 use Test::More tests => 293;
diff --git a/xt/webservice/bug_fields.t b/xt/webservice/bug_fields.t
index 89374df6d..dfc41fab0 100644
--- a/xt/webservice/bug_fields.t
+++ b/xt/webservice/bug_fields.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Data::Dumper;
 use Test::More;
diff --git a/xt/webservice/bug_get.t b/xt/webservice/bug_get.t
index 25576d00a..71c2bb394 100644
--- a/xt/webservice/bug_get.t
+++ b/xt/webservice/bug_get.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Data::Dumper;
 use DateTime;
diff --git a/xt/webservice/bug_history.t b/xt/webservice/bug_history.t
index de1e8339c..73142ed3a 100644
--- a/xt/webservice/bug_history.t
+++ b/xt/webservice/bug_history.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use QA::Tests qw(STANDARD_BUG_TESTS);
diff --git a/xt/webservice/bug_legal_values.t b/xt/webservice/bug_legal_values.t
index fa7f3d01c..3c3f655be 100644
--- a/xt/webservice/bug_legal_values.t
+++ b/xt/webservice/bug_legal_values.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 269;
 use QA::Util;
diff --git a/xt/webservice/bug_search.t b/xt/webservice/bug_search.t
index 4e346390b..d37e9c70d 100644
--- a/xt/webservice/bug_search.t
+++ b/xt/webservice/bug_search.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER);
diff --git a/xt/webservice/bug_update.t b/xt/webservice/bug_update.t
index 10736ea12..423b00c42 100644
--- a/xt/webservice/bug_update.t
+++ b/xt/webservice/bug_update.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Data::Dumper;
 use QA::Util;
diff --git a/xt/webservice/bug_update_see_also.t b/xt/webservice/bug_update_see_also.t
index 78b6e7bc8..f35c7b8a8 100644
--- a/xt/webservice/bug_update_see_also.t
+++ b/xt/webservice/bug_update_see_also.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
diff --git a/xt/webservice/bugzilla.t b/xt/webservice/bugzilla.t
index 53c994c2f..594d5e66b 100644
--- a/xt/webservice/bugzilla.t
+++ b/xt/webservice/bugzilla.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 11 * 3;
 use QA::Util;
diff --git a/xt/webservice/group_create.t b/xt/webservice/group_create.t
index dd6a174ef..97aaff5ed 100644
--- a/xt/webservice/group_create.t
+++ b/xt/webservice/group_create.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 77;
 use QA::Util;
diff --git a/xt/webservice/jsonp.t b/xt/webservice/jsonp.t
index 210f92434..a89e1259c 100644
--- a/xt/webservice/jsonp.t
+++ b/xt/webservice/jsonp.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 85;
 use QA::Util;
diff --git a/xt/webservice/product_create.t b/xt/webservice/product_create.t
index b74e9b474..273c817be 100644
--- a/xt/webservice/product_create.t
+++ b/xt/webservice/product_create.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 121;
 use QA::Util;
diff --git a/xt/webservice/product_get.t b/xt/webservice/product_get.t
index 101c109ef..a692a3cee 100644
--- a/xt/webservice/product_get.t
+++ b/xt/webservice/product_get.t
@@ -18,7 +18,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Test::More tests => 134;
 use QA::Util;
diff --git a/xt/webservice/user_create.t b/xt/webservice/user_create.t
index 386826809..f307b939c 100644
--- a/xt/webservice/user_create.t
+++ b/xt/webservice/user_create.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use Test::More tests => 75;
diff --git a/xt/webservice/user_get.t b/xt/webservice/user_get.t
index 01eedf804..a31e957b4 100644
--- a/xt/webservice/user_get.t
+++ b/xt/webservice/user_get.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use QA::Tests qw(PRIVATE_BUG_USER);
diff --git a/xt/webservice/user_login_logout.t b/xt/webservice/user_login_logout.t
index 2fc659a65..f4b115390 100644
--- a/xt/webservice/user_login_logout.t
+++ b/xt/webservice/user_login_logout.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use Data::Dumper;
 use QA::Util;
diff --git a/xt/webservice/user_offer_account_by_email.t b/xt/webservice/user_offer_account_by_email.t
index ca2c8d1f3..81b3df31f 100644
--- a/xt/webservice/user_offer_account_by_email.t
+++ b/xt/webservice/user_offer_account_by_email.t
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
 
 use QA::Util;
 use Test::More tests => 29;